rayelliott
/
understrap
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
This repository has been archived on 2020-05-08. You can view files and clone it, but cannot push or open issues or pull requests.
understrap/sass/theme.scss

23 lines
1.3 KiB
SCSS
Raw Normal View History

Removing underscores SASS Because the underscores styling is overwritten by Bootstrap and some UnderStrap basic stylings there is no need to compile the underscores SASS code into the themes css file. Underscores JS files are still in use.
2015-08-20 17:14:59 +00:00
@import "theme/theme_variables"; // <--------- Add your variables into this file. Also add variables to overwrite Bootstrap or UnderStrap variables here
Merge branch 'master' into Bootstrap4 # Conflicts: # sass/theme.scss
2016-04-26 12:05:22 +00:00
<<<<<<< HEAD
Add bs4 assets for Bootstrap4 branch
2016-04-06 11:24:59 +00:00
@import "../src/sass/bootstrap4/bootstrap";// <--------- Change from /bootstrap3 to /bootstrap4 Watch out! just for testing in the moment!
smaller fixes
2015-02-13 13:58:00 +00:00
@import "understrap/understrap";
resorting dev assets
2016-03-20 09:40:38 +00:00
@import "../src/sass/fontawesome/font-awesome";
updating the owl.carousel sass dependencies
2016-03-22 16:36:54 +00:00
@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";
Merge branch 'master' into Bootstrap4 # Conflicts: # sass/theme.scss
2016-04-26 12:05:22 +00:00
=======
adding assets scss files into understrap /scss folder adding for any asset scss files in between understrap and original sources. So you can exclude single scss files by commenting it out without overwriting your changes during an update
2016-04-25 12:28:00 +00:00
@import "assets/bootstrap3";// <--------- 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
Merge branch 'master' into Bootstrap4 # Conflicts: # sass/theme.scss
2016-04-26 12:05:22 +00:00
>>>>>>> master
initial comit
2014-12-10 11:36:38 +00:00
Gulp for Grunt Adding Bower and Gulp and removing Grunt
2015-08-12 06:13:10 +00:00
initial comit
2014-12-10 11:36:38 +00:00
// Any additional imported files //
adding assets scss files into understrap /scss folder adding for any asset scss files in between understrap and original sources. So you can exclude single scss files by commenting it out without overwriting your changes during an update
2016-04-25 12:28:00 +00:00
@import "theme/theme"; // <--------- Thats where you can add your own design. Thats your part!