successfully switching back and forth

This commit is contained in:
Holger Könemann 2016-04-06 13:24:07 +02:00
parent 0caa86ea67
commit d62632d693
5 changed files with 3731 additions and 4540 deletions

File diff suppressed because it is too large Load Diff

6
css/theme.min.css vendored

File diff suppressed because one or more lines are too long

View File

@ -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/bootstrap4/bootstrap.min.js', //<--------- Change from /bootstrap3 to /bootstrap4 Watch out! just for testing in the moment!
basePaths.dev + 'js/bootstrap3/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'
])

5
js/theme.min.js vendored

File diff suppressed because one or more lines are too long

View File

@ -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/bootstrap4/bootstrap";// <--------- Change from /bootstrap3 to /bootstrap4 Watch out! just for testing in the moment!
@import "../src/sass/bootstrap3/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";