diff options
29 files changed, 173 insertions, 31 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 9c81f3b8..0b209329 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -231,11 +231,13 @@ grunt.registerTask('build_scss', 'build a regular theme from scss', function(the .replace(/bootstrap\/less\//g, 'bootstrap-sass-official/assets/stylesheets/') .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/");'); + .replace(/(\$icon-font-path:).*;/g, '$1 if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/");') + // 12. set bootswatch's web-font-path value as !default + .replace(/(\$web-font-path:.*);/g, '$1 !default;'); if (/\/variables.less$/.test(lessFile)) { - // 12. set default value of $bootstrap-sass-asset-helper to false + // 13. 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; + // 14. 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/cosmo/_bootswatch.scss b/cosmo/_bootswatch.scss index 428eaf35..e8da4309 100644 --- a/cosmo/_bootswatch.scss +++ b/cosmo/_bootswatch.scss @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700"); +$web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700" !default; + +@mixin web-font($path){ + @import url("#{$path}"); +} +@include web-font($web-font-path); // Navbar ===================================================================== diff --git a/cosmo/bootswatch.less b/cosmo/bootswatch.less index 792f2e59..562bc73e 100644 --- a/cosmo/bootswatch.less +++ b/cosmo/bootswatch.less @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700"); +@web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700"; + +.web-font(@path) { + @import url("@{path}"); +} +.web-font(@web-font-path); // Navbar ===================================================================== diff --git a/cyborg/_bootswatch.scss b/cyborg/_bootswatch.scss index d72d0c28..9147ae20 100644 --- a/cyborg/_bootswatch.scss +++ b/cyborg/_bootswatch.scss @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Roboto:400,700"); +$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,700" !default; + +@mixin web-font($path){ + @import url("#{$path}"); +} +@include web-font($web-font-path); // Navbar ===================================================================== diff --git a/cyborg/bootswatch.less b/cyborg/bootswatch.less index 4b2cd789..6c03f26d 100644 --- a/cyborg/bootswatch.less +++ b/cyborg/bootswatch.less @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Roboto:400,700"); +@web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,700"; + +.web-font(@path) { + @import url("@{path}"); +} +.web-font(@web-font-path); // Navbar ===================================================================== diff --git a/darkly/_bootswatch.scss b/darkly/_bootswatch.scss index 590cfc07..99a1a1e6 100644 --- a/darkly/_bootswatch.scss +++ b/darkly/_bootswatch.scss @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Lato:400,700,400italic"); +$web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic" !default; + +@mixin web-font($path){ + @import url("#{$path}"); +} +@include web-font($web-font-path); // Navbar ===================================================================== diff --git a/darkly/bootswatch.less b/darkly/bootswatch.less index 8f460868..c2a31d4c 100644 --- a/darkly/bootswatch.less +++ b/darkly/bootswatch.less @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Lato:400,700,400italic"); +@web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic"; + +.web-font(@path) { + @import url("@{path}"); +} +.web-font(@web-font-path); // Navbar ===================================================================== diff --git a/flatly/_bootswatch.scss b/flatly/_bootswatch.scss index 438f6931..7e42b1d9 100644 --- a/flatly/_bootswatch.scss +++ b/flatly/_bootswatch.scss @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Lato:400,700,400italic"); +$web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic" !default; + +@mixin web-font($path){ + @import url("#{$path}"); +} +@include web-font($web-font-path); // Navbar ===================================================================== diff --git a/flatly/bootswatch.less b/flatly/bootswatch.less index c1413e75..f1de54f5 100644 --- a/flatly/bootswatch.less +++ b/flatly/bootswatch.less @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Lato:400,700,400italic"); +@web-font-path: "https://fonts.googleapis.com/css?family=Lato:400,700,400italic"; + +.web-font(@path) { + @import url("@{path}"); +} +.web-font(@web-font-path); // Navbar ===================================================================== diff --git a/journal/_bootswatch.scss b/journal/_bootswatch.scss index 7134eacc..66d47e91 100644 --- a/journal/_bootswatch.scss +++ b/journal/_bootswatch.scss @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=News+Cycle:400,700"); +$web-font-path: "https://fonts.googleapis.com/css?family=News+Cycle:400,700" !default; + +@mixin web-font($path){ + @import url("#{$path}"); +} +@include web-font($web-font-path); // Navbar ===================================================================== diff --git a/journal/bootswatch.less b/journal/bootswatch.less index 62e0ac6e..b96f31e5 100644 --- a/journal/bootswatch.less +++ b/journal/bootswatch.less @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=News+Cycle:400,700"); +@web-font-path: "https://fonts.googleapis.com/css?family=News+Cycle:400,700"; + +.web-font(@path) { + @import url("@{path}"); +} +.web-font(@web-font-path); // Navbar ===================================================================== diff --git a/lumen/_bootswatch.scss b/lumen/_bootswatch.scss index db339c4e..face50d8 100644 --- a/lumen/_bootswatch.scss +++ b/lumen/_bootswatch.scss @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,400italic"); +$web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,400italic" !default; + +@mixin web-font($path){ + @import url("#{$path}"); +} +@include web-font($web-font-path); @mixin shadow($width: 4px){ border-width: 0 1px $width 1px; diff --git a/lumen/bootswatch.less b/lumen/bootswatch.less index ca86c69f..2599a56a 100644 --- a/lumen/bootswatch.less +++ b/lumen/bootswatch.less @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,400italic"); +@web-font-path: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,400italic"; + +.web-font(@path) { + @import url("@{path}"); +} +.web-font(@web-font-path); .shadow (@width: 4px) { border-width: 0 1px @width 1px; diff --git a/paper/_bootswatch.scss b/paper/_bootswatch.scss index f664b971..d213d5b9 100644 --- a/paper/_bootswatch.scss +++ b/paper/_bootswatch.scss @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Roboto:300,400,500,700"); +$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" !default; + +@mixin web-font($path){ + @import url("#{$path}"); +} +@include web-font($web-font-path); // Navbar ===================================================================== diff --git a/paper/bootswatch.less b/paper/bootswatch.less index 7be84e88..ebb051df 100644 --- a/paper/bootswatch.less +++ b/paper/bootswatch.less @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Roboto:300,400,500,700"); +@web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700"; + +.web-font(@path) { + @import url("@{path}"); +} +.web-font(@web-font-path); // Navbar ===================================================================== diff --git a/readable/_bootswatch.scss b/readable/_bootswatch.scss index 2fd07293..da63d8b1 100644 --- a/readable/_bootswatch.scss +++ b/readable/_bootswatch.scss @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Raleway:400,700"); +$web-font-path: "https://fonts.googleapis.com/css?family=Raleway:400,700" !default; + +@mixin web-font($path){ + @import url("#{$path}"); +} +@include web-font($web-font-path); // Navbar ===================================================================== diff --git a/readable/bootswatch.less b/readable/bootswatch.less index 95f913ce..c1fd08ee 100644 --- a/readable/bootswatch.less +++ b/readable/bootswatch.less @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Raleway:400,700"); +@web-font-path: "https://fonts.googleapis.com/css?family=Raleway:400,700"; + +.web-font(@path) { + @import url("@{path}"); +} +.web-font(@web-font-path); // Navbar ===================================================================== diff --git a/sandstone/_bootswatch.scss b/sandstone/_bootswatch.scss index 37002118..b98b3f1b 100644 --- a/sandstone/_bootswatch.scss +++ b/sandstone/_bootswatch.scss @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Roboto:400,500"); +$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,500" !default; + +@mixin web-font($path){ + @import url("#{$path}"); +} +@include web-font($web-font-path); // Navbar ===================================================================== diff --git a/sandstone/bootswatch.less b/sandstone/bootswatch.less index f0883b8c..2883d5a4 100644 --- a/sandstone/bootswatch.less +++ b/sandstone/bootswatch.less @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Roboto:400,500"); +@web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,500"; + +.web-font(@path) { + @import url("@{path}"); +} +.web-font(@web-font-path); // Navbar ===================================================================== diff --git a/simplex/_bootswatch.scss b/simplex/_bootswatch.scss index c79b9caf..7bc6e44a 100644 --- a/simplex/_bootswatch.scss +++ b/simplex/_bootswatch.scss @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,700"); +$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400,700" !default; + +@mixin web-font($path){ + @import url("#{$path}"); +} +@include web-font($web-font-path); @mixin btn-shadow($color){ @include gradient-vertical-three-colors(lighten($color, 3%), $color, 6%, darken($color, 3%)); diff --git a/simplex/bootswatch.less b/simplex/bootswatch.less index 92114915..38dab1ba 100644 --- a/simplex/bootswatch.less +++ b/simplex/bootswatch.less @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Open+Sans:400,700"); +@web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400,700"; + +.web-font(@path) { + @import url("@{path}"); +} +.web-font(@web-font-path); .btn-shadow(@color) { #gradient > .vertical-three-colors(lighten(@color, 3%), @color, 6%, darken(@color, 3%)); diff --git a/spacelab/_bootswatch.scss b/spacelab/_bootswatch.scss index c1f07504..804f1d6a 100644 --- a/spacelab/_bootswatch.scss +++ b/spacelab/_bootswatch.scss @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700"); +$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700" !default; + +@mixin web-font($path){ + @import url("#{$path}"); +} +@include web-font($web-font-path); @mixin btn-shadow($color){ @include gradient-vertical-three-colors(lighten($color, 15%), $color, 50%, darken($color, 4%)); diff --git a/spacelab/bootswatch.less b/spacelab/bootswatch.less index 16f89436..3496e3ec 100644 --- a/spacelab/bootswatch.less +++ b/spacelab/bootswatch.less @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700"); +@web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700"; + +.web-font(@path) { + @import url("@{path}"); +} +.web-font(@web-font-path); .btn-shadow(@color) { #gradient > .vertical-three-colors(lighten(@color, 15%), @color, 50%, darken(@color, 4%)); diff --git a/superhero/_bootswatch.scss b/superhero/_bootswatch.scss index f0dabf20..0833a30f 100644 --- a/superhero/_bootswatch.scss +++ b/superhero/_bootswatch.scss @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Lato:300,400,700"); +$web-font-path: "https://fonts.googleapis.com/css?family=Lato:300,400,700" !default; + +@mixin web-font($path){ + @import url("#{$path}"); +} +@include web-font($web-font-path); // Navbar ===================================================================== diff --git a/superhero/bootswatch.less b/superhero/bootswatch.less index 8a6e2416..c90be81c 100644 --- a/superhero/bootswatch.less +++ b/superhero/bootswatch.less @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Lato:300,400,700"); +@web-font-path: "https://fonts.googleapis.com/css?family=Lato:300,400,700"; + +.web-font(@path) { + @import url("@{path}"); +} +.web-font(@web-font-path); // Navbar ===================================================================== diff --git a/united/_bootswatch.scss b/united/_bootswatch.scss index 93cb2574..3afb5170 100644 --- a/united/_bootswatch.scss +++ b/united/_bootswatch.scss @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Ubuntu:400,700"); +$web-font-path: "https://fonts.googleapis.com/css?family=Ubuntu:400,700" !default; + +@mixin web-font($path){ + @import url("#{$path}"); +} +@include web-font($web-font-path); // Navbar ===================================================================== diff --git a/united/bootswatch.less b/united/bootswatch.less index 6c0e4d70..ad655cff 100644 --- a/united/bootswatch.less +++ b/united/bootswatch.less @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Ubuntu:400,700"); +@web-font-path: "https://fonts.googleapis.com/css?family=Ubuntu:400,700"; + +.web-font(@path) { + @import url("@{path}"); +} +.web-font(@web-font-path); // Navbar ===================================================================== diff --git a/yeti/_bootswatch.scss b/yeti/_bootswatch.scss index ea110c95..8bc400f6 100644 --- a/yeti/_bootswatch.scss +++ b/yeti/_bootswatch.scss @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700"); +$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700" !default; + +@mixin web-font($path){ + @import url("#{$path}"); +} +@include web-font($web-font-path); // Navbar ===================================================================== diff --git a/yeti/bootswatch.less b/yeti/bootswatch.less index d591ed8e..c08ccdf9 100644 --- a/yeti/bootswatch.less +++ b/yeti/bootswatch.less @@ -2,7 +2,12 @@ // Bootswatch // ----------------------------------------------------- -@import url("https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700"); +@web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700"; + +.web-font(@path) { + @import url("@{path}"); +} +.web-font(@web-font-path); // Navbar ===================================================================== |