Merge pull request #392 from cre-ne-jp/bootswatch341

bootswatch 3.3.7 -> 3.4.1 相当へ更新
cre-ne-jp · Nov 28, 2024 · 1e549f0 · 1e549f0
2 parents 5d2cab7 + bcd5353
commit 1e549f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/assets/stylesheets/_bootswatch.scss b/app/assets/stylesheets/_bootswatch.scss
@@ -1,9 +1,11 @@
-// Flatly 3.3.7
+// Flatly 3.4.1 + cre
 // Bootswatch
 // -----------------------------------------------------
 
-$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700" !default;
-@import url($web-font-path);
+$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700&display=swap" !default;
+@if $web-font-path {
+  @import url($web-font-path);
+}
 
 // Navbar =====================================================================
 

diff --git a/app/assets/stylesheets/_variables.scss b/app/assets/stylesheets/_variables.scss
@@ -1,5 +1,5 @@
 $bootstrap-sass-asset-helper: false !default;
-// Flatly 3.3.7
+// Flatly 3.4.1 + cre
 // Variables
 // --------------------------------------------------