framework/sage
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1173 from CFXd/easier-less-variables

Browse Source 
Move variables into main.less in case it needs to come after other imports (e.g., Fontawesome)
This commit is contained in:
Ben Word
2014-10-18 23:10:58 -06:00
parent 1b333d6ec9 dcab2b3040
commit fe32434754
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
assets/less/_bootstrap.less
View File

@@ -6,7 +6,6 @@
// Variables // Variables
@import "../vendor/bootstrap/less/variables"; @import "../vendor/bootstrap/less/variables";
@import "_variables"; // Bootstrap variable overrides and custom variables
// Mixins: Utilities // Mixins: Utilities
@import "../vendor/bootstrap/less/mixins/hide-text"; @import "../vendor/bootstrap/less/mixins/hide-text";

3
assets/less/main.less
View File

@@ -1,6 +1,9 @@
// Bootstrap // Bootstrap
@import "_bootstrap"; @import "_bootstrap";
// Variable overrides and custom variables
@import "_variables";
// Roots // Roots
@import "_global"; // Base styling & custom mixins @import "_global"; // Base styling & custom mixins
@import "components/_buttons"; // Button tweaks @import "components/_buttons"; // Button tweaks