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
This commit is contained in:
koenemann
parent
7177b3ef9c
commit
b14895924f
|
|
@ -10,6 +10,7 @@ Child Theme Project: [https://github.com/holger1411/understrap-child](https://gi
|
|||
Changelog
|
||||
=
|
||||
- **0.4.0 Apr. 15th 2016 Pre-Release**
|
||||
- Adding BrowserSync to gulpfile (again thx to @dvlopes)
|
||||
- Preparing the navbar markup so that the current version will work with Bootstrap 3 AND 4
|
||||
- Adding "gulp scripts" command - This uglifies and minifies all JS files (except jQuery...) into one single JS file called theme.min.js
|
||||
- Updating Gulpfile - now "gulp copy-assets" command copies all files from dependency folders into mid-layer folder called "/src"
|
||||
|
|
|
|||
|
|
@ -1,33 +1,4 @@
|
|||
@charset "UTF-8";
|
||||
/*****************************************************************
|
||||
Import all needed 3rd party sass files plus your own style and variables
|
||||
|
||||
0. ../bower_components/_s/sass/style // Adding underscores default styles. Don´t needed if you use Bootstrap for styling
|
||||
--------------------------------------
|
||||
1. theme/theme_variables.scss // Overwriting Bootstrap variables and for own variables <-- ADD YOUR VARIABLES HERE
|
||||
--------------------------------------
|
||||
2.../bower_components/bootstrap-sass/assets/stylesheets/bootstrap // adding bootstrap from bower components folder. Make sure you run bower install before! <- Dont edit this files!
|
||||
--------------------------------------
|
||||
3. understrap/understrap.scss // Some basic understrap styles. Helps to combine Bootsrap and _s theme and provides some basic styleing for additonal functions <- Dont edit this files!
|
||||
--------------------------------------
|
||||
4. ../bower_components/fontawesome/scss/font-awesome <- Dont edit this files! If you don´t need/want Font Awesome support comment out this line
|
||||
--------------------------------------
|
||||
|
||||
|
||||
|
||||
*
|
||||
*
|
||||
*
|
||||
*******
|
||||
*****
|
||||
***
|
||||
*
|
||||
|
||||
|
||||
|
||||
// Any additional imported files //
|
||||
6. theme/theme.scss"; // <-- ADD YOUR STYLES HERE
|
||||
***************************************************************** */
|
||||
/*!
|
||||
* Bootstrap v3.3.6 (http://getbootstrap.com)
|
||||
* Copyright 2011-2015 Twitter, Inc.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,56 @@
|
|||
/*!
|
||||
* Bootstrap v3.3.6 (http://getbootstrap.com)
|
||||
* Copyright 2011-2015 Twitter, Inc.
|
||||
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
||||
*/
|
||||
|
||||
// Core variables and mixins
|
||||
@import "../../src/sass/bootstrap3/bootstrap/variables";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/mixins";
|
||||
|
||||
// Reset and dependencies
|
||||
@import "../../src/sass/bootstrap3/bootstrap/normalize";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/print";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/glyphicons";
|
||||
|
||||
// Core CSS
|
||||
@import "../../src/sass/bootstrap3/bootstrap/scaffolding";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/type";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/code";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/grid";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/tables";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/forms";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/buttons";
|
||||
|
||||
// Components
|
||||
@import "../../src/sass/bootstrap3/bootstrap/component-animations";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/dropdowns";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/button-groups";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/input-groups";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/navs";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/navbar";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/breadcrumbs";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/pagination";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/pager";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/labels";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/badges";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/jumbotron";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/thumbnails";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/alerts";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/progress-bars";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/media";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/list-group";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/panels";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/responsive-embed";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/wells";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/close";
|
||||
|
||||
// Components w/ JavaScript
|
||||
@import "../../src/sass/bootstrap3/bootstrap/modals";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/tooltip";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/popovers";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/carousel";
|
||||
|
||||
// Utility classes
|
||||
@import "../../src/sass/bootstrap3/bootstrap/utilities";
|
||||
@import "../../src/sass/bootstrap3/bootstrap/responsive-utilities";
|
||||
|
|
@ -0,0 +1,56 @@
|
|||
/*!
|
||||
* Bootstrap v4.0.0-alpha.2 (http://getbootstrap.com)
|
||||
* Copyright 2011-2015 Twitter, Inc.
|
||||
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
||||
*/
|
||||
|
||||
// Core variables and mixins
|
||||
@import "../../src/sass/bootstrap4/variables";
|
||||
@import "../../src/sass/bootstrap4/mixins";
|
||||
|
||||
// Reset and dependencies
|
||||
@import "../../src/sass/bootstrap4/normalize";
|
||||
@import "../../src/sass/bootstrap4/print";
|
||||
|
||||
// Core CSS
|
||||
@import "../../src/sass/bootstrap4/reboot";
|
||||
@import "../../src/sass/bootstrap4/type";
|
||||
@import "../../src/sass/bootstrap4/images";
|
||||
@import "../../src/sass/bootstrap4/code";
|
||||
@import "../../src/sass/bootstrap4/grid";
|
||||
@import "../../src/sass/bootstrap4/tables";
|
||||
@import "../../src/sass/bootstrap4/forms";
|
||||
@import "../../src/sass/bootstrap4/buttons";
|
||||
|
||||
// Components
|
||||
@import "../../src/sass/bootstrap4/animation";
|
||||
@import "../../src/sass/bootstrap4/dropdown";
|
||||
@import "../../src/sass/bootstrap4/button-group";
|
||||
@import "../../src/sass/bootstrap4/input-group";
|
||||
@import "../../src/sass/bootstrap4/custom-forms";
|
||||
@import "../../src/sass/bootstrap4/nav";
|
||||
@import "../../src/sass/bootstrap4/navbar";
|
||||
@import "../../src/sass/bootstrap4/card";
|
||||
@import "../../src/sass/bootstrap4/breadcrumb";
|
||||
@import "../../src/sass/bootstrap4/pagination";
|
||||
@import "../../src/sass/bootstrap4/pager";
|
||||
@import "../../src/sass/bootstrap4/labels";
|
||||
@import "../../src/sass/bootstrap4/jumbotron";
|
||||
@import "../../src/sass/bootstrap4/alert";
|
||||
@import "../../src/sass/bootstrap4/progress";
|
||||
@import "../../src/sass/bootstrap4/media";
|
||||
@import "../../src/sass/bootstrap4/list-group";
|
||||
@import "../../src/sass/bootstrap4/responsive-embed";
|
||||
@import "../../src/sass/bootstrap4/close";
|
||||
|
||||
// Components w/ JavaScript
|
||||
@import "../../src/sass/bootstrap4/modal";
|
||||
@import "../../src/sass/bootstrap4/tooltip";
|
||||
@import "../../src/sass/bootstrap4/popover";
|
||||
@import "../../src/sass/bootstrap4/carousel";
|
||||
|
||||
// Utility classes
|
||||
@import "../../src/sass/bootstrap4/utilities";
|
||||
@import "../../src/sass/bootstrap4/utilities-background";
|
||||
@import "../../src/sass/bootstrap4/utilities-spacing";
|
||||
@import "../../src/sass/bootstrap4/utilities-responsive";
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
/*!
|
||||
* Font Awesome 4.5.0 by @davegandy - http://fontawesome.io - @fontawesome
|
||||
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
|
||||
*/
|
||||
|
||||
@import "../../src/sass/fontawesome/variables";
|
||||
@import "../../src/sass/fontawesome/mixins";
|
||||
@import "../../src/sass/fontawesome/path";
|
||||
@import "../../src/sass/fontawesome/core";
|
||||
@import "../../src/sass/fontawesome/larger";
|
||||
@import "../../src/sass/fontawesome/fixed-width";
|
||||
@import "../../src/sass/fontawesome/list";
|
||||
@import "../../src/sass/fontawesome/bordered-pulled";
|
||||
@import "../../src/sass/fontawesome/animated";
|
||||
@import "../../src/sass/fontawesome/rotated-flipped";
|
||||
@import "../../src/sass/fontawesome/stacked";
|
||||
@import "../../src/sass/fontawesome/icons";
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
@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";
|
||||
|
|
@ -1,45 +1,11 @@
|
|||
/*****************************************************************
|
||||
Import all needed 3rd party sass files plus your own style and variables
|
||||
|
||||
0. ../bower_components/_s/sass/style // Adding underscores default styles. Don´t needed if you use Bootstrap for styling
|
||||
--------------------------------------
|
||||
1. theme/theme_variables.scss // Overwriting Bootstrap variables and for own variables <-- ADD YOUR VARIABLES HERE
|
||||
--------------------------------------
|
||||
2.../bower_components/bootstrap-sass/assets/stylesheets/bootstrap // adding bootstrap from bower components folder. Make sure you run bower install before! <- Dont edit this files!
|
||||
--------------------------------------
|
||||
3. understrap/understrap.scss // Some basic understrap styles. Helps to combine Bootsrap and _s theme and provides some basic styleing for additonal functions <- Dont edit this files!
|
||||
--------------------------------------
|
||||
4. ../bower_components/fontawesome/scss/font-awesome <- Dont edit this files! If you don´t need/want Font Awesome support comment out this line
|
||||
--------------------------------------
|
||||
|
||||
|
||||
|
||||
*
|
||||
*
|
||||
*
|
||||
*******
|
||||
*****
|
||||
***
|
||||
*
|
||||
|
||||
|
||||
|
||||
// Any additional imported files //
|
||||
6. theme/theme.scss"; // <-- ADD YOUR STYLES HERE
|
||||
***************************************************************** */
|
||||
|
||||
// @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 "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 "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
|
||||
|
||||
|
||||
// Any additional imported files //
|
||||
@import "theme/theme"; // <--------- Add your styles into this file
|
||||
@import "theme/theme"; // <--------- Thats where you can add your own design. Thats your part!
|
||||
Reference in New Issue