summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gruntfile.js4
-rw-r--r--cerulean/_variables.scss1
-rw-r--r--cosmo/_variables.scss1
-rw-r--r--custom/_variables.scss1
-rw-r--r--cyborg/_variables.scss1
-rw-r--r--darkly/_variables.scss1
-rw-r--r--flatly/_variables.scss1
-rw-r--r--journal/_variables.scss1
-rw-r--r--lumen/_variables.scss1
-rw-r--r--paper/_variables.scss1
-rw-r--r--readable/_variables.scss1
-rw-r--r--sandstone/_variables.scss1
-rw-r--r--simplex/_variables.scss1
-rw-r--r--slate/_variables.scss1
-rw-r--r--spacelab/_variables.scss1
-rw-r--r--superhero/_variables.scss1
-rw-r--r--united/_variables.scss1
-rw-r--r--yeti/_variables.scss1
18 files changed, 20 insertions, 1 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 19e8351a..9c81f3b8 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -232,8 +232,10 @@ grunt.registerTask('build_scss', 'build a regular theme from scss', function(the
.replace(/\.less/g, '')
// 11. replace icon-font-path value with conditional for asset helpers
.replace(/(\$icon-font-path:).*;/g, '$1 if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/");');
- // 12. only assign variables if they haven't been previously set e.g. $var: #f00; > $var: #f00 !default;
if (/\/variables.less$/.test(lessFile)) {
+ // 12. set default value of $bootstrap-sass-asset-helper to false
+ out = "$bootstrap-sass-asset-helper: false;\n" + out;
+ // 13. only assign variables if they haven't been previously set e.g. $var: #f00; > $var: #f00 !default;
out = out.replace(/^(\$.*);/gm, '$1 !default;');
}
diff --git a/cerulean/_variables.scss b/cerulean/_variables.scss
index dc26152b..8b33e8e6 100644
--- a/cerulean/_variables.scss
+++ b/cerulean/_variables.scss
@@ -1,3 +1,4 @@
+$bootstrap-sass-asset-helper: false !default;
// Cerulean 3.3.5
// Variables
// --------------------------------------------------
diff --git a/cosmo/_variables.scss b/cosmo/_variables.scss
index a57b557e..0c7877bb 100644
--- a/cosmo/_variables.scss
+++ b/cosmo/_variables.scss
@@ -1,3 +1,4 @@
+$bootstrap-sass-asset-helper: false !default;
// Cosmo 3.3.5
// Variables
// --------------------------------------------------
diff --git a/custom/_variables.scss b/custom/_variables.scss
index 89770b26..3b3b5388 100644
--- a/custom/_variables.scss
+++ b/custom/_variables.scss
@@ -1,3 +1,4 @@
+$bootstrap-sass-asset-helper: false !default;
// Custom 3.3.5
// Variables
// --------------------------------------------------
diff --git a/cyborg/_variables.scss b/cyborg/_variables.scss
index 2ad29361..bcd98d3c 100644
--- a/cyborg/_variables.scss
+++ b/cyborg/_variables.scss
@@ -1,3 +1,4 @@
+$bootstrap-sass-asset-helper: false !default;
// Cyborg 3.3.5
// Variables
// --------------------------------------------------
diff --git a/darkly/_variables.scss b/darkly/_variables.scss
index 19436434..036af62b 100644
--- a/darkly/_variables.scss
+++ b/darkly/_variables.scss
@@ -1,3 +1,4 @@
+$bootstrap-sass-asset-helper: false !default;
// Darkly 3.3.5
// Variables
// --------------------------------------------------
diff --git a/flatly/_variables.scss b/flatly/_variables.scss
index 79c0b643..f4c9370e 100644
--- a/flatly/_variables.scss
+++ b/flatly/_variables.scss
@@ -1,3 +1,4 @@
+$bootstrap-sass-asset-helper: false !default;
// Flatly 3.3.5
// Variables
// --------------------------------------------------
diff --git a/journal/_variables.scss b/journal/_variables.scss
index 98532e68..a8025993 100644
--- a/journal/_variables.scss
+++ b/journal/_variables.scss
@@ -1,3 +1,4 @@
+$bootstrap-sass-asset-helper: false !default;
// Journal 3.3.5
// Variables
// --------------------------------------------------
diff --git a/lumen/_variables.scss b/lumen/_variables.scss
index 47e39f8c..82dfe049 100644
--- a/lumen/_variables.scss
+++ b/lumen/_variables.scss
@@ -1,3 +1,4 @@
+$bootstrap-sass-asset-helper: false !default;
// Lumen 3.3.5
// Variables
// --------------------------------------------------
diff --git a/paper/_variables.scss b/paper/_variables.scss
index 27572288..ba1c16e0 100644
--- a/paper/_variables.scss
+++ b/paper/_variables.scss
@@ -1,3 +1,4 @@
+$bootstrap-sass-asset-helper: false !default;
// Paper 3.3.5
// Variables
// --------------------------------------------------
diff --git a/readable/_variables.scss b/readable/_variables.scss
index c4f15cc3..d0473277 100644
--- a/readable/_variables.scss
+++ b/readable/_variables.scss
@@ -1,3 +1,4 @@
+$bootstrap-sass-asset-helper: false !default;
// Readable 3.3.5
// Variables
// --------------------------------------------------
diff --git a/sandstone/_variables.scss b/sandstone/_variables.scss
index 57fa598e..72ea6e75 100644
--- a/sandstone/_variables.scss
+++ b/sandstone/_variables.scss
@@ -1,3 +1,4 @@
+$bootstrap-sass-asset-helper: false !default;
// Sandstone 3.3.5
// Variables
// --------------------------------------------------
diff --git a/simplex/_variables.scss b/simplex/_variables.scss
index 048d9fb5..a8db7571 100644
--- a/simplex/_variables.scss
+++ b/simplex/_variables.scss
@@ -1,3 +1,4 @@
+$bootstrap-sass-asset-helper: false !default;
// Simplex 3.3.5
// Variables
// --------------------------------------------------
diff --git a/slate/_variables.scss b/slate/_variables.scss
index cbbdfb6d..33de51bf 100644
--- a/slate/_variables.scss
+++ b/slate/_variables.scss
@@ -1,3 +1,4 @@
+$bootstrap-sass-asset-helper: false !default;
// Slate 3.3.5
// Variables
// --------------------------------------------------
diff --git a/spacelab/_variables.scss b/spacelab/_variables.scss
index b87673f8..f73ac2a5 100644
--- a/spacelab/_variables.scss
+++ b/spacelab/_variables.scss
@@ -1,3 +1,4 @@
+$bootstrap-sass-asset-helper: false !default;
// Spacelab 3.3.5
// Variables
// --------------------------------------------------
diff --git a/superhero/_variables.scss b/superhero/_variables.scss
index 657f8d92..cbd62a66 100644
--- a/superhero/_variables.scss
+++ b/superhero/_variables.scss
@@ -1,3 +1,4 @@
+$bootstrap-sass-asset-helper: false !default;
// Superhero 3.3.5
// Variables
// --------------------------------------------------
diff --git a/united/_variables.scss b/united/_variables.scss
index 47523829..a68aca49 100644
--- a/united/_variables.scss
+++ b/united/_variables.scss
@@ -1,3 +1,4 @@
+$bootstrap-sass-asset-helper: false !default;
// United 3.3.5
// Variables
// --------------------------------------------------
diff --git a/yeti/_variables.scss b/yeti/_variables.scss
index 84dd3667..2ae6cda7 100644
--- a/yeti/_variables.scss
+++ b/yeti/_variables.scss
@@ -1,3 +1,4 @@
+$bootstrap-sass-asset-helper: false !default;
// Yeti 3.3.5
// Variables
// --------------------------------------------------