alanorth
/
hugo-theme-bootstrap4-blog
mirror of https://github.com/alanorth/hugo-theme-bootstrap4-blog.git
1
0
Fork 0
Code Releases Activity

Import Bootstrap 4 Beta 1 

Bring in new bootstrap.scss and align dependencies in package.json
with upstream's.

See: node_modules/bootstrap/scss/bootstrap.scss
This commit is contained in:
Alan Orth 2017-08-11 11:35:52 +03:00
parent dfb4e7fabd
commit 2fdc4a382f
Signed by: alanorth
GPG Key ID: 0FB860CC9C45B1B9
2 changed files with 20 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -18,8 +18,8 @@
"author": "Alan Orth",
"license": "GPL-3.0",
"devDependencies": {
"bootstrap": "4.0.0-alpha.6",
"clean-css-cli": "^4.1.3",
"bootstrap": "4.0.0-beta",
"clean-css-cli": "^4.1.6",
"cookieconsent": "^3.0.4",
"font-awesome": "^4.7.0",
"node-sass": "^4.5.3"

49
source/scss/bootstrap.scss vendored
View File

@ -1,54 +1,41 @@
/*!
* Bootstrap v4.0.0-alpha.6 (https://getbootstrap.com)
* Bootstrap v4.0.0-beta (https://getbootstrap.com)
* Copyright 2011-2017 The Bootstrap Authors
* Copyright 2011-2017 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
// Core variables and mixins
@import "node_modules/bootstrap/scss/functions";
@import "node_modules/bootstrap/scss/variables";
@import "node_modules/bootstrap/scss/mixins";
@import "node_modules/bootstrap/scss/custom";
// Reset and dependencies
@import "node_modules/bootstrap/scss/normalize";
@import "node_modules/bootstrap/scss/print";
// Core CSS
@import "node_modules/bootstrap/scss/reboot";
@import "node_modules/bootstrap/scss/type";
@import "node_modules/bootstrap/scss/images";
@import "node_modules/bootstrap/scss/code";
@import "node_modules/bootstrap/scss/grid";
//@import "node_modules/bootstrap/scss/tables";
@import "node_modules/bootstrap/scss/tables";
@import "node_modules/bootstrap/scss/forms";
@import "node_modules/bootstrap/scss/buttons";
// Components
//@import "node_modules/bootstrap/scss/transitions";
//@import "node_modules/bootstrap/scss/dropdown";
//@import "node_modules/bootstrap/scss/button-group";
//@import "node_modules/bootstrap/scss/input-group";
//@import "node_modules/bootstrap/scss/custom-forms";
@import "node_modules/bootstrap/scss/transitions";
@import "node_modules/bootstrap/scss/dropdown";
@import "node_modules/bootstrap/scss/button-group";
@import "node_modules/bootstrap/scss/input-group";
@import "node_modules/bootstrap/scss/custom-forms";
@import "node_modules/bootstrap/scss/nav";
@import "node_modules/bootstrap/scss/navbar";
//@import "node_modules/bootstrap/scss/card";
//@import "node_modules/bootstrap/scss/breadcrumb";
@import "node_modules/bootstrap/scss/card";
@import "node_modules/bootstrap/scss/breadcrumb";
@import "node_modules/bootstrap/scss/pagination";
//@import "node_modules/bootstrap/scss/badge";
//@import "node_modules/bootstrap/scss/jumbotron";
//@import "node_modules/bootstrap/scss/alert";
//@import "node_modules/bootstrap/scss/progress";
@import "node_modules/bootstrap/scss/badge";
@import "node_modules/bootstrap/scss/jumbotron";
@import "node_modules/bootstrap/scss/alert";
@import "node_modules/bootstrap/scss/progress";
@import "node_modules/bootstrap/scss/media";
@import "node_modules/bootstrap/scss/list-group";
@import "node_modules/bootstrap/scss/responsive-embed";
@import "node_modules/bootstrap/scss/close";
// Components w/ JavaScript
//@import "node_modules/bootstrap/scss/modal";
//@import "node_modules/bootstrap/scss/tooltip";
//@import "node_modules/bootstrap/scss/popover";
//@import "node_modules/bootstrap/scss/carousel";
// Utility classes
@import "node_modules/bootstrap/scss/modal";
@import "node_modules/bootstrap/scss/tooltip";
@import "node_modules/bootstrap/scss/popover";
@import "node_modules/bootstrap/scss/carousel";
@import "node_modules/bootstrap/scss/utilities";