Streamlined fonts

allegro · Feb 25, 2022 · 65bc7af · 65bc7af
1 parent 4723b11
commit 65bc7af
Show file tree

Hide file tree

Showing 18 changed files with 368 additions and 3,652 deletions.
diff --git a/assets/fonts/Open-Sans-600/Open-Sans-600.eot b/assets/fonts/Open-Sans-600/Open-Sans-600.eot
diff --git a/assets/fonts/Open-Sans-600/Open-Sans-600.svg b/assets/fonts/Open-Sans-600/Open-Sans-600.svg
diff --git a/assets/fonts/Open-Sans-600/Open-Sans-600.ttf b/assets/fonts/Open-Sans-600/Open-Sans-600.ttf
diff --git a/assets/fonts/Open-Sans-regular/Open-Sans-regular.eot b/assets/fonts/Open-Sans-regular/Open-Sans-regular.eot
diff --git a/assets/fonts/Open-Sans-regular/Open-Sans-regular.svg b/assets/fonts/Open-Sans-regular/Open-Sans-regular.svg
diff --git a/assets/fonts/Open-Sans-regular/Open-Sans-regular.ttf b/assets/fonts/Open-Sans-regular/Open-Sans-regular.ttf
diff --git a/config/webpack.common.js b/config/webpack.common.js
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 const path = require("path");
 
 const babelLoader = {
@@ -77,6 +76,10 @@ module.exports = {
           "sass-loader"
         ]
       },
+      {
+        test: /\.(woff|woff2)$/i,
+        loader: "url-loader",
+      },
       {
         test: /\.svg$/,
         use: ["svg-inline-loader"]

diff --git a/assets/fonts/Open-Sans-600/LICENSE.txt → lib/fonts/Open-Sans-600/LICENSE.txt b/assets/fonts/Open-Sans-600/LICENSE.txt → lib/fonts/Open-Sans-600/LICENSE.txt
diff --git a/...ts/fonts/Open-Sans-600/Open-Sans-600.woff → lib/fonts/Open-Sans-600/Open-Sans-600.woff b/...ts/fonts/Open-Sans-600/Open-Sans-600.woff → lib/fonts/Open-Sans-600/Open-Sans-600.woff
diff --git a/...s/fonts/Open-Sans-600/Open-Sans-600.woff2 → lib/fonts/Open-Sans-600/Open-Sans-600.woff2 b/...s/fonts/Open-Sans-600/Open-Sans-600.woff2 → lib/fonts/Open-Sans-600/Open-Sans-600.woff2
diff --git a/assets/fonts/Open-Sans-regular/LICENSE.txt → lib/fonts/Open-Sans-regular/LICENSE.txt b/assets/fonts/Open-Sans-regular/LICENSE.txt → lib/fonts/Open-Sans-regular/LICENSE.txt
diff --git a/.../Open-Sans-regular/Open-Sans-regular.woff → .../Open-Sans-regular/Open-Sans-regular.woff b/.../Open-Sans-regular/Open-Sans-regular.woff → .../Open-Sans-regular/Open-Sans-regular.woff
diff --git a/...Open-Sans-regular/Open-Sans-regular.woff2 → ...Open-Sans-regular/Open-Sans-regular.woff2 b/...Open-Sans-regular/Open-Sans-regular.woff2 → ...Open-Sans-regular/Open-Sans-regular.woff2
diff --git a/lib/style/_open-sans-regular.scss b/lib/style/_open-sans-regular.scss
diff --git a/lib/style/_open-sans-600.scss → lib/style/_open-sans.scss b/lib/style/_open-sans-600.scss → lib/style/_open-sans.scss
@@ -15,16 +15,22 @@
  * limitations under the License.
  */
 
+@font-face {
+  font-family: 'Open Sans';
+  font-weight: 400;
+  font-style: normal;
+  font-display: swap;
+  src: local('Open Sans'), local('Open Sans Regular'), local('OpenSans-Regular'), local('Open-Sans-regular'),
+  url('../../lib/fonts/Open-Sans-regular/Open-Sans-regular.woff2') format('woff2'),
+  url('../../lib/fonts/Open-Sans-regular/Open-Sans-regular.woff') format('woff');
+}
+
 @font-face {
   font-family: 'Open Sans';
   font-weight: 600;
   font-style: normal;
-  src: url('/fonts/Open-Sans-600/Open-Sans-600.eot');
-  src: url('/fonts/Open-Sans-600/Open-Sans-600.eot?#iefix') format('embedded-opentype'),
-  local('Open Sans Semibold'),
-  local('Open-Sans-600'),
-  url('/fonts/Open-Sans-600/Open-Sans-600.woff2') format('woff2'),
-  url('/fonts/Open-Sans-600/Open-Sans-600.woff') format('woff'),
-  url('/fonts/Open-Sans-600/Open-Sans-600.ttf') format('truetype'),
-  url('/fonts/Open-Sans-600/Open-Sans-600.svg#OpenSans') format('svg');
+  font-display: swap;
+  src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), local('Open Sans Semibold'), local('Open-Sans-600'),
+  url('../../lib/fonts/Open-Sans-600/Open-Sans-600.woff2') format('woff2'),
+  url('../../lib/fonts/Open-Sans-600/Open-Sans-600.woff') format('woff');
 }