Solving merging conflicts between bs4 branch and master
This commit is contained in:
parent
47d33ec0c4
commit
1aab2d84cb
|
@ -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')
|
||||
|
|
|
@ -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 //
|
||||
|
|
Reference in New Issue