From 65012ff20e8d900eb5b981dc4ae92b6ee093813f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Ko=CC=88nemann?= Date: Wed, 6 Apr 2016 13:24:59 +0200 Subject: [PATCH] Add bs4 assets for Bootstrap4 branch --- gulpfile.js | 2 +- sass/theme.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index d5dcbc0..65111e6 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -57,7 +57,7 @@ gulp.task('cleancss', function() { // Uglifies and concat all JS files into one gulp.task('scripts', function() { gulp.src([ - basePaths.dev + 'js/bootstrap3/bootstrap.min.js', //<--------- Change from /bootstrap3 to /bootstrap4 Watch out! just for testing in the moment! + basePaths.dev + 'js/bootstrap4/bootstrap.min.js', //<--------- Change from /bootstrap3 to /bootstrap4 Watch out! just for testing in the moment! basePaths.dev + 'js/owl.carousel.min.js', basePaths.dev + 'js/skip-link-focus-fix.js' ]) diff --git a/sass/theme.scss b/sass/theme.scss index dcd4329..a44feef 100644 --- a/sass/theme.scss +++ b/sass/theme.scss @@ -30,7 +30,7 @@ Import all needed 3rd party sass files plus your own style and variables // @import "../bower_components/_s/sass/style"; @import "theme/theme_variables"; // <--------- Add your variables into this file. Also add variables to overwrite Bootstrap or UnderStrap variables here -@import "../src/sass/bootstrap3/bootstrap";// <--------- Change from /bootstrap3 to /bootstrap4 Watch out! just for testing in the moment! +@import "../src/sass/bootstrap4/bootstrap";// <--------- Change from /bootstrap3 to /bootstrap4 Watch out! just for testing in the moment! @import "understrap/understrap"; @import "../src/sass/fontawesome/font-awesome"; @import "../src/sass/owl-carousel2/owl.carousel";