Upgrade bootstrap alpha6

close darklow#769
pulse-mind · Nov 11, 2020 · 9326e51 · 9326e51
1 parent 2011b2c
commit 9326e51
Show file tree

Hide file tree

Showing 5 changed files with 1,207 additions and 760 deletions.
diff --git a/bower.json b/bower.json
@@ -14,6 +14,6 @@
     "tests"
   ],
   "devDependencies": {
-    "bootstrap": "v4.0.0-alpha.5"
+    "bootstrap": "v4.0.0-alpha.6"
   }
 }
diff --git a/gulpfile.js b/gulpfile.js
@@ -52,7 +52,7 @@ function reloadBrowserSync(done) {
 }
 
 function watchFiles() {
-    gulp.watch(config.watchSassFiles, gulp.series(styles, reloadBrowserSync));
+    gulp.watch(config.watchSassFiles, gulp.series(generateStyles, reloadBrowserSync));
     gulp.watch(config.watchHtmlFiles, gulp.series(reloadBrowserSync));
 }
 

diff --git a/suit/sass/_variables.scss b/suit/sass/_variables.scss
@@ -40,6 +40,7 @@ $font-size-sm: .929rem;
 $font-size-xs: .857rem;
 
 $font-size-root: 14px;
+$font-size-base: 14px;
 $font-family-sans-serif: 'Roboto', 'Helvetica Neue', Helvetica, Arial, sans-serif;
 $font-family-base: $font-family-sans-serif;
 $headings-font-weight: 500;

diff --git a/suit/sass/_vendor.scss b/suit/sass/_vendor.scss
@@ -24,7 +24,7 @@
 @import "../../bower_components/bootstrap/scss/buttons";
 
 // Components
-@import "../../bower_components/bootstrap/scss/animation";
+//@import "../../bower_components/bootstrap/scss/animation";
 @import "../../bower_components/bootstrap/scss/dropdown";
 @import "../../bower_components/bootstrap/scss/button-group";
 @import "../../bower_components/bootstrap/scss/input-group";
@@ -34,10 +34,11 @@
 @import "../../bower_components/bootstrap/scss/card";
 //@import "../../bower_components/bootstrap/scss/breadcrumb";
 //@import "../../bower_components/bootstrap/scss/pagination";
-@import "../../bower_components/bootstrap/scss/tags";
+//@import "../../bower_components/bootstrap/scss/tags";
 //@import "../../bower_components/bootstrap/scss/jumbotron";
 @import "../../bower_components/bootstrap/scss/alert";
 @import "../../bower_components/bootstrap/scss/progress";
+@import "../../bower_components/bootstrap/scss/transitions";
 //@import "../../bower_components/bootstrap/scss/media";
 //@import "../../bower_components/bootstrap/scss/list-group";
 @import "../../bower_components/bootstrap/scss/responsive-embed";