From 1aab2d84cbae743f84ea98759191fe0b68b96341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Ko=CC=88nemann?= Date: Tue, 26 Apr 2016 14:09:19 +0200 Subject: [PATCH] Solving merging conflicts between bs4 branch and master --- gulpfile.js | 2 +- sass/theme.scss | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 8e0f821..9fc1ec8 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -99,7 +99,7 @@ gulp.task('scripts', function() { // Copy all needed dependency assets files from bower_component assets to themes /js, /scss and /fonts folder. Run this task after bower install or bower update -////////////////// All Bootstrap SASS 3 Assets ///////////////////////// +////////////////// All Bootstrap SASS Assets ///////////////////////// // Copy all Bootstrap JS files gulp.task('copy-assets', function() { gulp.src(basePaths.bower + 'bootstrap-sass/assets/javascripts/**/*.js') diff --git a/sass/theme.scss b/sass/theme.scss index 0eaf87d..c36181c 100644 --- a/sass/theme.scss +++ b/sass/theme.scss @@ -1,22 +1,10 @@ @import "theme/theme_variables"; // <--------- Add your variables into this file. Also add variables to overwrite Bootstrap or UnderStrap variables here -<<<<<<< HEAD -@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"; -@import "../src/sass/owl-carousel2/owl.animate"; -@import "../src/sass/owl-carousel2/owl.autoheight"; -@import "../src/sass/owl-carousel2/owl.lazyload"; -@import "../src/sass/owl-carousel2/owl.video"; -@import "../src/sass/owl-carousel2/owl.theme.default"; -======= -@import "assets/bootstrap3";// <--------- Loads Bootstrap3 or Bootstrap4. Change from /bootstrap3 to /bootstrap4 Watch out! just for testing in the moment! +@import "assets/bootstrap4";// <--------- Loads Bootstrap3 or Bootstrap4. Change from /bootstrap3 to /bootstrap4 Watch out! just for testing in the moment! @import "understrap/understrap";// <-------- Loads the UnderStrap defaults. Just a few classes to incorporate BS in WP //Optional files - If you don´t use the corresponding scripts/fonts comment em out @import "assets/font-awesome"; // <------- Font Awesome Icon font @import "assets/owl-carousel2"; // <------- Owl Carousel2 slider styles ->>>>>>> master // Any additional imported files //