Merge master

2014-10-24 17:56:17 -05:00
parent 9b8eb85fb6 246594f230
commit 7dd0f0b755
17 changed files with 62 additions and 197 deletions
--- a/assets/less/_bootstrap.less
+++ b/assets/less/_bootstrap.less
@@ -6,7 +6,6 @@

 // Variables
@import "../vendor/bootstrap/less/variables";
-@import "_variables"; // Bootstrap variable overrides and custom variables

 // Mixins: Utilities
@import "../vendor/bootstrap/less/mixins/hide-text";
--- a/assets/less/main.less
+++ b/assets/less/main.less
@@ -1,6 +1,9 @@
 // Bootstrap
@import "_bootstrap";

+// Variable overrides and custom variables
+@import "_variables"; 
+
 // Roots
@import "_global";                   // Base styling & custom mixins
@import "components/_buttons";       // Button tweaks