summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Gruntfile.js6
-rw-r--r--cerulean/_variables.scss2
-rw-r--r--cosmo/_variables.scss2
-rw-r--r--custom/_variables.scss2
-rw-r--r--cyborg/_variables.scss2
-rw-r--r--darkly/_variables.scss2
-rw-r--r--flatly/_variables.scss2
-rw-r--r--journal/_variables.scss2
-rw-r--r--lumen/_variables.scss2
-rw-r--r--paper/_variables.scss2
-rw-r--r--readable/_variables.scss2
-rw-r--r--sandstone/_variables.scss2
-rw-r--r--simplex/_variables.scss2
-rw-r--r--slate/_variables.scss2
-rw-r--r--spacelab/_variables.scss2
-rw-r--r--superhero/_variables.scss2
-rw-r--r--united/_variables.scss2
-rw-r--r--yeti/_variables.scss2
18 files changed, 21 insertions, 19 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index d8dbc5a6..19e8351a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -229,8 +229,10 @@ grunt.registerTask('build_scss', 'build a regular theme from scss', function(the
.replace(/spin\(/g, 'adjust-hue(')
// 10. replace bower and imports in build.scss
.replace(/bootstrap\/less\//g, 'bootstrap-sass-official/assets/stylesheets/')
- .replace(/\.less/g, '');
- // 11. only assign variables if they haven't been previously set e.g. $var: #f00; > $var: #f00 !default;
+ .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)) {
out = out.replace(/^(\$.*);/gm, '$1 !default;');
}
diff --git a/cerulean/_variables.scss b/cerulean/_variables.scss
index fec5b44c..dc26152b 100644
--- a/cerulean/_variables.scss
+++ b/cerulean/_variables.scss
@@ -76,7 +76,7 @@ $headings-color: #317EAC !default;
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//** Load fonts from this directory.
-$icon-font-path: "../fonts/" !default;
+$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
//** File name for all font files.
$icon-font-name: "glyphicons-halflings-regular" !default;
//** Element ID within SVG icon file.
diff --git a/cosmo/_variables.scss b/cosmo/_variables.scss
index 7c513519..a57b557e 100644
--- a/cosmo/_variables.scss
+++ b/cosmo/_variables.scss
@@ -76,7 +76,7 @@ $headings-color: inherit !default;
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//** Load fonts from this directory.
-$icon-font-path: "../fonts/" !default;
+$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
//** File name for all font files.
$icon-font-name: "glyphicons-halflings-regular" !default;
//** Element ID within SVG icon file.
diff --git a/custom/_variables.scss b/custom/_variables.scss
index ebccda3e..89770b26 100644
--- a/custom/_variables.scss
+++ b/custom/_variables.scss
@@ -76,7 +76,7 @@ $headings-color: inherit !default;
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//** Load fonts from this directory.
-$icon-font-path: "../fonts/" !default;
+$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
//** File name for all font files.
$icon-font-name: "glyphicons-halflings-regular" !default;
//** Element ID within SVG icon file.
diff --git a/cyborg/_variables.scss b/cyborg/_variables.scss
index eed0377a..2ad29361 100644
--- a/cyborg/_variables.scss
+++ b/cyborg/_variables.scss
@@ -76,7 +76,7 @@ $headings-color: #fff !default;
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//** Load fonts from this directory.
-$icon-font-path: "../fonts/" !default;
+$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
//** File name for all font files.
$icon-font-name: "glyphicons-halflings-regular" !default;
//** Element ID within SVG icon file.
diff --git a/darkly/_variables.scss b/darkly/_variables.scss
index a726acb9..19436434 100644
--- a/darkly/_variables.scss
+++ b/darkly/_variables.scss
@@ -76,7 +76,7 @@ $headings-color: inherit !default;
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//** Load fonts from this directory.
-$icon-font-path: "../fonts/" !default;
+$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
//** File name for all font files.
$icon-font-name: "glyphicons-halflings-regular" !default;
//** Element ID within SVG icon file.
diff --git a/flatly/_variables.scss b/flatly/_variables.scss
index 8cdbd349..79c0b643 100644
--- a/flatly/_variables.scss
+++ b/flatly/_variables.scss
@@ -76,7 +76,7 @@ $headings-color: inherit !default;
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//** Load fonts from this directory.
-$icon-font-path: "../fonts/" !default;
+$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
//** File name for all font files.
$icon-font-name: "glyphicons-halflings-regular" !default;
//** Element ID within SVG icon file.
diff --git a/journal/_variables.scss b/journal/_variables.scss
index 909fc16b..98532e68 100644
--- a/journal/_variables.scss
+++ b/journal/_variables.scss
@@ -76,7 +76,7 @@ $headings-color: #000 !default;
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//** Load fonts from this directory.
-$icon-font-path: "../fonts/" !default;
+$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
//** File name for all font files.
$icon-font-name: "glyphicons-halflings-regular" !default;
//** Element ID within SVG icon file.
diff --git a/lumen/_variables.scss b/lumen/_variables.scss
index 9a69c9d7..47e39f8c 100644
--- a/lumen/_variables.scss
+++ b/lumen/_variables.scss
@@ -76,7 +76,7 @@ $headings-color: $gray-dark !default;
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//** Load fonts from this directory.
-$icon-font-path: "../fonts/" !default;
+$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
//** File name for all font files.
$icon-font-name: "glyphicons-halflings-regular" !default;
//** Element ID within SVG icon file.
diff --git a/paper/_variables.scss b/paper/_variables.scss
index 7eb4eec0..27572288 100644
--- a/paper/_variables.scss
+++ b/paper/_variables.scss
@@ -76,7 +76,7 @@ $headings-color: #444 !default;
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//** Load fonts from this directory.
-$icon-font-path: "../fonts/" !default;
+$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
//** File name for all font files.
$icon-font-name: "glyphicons-halflings-regular" !default;
//** Element ID within SVG icon file.
diff --git a/readable/_variables.scss b/readable/_variables.scss
index 4b6fa1f2..c4f15cc3 100644
--- a/readable/_variables.scss
+++ b/readable/_variables.scss
@@ -76,7 +76,7 @@ $headings-color: inherit !default;
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//** Load fonts from this directory.
-$icon-font-path: "../fonts/" !default;
+$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
//** File name for all font files.
$icon-font-name: "glyphicons-halflings-regular" !default;
//** Element ID within SVG icon file.
diff --git a/sandstone/_variables.scss b/sandstone/_variables.scss
index accb1521..57fa598e 100644
--- a/sandstone/_variables.scss
+++ b/sandstone/_variables.scss
@@ -76,7 +76,7 @@ $headings-color: inherit !default;
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//** Load fonts from this directory.
-$icon-font-path: "../fonts/" !default;
+$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
//** File name for all font files.
$icon-font-name: "glyphicons-halflings-regular" !default;
//** Element ID within SVG icon file.
diff --git a/simplex/_variables.scss b/simplex/_variables.scss
index 7b9ac2a4..048d9fb5 100644
--- a/simplex/_variables.scss
+++ b/simplex/_variables.scss
@@ -76,7 +76,7 @@ $headings-color: $gray-dark !default;
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//** Load fonts from this directory.
-$icon-font-path: "../fonts/" !default;
+$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
//** File name for all font files.
$icon-font-name: "glyphicons-halflings-regular" !default;
//** Element ID within SVG icon file.
diff --git a/slate/_variables.scss b/slate/_variables.scss
index 95b2096b..cbbdfb6d 100644
--- a/slate/_variables.scss
+++ b/slate/_variables.scss
@@ -76,7 +76,7 @@ $headings-color: inherit !default;
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//** Load fonts from this directory.
-$icon-font-path: "../fonts/" !default;
+$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
//** File name for all font files.
$icon-font-name: "glyphicons-halflings-regular" !default;
//** Element ID within SVG icon file.
diff --git a/spacelab/_variables.scss b/spacelab/_variables.scss
index cd390cdb..b87673f8 100644
--- a/spacelab/_variables.scss
+++ b/spacelab/_variables.scss
@@ -76,7 +76,7 @@ $headings-color: $gray-darker !default;
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//** Load fonts from this directory.
-$icon-font-path: "../fonts/" !default;
+$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
//** File name for all font files.
$icon-font-name: "glyphicons-halflings-regular" !default;
//** Element ID within SVG icon file.
diff --git a/superhero/_variables.scss b/superhero/_variables.scss
index 0d729568..657f8d92 100644
--- a/superhero/_variables.scss
+++ b/superhero/_variables.scss
@@ -76,7 +76,7 @@ $headings-color: inherit !default;
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//** Load fonts from this directory.
-$icon-font-path: "../fonts/" !default;
+$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
//** File name for all font files.
$icon-font-name: "glyphicons-halflings-regular" !default;
//** Element ID within SVG icon file.
diff --git a/united/_variables.scss b/united/_variables.scss
index 04e4248f..47523829 100644
--- a/united/_variables.scss
+++ b/united/_variables.scss
@@ -76,7 +76,7 @@ $headings-color: inherit !default;
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//** Load fonts from this directory.
-$icon-font-path: "../fonts/" !default;
+$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
//** File name for all font files.
$icon-font-name: "glyphicons-halflings-regular" !default;
//** Element ID within SVG icon file.
diff --git a/yeti/_variables.scss b/yeti/_variables.scss
index 3b64e320..84dd3667 100644
--- a/yeti/_variables.scss
+++ b/yeti/_variables.scss
@@ -76,7 +76,7 @@ $headings-color: inherit !default;
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//** Load fonts from this directory.
-$icon-font-path: "../fonts/" !default;
+$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
//** File name for all font files.
$icon-font-name: "glyphicons-halflings-regular" !default;
//** Element ID within SVG icon file.
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-27 05:12:56 +0000