Merge pull request #16 from andrewwhitehead/fix/font-alt

Add woff2 font files and list Noto Sans as a backup font face
bcgov · Feb 7, 2020 · 6f218f8 · 6f218f8
2 parents b16f8bd + ee42f7c
commit 6f218f8
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 12 deletions.
diff --git a/dist/css/bootstrap-theme.min.css b/dist/css/bootstrap-theme.min.css
diff --git a/dist/fonts/bc-sans/BCSans-Bold.woff2 b/dist/fonts/bc-sans/BCSans-Bold.woff2
diff --git a/dist/fonts/bc-sans/BCSans-BoldItalic.woff2 b/dist/fonts/bc-sans/BCSans-BoldItalic.woff2
diff --git a/dist/fonts/bc-sans/BCSans-Italic.woff2 b/dist/fonts/bc-sans/BCSans-Italic.woff2
diff --git a/dist/fonts/bc-sans/BCSans-Regular.woff2 b/dist/fonts/bc-sans/BCSans-Regular.woff2
diff --git a/dist/scss/_fonts.scss b/dist/scss/_fonts.scss
@@ -1,23 +1,27 @@
 @font-face {
-  src: url("#{$bcgov-font-path}/bc-sans/BCSans-Regular.woff") format("woff");
+  src: url("#{$bcgov-font-path}/bc-sans/BCSans-Regular.woff2") format('woff2'),
+    url("#{$bcgov-font-path}/bc-sans/BCSans-Regular.woff") format("woff");
   font-weight: 400;
   font-style: normal;
   font-family: "BCSans";
 }
 @font-face {
-  src: url("#{$bcgov-font-path}/bc-sans/BCSans-BoldItalic.woff") format("woff");
+  src: url("#{$bcgov-font-path}/bc-sans/BCSans-BoldItalic.woff2") format("woff2"),
+    url("#{$bcgov-font-path}/bc-sans/BCSans-BoldItalic.woff") format("woff");
   font-weight: 700;
   font-style: italic;
   font-family: "BCSans";
 }
 @font-face {
-  src: url("#{$bcgov-font-path}/bc-sans/BCSans-Italic.woff") format("woff");
+  src: url("#{$bcgov-font-path}/bc-sans/BCSans-Italic.woff2") format("woff2"),
+    url("#{$bcgov-font-path}/bc-sans/BCSans-Italic.woff") format("woff");
   font-weight: 400;
   font-style: italic;
   font-family: "BCSans";
 }
 @font-face {
-  src: url("#{$bcgov-font-path}/bc-sans/BCSans-Bold.woff") format("woff");
+  src: url("#{$bcgov-font-path}/bc-sans/BCSans-Bold.woff2") format("woff2"),
+    url("#{$bcgov-font-path}/bc-sans/BCSans-Bold.woff") format("woff");
   font-weight: 700;
   font-style: normal;
   font-family: "BCSans";

diff --git a/dist/scss/_variables.scss b/dist/scss/_variables.scss
@@ -18,7 +18,7 @@ $theme-colors: (
 
 // Add our font as default
 $bcgov-font-path: "../fonts" !default;
-$font-family-sans-serif: BCSans, Verdana, Arial, sans serif;
+$font-family-sans-serif: BCSans, 'Noto Sans', Verdana, Arial, sans serif;
 $font-family-base: $font-family-sans-serif;
 $line-height-base: 1.6;
 $body-color: #494949;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bcgov/bootstrap-theme",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Government of British Columbia Bootstrap v4 theme",
   "style": "dist/css/bootstrap-theme.min.css",
   "main": "dist/js/bootstrap-theme.min.js",

diff --git a/src/fonts/bc-sans/BCSans-Bold.woff2 b/src/fonts/bc-sans/BCSans-Bold.woff2
diff --git a/src/fonts/bc-sans/BCSans-BoldItalic.woff2 b/src/fonts/bc-sans/BCSans-BoldItalic.woff2
diff --git a/src/fonts/bc-sans/BCSans-Italic.woff2 b/src/fonts/bc-sans/BCSans-Italic.woff2
diff --git a/src/fonts/bc-sans/BCSans-Regular.woff2 b/src/fonts/bc-sans/BCSans-Regular.woff2
diff --git a/src/styles/_fonts.scss b/src/styles/_fonts.scss
@@ -1,23 +1,27 @@
 @font-face {
-  src: url("#{$bcgov-font-path}/bc-sans/BCSans-Regular.woff") format("woff");
+  src: url("#{$bcgov-font-path}/bc-sans/BCSans-Regular.woff2") format('woff2'),
+    url("#{$bcgov-font-path}/bc-sans/BCSans-Regular.woff") format("woff");
   font-weight: 400;
   font-style: normal;
   font-family: "BCSans";
 }
 @font-face {
-  src: url("#{$bcgov-font-path}/bc-sans/BCSans-BoldItalic.woff") format("woff");
+  src: url("#{$bcgov-font-path}/bc-sans/BCSans-BoldItalic.woff2") format("woff2"),
+    url("#{$bcgov-font-path}/bc-sans/BCSans-BoldItalic.woff") format("woff");
   font-weight: 700;
   font-style: italic;
   font-family: "BCSans";
 }
 @font-face {
-  src: url("#{$bcgov-font-path}/bc-sans/BCSans-Italic.woff") format("woff");
+  src: url("#{$bcgov-font-path}/bc-sans/BCSans-Italic.woff2") format("woff2"),
+    url("#{$bcgov-font-path}/bc-sans/BCSans-Italic.woff") format("woff");
   font-weight: 400;
   font-style: italic;
   font-family: "BCSans";
 }
 @font-face {
-  src: url("#{$bcgov-font-path}/bc-sans/BCSans-Bold.woff") format("woff");
+  src: url("#{$bcgov-font-path}/bc-sans/BCSans-Bold.woff2") format("woff2"),
+    url("#{$bcgov-font-path}/bc-sans/BCSans-Bold.woff") format("woff");
   font-weight: 700;
   font-style: normal;
   font-family: "BCSans";

diff --git a/src/styles/_variables.scss b/src/styles/_variables.scss
@@ -19,7 +19,7 @@ $theme-colors: (
 
 // Add our font as default
 $bcgov-font-path: "../fonts" !default;
-$font-family-sans-serif: BCSans, Verdana, Arial, sans serif;
+$font-family-sans-serif: BCSans, 'Noto Sans', Verdana, Arial, sans serif;
 $font-family-base: $font-family-sans-serif;
 $line-height-base: 1.6;
 $body-color: #494949;