local webfonts

bitwarden · Jul 18, 2018 · 3c9354b · 3c9354b
1 parent 2382d50
commit 3c9354b
Show file tree

Hide file tree

Showing 16 changed files with 94 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,6 @@ npm-debug.log
 vwd.webinfo
 css/
 dist/
-webfonts/
 *.pem
 *.crx
 *.zip

diff --git a/src/index.html b/src/index.html
@@ -13,9 +13,6 @@
     <link rel="icon" type="image/png" sizes="16x16" href="images/icons/favicon-16x16.png">
     <link rel="mask-icon" href="images/icons/safari-pinned-tab.svg" color="#3c8dbc">
     <link rel="manifest" href="manifest.json">
-
-    <link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN"
-        crossorigin="anonymous">
 </head>
 
 <body class="layout_frontend">

diff --git a/src/scss/plugins.scss b/src/scss/plugins.scss
@@ -1,3 +1,5 @@
+$fa-font-path: "~font-awesome/fonts";
+@import "~font-awesome/scss/font-awesome.scss";
 @import "~angular2-toaster/toaster";
 
 #toast-container {

diff --git a/src/scss/styles.scss b/src/scss/styles.scss
@@ -1,3 +1,5 @@
+@import "../webfonts/webfonts.css";
+
 $primary: #3c8dbc;
 $primary-accent: #286090;
 $secondary: #ced4da;

diff --git a/src/webfonts/Open_Sans-italic-300.woff b/src/webfonts/Open_Sans-italic-300.woff
diff --git a/src/webfonts/Open_Sans-italic-400.woff b/src/webfonts/Open_Sans-italic-400.woff
diff --git a/src/webfonts/Open_Sans-italic-600.woff b/src/webfonts/Open_Sans-italic-600.woff
diff --git a/src/webfonts/Open_Sans-italic-700.woff b/src/webfonts/Open_Sans-italic-700.woff
diff --git a/src/webfonts/Open_Sans-italic-800.woff b/src/webfonts/Open_Sans-italic-800.woff
diff --git a/src/webfonts/Open_Sans-normal-300.woff b/src/webfonts/Open_Sans-normal-300.woff
diff --git a/src/webfonts/Open_Sans-normal-400.woff b/src/webfonts/Open_Sans-normal-400.woff
diff --git a/src/webfonts/Open_Sans-normal-600.woff b/src/webfonts/Open_Sans-normal-600.woff
diff --git a/src/webfonts/Open_Sans-normal-700.woff b/src/webfonts/Open_Sans-normal-700.woff
diff --git a/src/webfonts/Open_Sans-normal-800.woff b/src/webfonts/Open_Sans-normal-800.woff
diff --git a/src/webfonts/webfonts.css b/src/webfonts/webfonts.css
@@ -0,0 +1,79 @@
+@font-face {
+    font-family: 'Open Sans';
+    font-style: italic;
+    font-weight: 300;
+    src: url(Open_Sans-italic-300.woff) format('woff');
+    unicode-range: U+0-10FFFF;
+}
+
+@font-face {
+    font-family: 'Open Sans';
+    font-style: italic;
+    font-weight: 400;
+    src: url(Open_Sans-italic-400.woff) format('woff');
+    unicode-range: U+0-10FFFF;
+}
+
+@font-face {
+    font-family: 'Open Sans';
+    font-style: italic;
+    font-weight: 600;
+    src: url(Open_Sans-italic-600.woff) format('woff');
+    unicode-range: U+0-10FFFF;
+}
+
+@font-face {
+    font-family: 'Open Sans';
+    font-style: italic;
+    font-weight: 700;
+    src: url(Open_Sans-italic-700.woff) format('woff');
+    unicode-range: U+0-10FFFF;
+}
+
+@font-face {
+    font-family: 'Open Sans';
+    font-style: italic;
+    font-weight: 800;
+    src: url(Open_Sans-italic-800.woff) format('woff');
+    unicode-range: U+0-10FFFF;
+}
+
+@font-face {
+    font-family: 'Open Sans';
+    font-style: normal;
+    font-weight: 300;
+    src: url(Open_Sans-normal-300.woff) format('woff');
+    unicode-range: U+0-10FFFF;
+}
+
+@font-face {
+    font-family: 'Open Sans';
+    font-style: normal;
+    font-weight: 400;
+    src: url(Open_Sans-normal-400.woff) format('woff');
+    unicode-range: U+0-10FFFF;
+}
+
+@font-face {
+    font-family: 'Open Sans';
+    font-style: normal;
+    font-weight: 600;
+    src: url(Open_Sans-normal-600.woff) format('woff');
+    unicode-range: U+0-10FFFF;
+}
+
+@font-face {
+    font-family: 'Open Sans';
+    font-style: normal;
+    font-weight: 700;
+    src: url(Open_Sans-normal-700.woff) format('woff');
+    unicode-range: U+0-10FFFF;
+}
+
+@font-face {
+    font-family: 'Open Sans';
+    font-style: normal;
+    font-weight: 800;
+    src: url(Open_Sans-normal-800.woff) format('woff');
+    unicode-range: U+0-10FFFF;
+}
diff --git a/webpack.config.js b/webpack.config.js
@@ -40,6 +40,17 @@ const moduleRules = [
         test: /\.(html)$/,
         loader: 'html-loader',
     },
+    {
+        test: /.(ttf|otf|eot|svg|woff(2)?)(\?[a-z0-9]+)?$/,
+        exclude: /loading.svg/,
+        use: [{
+            loader: 'file-loader',
+            options: {
+                name: '[name].[ext]',
+                outputPath: 'fonts/',
+            },
+        }],
+    },
     {
         test: /\.(jpe?g|png|gif|svg)$/i,
         exclude: /.*(fontawesome-webfont)\.svg/,