Web font path resolution (#1281)

* web-font-path string interpolation to avoid literal interpretation as expanded path in some SCSS parsers * Limit change to condition statement only * Revert "Limit change to condition statement only" This reverts commit 950e109. * Removed incorrect change of if statement
thomaspark · Oct 17, 2023 · c74d13f · c74d13f
1 parent 3038872
commit c74d13f
Show file tree

Hide file tree

Showing 40 changed files with 40 additions and 40 deletions.
diff --git a/dist/cosmo/_bootswatch.scss b/dist/cosmo/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Typography

diff --git a/dist/cyborg/_bootswatch.scss b/dist/cyborg/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Navbar

diff --git a/dist/darkly/_bootswatch.scss b/dist/darkly/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,400;0,700;1,400&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Typography

diff --git a/dist/flatly/_bootswatch.scss b/dist/flatly/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,400;0,700;1,400&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Navs

diff --git a/dist/journal/_bootswatch.scss b/dist/journal/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=News+Cycle:wght@400;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Navbar

diff --git a/dist/lumen/_bootswatch.scss b/dist/lumen/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Source+Sans+Pro:ital,wght@0,300;0,400;0,700;1,400&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Mixins

diff --git a/dist/lux/_bootswatch.scss b/dist/lux/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Nunito+Sans:wght@200;300;400;500;600;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Navbar

diff --git a/dist/materia/_bootswatch.scss b/dist/materia/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Mixins

diff --git a/dist/minty/_bootswatch.scss b/dist/minty/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Navbar

diff --git a/dist/morph/_bootswatch.scss b/dist/morph/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Nunito:wght@400;600;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 $btn-box-shadow-inset: inset 2px 3px 6px rgba($black, .2), inset -3px -2px 6px rgba($white, .2) !default;

diff --git a/dist/sandstone/_bootswatch.scss b/dist/sandstone/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Navbar

diff --git a/dist/simplex/_bootswatch.scss b/dist/simplex/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Mixins

diff --git a/dist/sketchy/_bootswatch.scss b/dist/sketchy/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css?family=Neucha|Cabin+Sketch&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // stylelint-disable scss/dollar-variable-default

diff --git a/dist/solar/_bootswatch.scss b/dist/solar/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Buttons

diff --git a/dist/spacelab/_bootswatch.scss b/dist/spacelab/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,400;0,700;1,400;1,700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Mixins

diff --git a/dist/superhero/_bootswatch.scss b/dist/superhero/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Lato:wght@300;400;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Buttons

diff --git a/dist/united/_bootswatch.scss b/dist/united/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Ubuntu:wght@400;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Indicators

diff --git a/dist/vapor/_bootswatch.scss b/dist/vapor/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Lato:wght@400;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 $outrun: false !default;

diff --git a/dist/yeti/_bootswatch.scss b/dist/yeti/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Navbar

diff --git a/dist/zephyr/_bootswatch.scss b/dist/zephyr/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Inter:wght@400;500;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Navbar

diff --git a/docs/5/cosmo/_bootswatch.scss b/docs/5/cosmo/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Typography

diff --git a/docs/5/cyborg/_bootswatch.scss b/docs/5/cyborg/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Navbar

diff --git a/docs/5/darkly/_bootswatch.scss b/docs/5/darkly/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,400;0,700;1,400&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Typography

diff --git a/docs/5/flatly/_bootswatch.scss b/docs/5/flatly/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,400;0,700;1,400&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Navs

diff --git a/docs/5/journal/_bootswatch.scss b/docs/5/journal/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=News+Cycle:wght@400;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Navbar

diff --git a/docs/5/lumen/_bootswatch.scss b/docs/5/lumen/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Source+Sans+Pro:ital,wght@0,300;0,400;0,700;1,400&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Mixins

diff --git a/docs/5/lux/_bootswatch.scss b/docs/5/lux/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Nunito+Sans:wght@200;300;400;500;600;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Navbar

diff --git a/docs/5/materia/_bootswatch.scss b/docs/5/materia/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Mixins

diff --git a/docs/5/minty/_bootswatch.scss b/docs/5/minty/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Navbar

diff --git a/docs/5/morph/_bootswatch.scss b/docs/5/morph/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Nunito:wght@400;600;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 $btn-box-shadow-inset: inset 2px 3px 6px rgba($black, .2), inset -3px -2px 6px rgba($white, .2) !default;

diff --git a/docs/5/sandstone/_bootswatch.scss b/docs/5/sandstone/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Navbar

diff --git a/docs/5/simplex/_bootswatch.scss b/docs/5/simplex/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Mixins

diff --git a/docs/5/sketchy/_bootswatch.scss b/docs/5/sketchy/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css?family=Neucha|Cabin+Sketch&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // stylelint-disable scss/dollar-variable-default

diff --git a/docs/5/solar/_bootswatch.scss b/docs/5/solar/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Buttons

diff --git a/docs/5/spacelab/_bootswatch.scss b/docs/5/spacelab/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,400;0,700;1,400;1,700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Mixins

diff --git a/docs/5/superhero/_bootswatch.scss b/docs/5/superhero/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Lato:wght@300;400;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Buttons

diff --git a/docs/5/united/_bootswatch.scss b/docs/5/united/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Ubuntu:wght@400;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Indicators

diff --git a/docs/5/vapor/_bootswatch.scss b/docs/5/vapor/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Lato:wght@400;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 $outrun: false !default;

diff --git a/docs/5/yeti/_bootswatch.scss b/docs/5/yeti/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Navbar

diff --git a/docs/5/zephyr/_bootswatch.scss b/docs/5/zephyr/_bootswatch.scss
@@ -6,7 +6,7 @@
 
 $web-font-path: "https://fonts.googleapis.com/css2?family=Inter:wght@400;500;700&display=swap" !default;
 @if $web-font-path {
- @import url($web-font-path);
+ @import url("#{$web-font-path}");
 }
 
 // Navbar