diff options
| author | Raphael Aguiar <rmaguiar@tuta.io> | 2020-06-23 00:09:11 +0300 |
|---|---|---|
| committer | Raphael Aguiar <rmaguiar@tuta.io> | 2020-06-23 00:09:11 +0300 |
| commit | 933fcedb7204a9aeef80d26e730bf64d27a01d02 (patch) | |
| tree | 1127eae479657f7bfee3adafdbe2ea603626d492 /assets | |
| parent | a8e34b408e544430861dcf99c08332e3b5a4ff0c (diff) | |
Fix font paths
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/scss/fonts/_all.scss | 4 | ||||
| -rw-r--r-- | assets/scss/fonts/font-face.scss | 51 | ||||
| -rw-r--r-- | assets/scss/fonts/variables.scss | 9 | ||||
| -rw-r--r-- | assets/scss/main.scss | 65 |
4 files changed, 64 insertions, 65 deletions
diff --git a/assets/scss/fonts/_all.scss b/assets/scss/fonts/_all.scss deleted file mode 100644 index 8717659..0000000 --- a/assets/scss/fonts/_all.scss +++ /dev/null @@ -1,4 +0,0 @@ -@charset 'utf-8'; - -@import 'variables', - 'font-face'; diff --git a/assets/scss/fonts/font-face.scss b/assets/scss/fonts/font-face.scss deleted file mode 100644 index fb71237..0000000 --- a/assets/scss/fonts/font-face.scss +++ /dev/null @@ -1,51 +0,0 @@ -// "A Hassle-Free Way to Self-Host Google Fonts" by Mario Ranftl -// https://google-webfonts-helper.herokuapp.com/fonts - -// NOTE -// Added the font-display afterwards - -$display: swap; - -/* oswald-700 - latin */ -@font-face { - font-family: 'Oswald'; - font-style: normal; - font-weight: 700; - font-display: $display; - src: local('Oswald'), - url('../fonts/oswald-v29-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('../fonts/oswald-v29-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} - -/* open-sans-regular - latin */ -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 400; - font-display: $display; - src: local('Open Sans Regular'), local('OpenSans-Regular'), - url('/fonts/open-sans-v17-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('/fonts/open-sans-v17-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} - -/* open-sans-700 - latin */ -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 700; - font-display: $display; - src: local('Open Sans Bold'), local('OpenSans-Bold'), - url('../fonts/open-sans-v17-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('../fonts/open-sans-v17-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} - -/* open-sans-italic - latin */ -@font-face { - font-family: 'Open Sans'; - font-style: italic; - font-weight: 400; - font-display: $display; - src: local('Open Sans Italic'), local('OpenSans-Italic'), - url('/fonts/open-sans-v17-latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('/fonts/open-sans-v17-latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} diff --git a/assets/scss/fonts/variables.scss b/assets/scss/fonts/variables.scss deleted file mode 100644 index 1710ed6..0000000 --- a/assets/scss/fonts/variables.scss +++ /dev/null @@ -1,9 +0,0 @@ -// Typography -$heading-font: 'Oswald', sans-serif; -$body-font: 'Open Sans', sans-serif; -$code-font: monospace; - -$font-size: 18px; - -$heading-weight: 700; -$body-bold-weight: 700; diff --git a/assets/scss/main.scss b/assets/scss/main.scss index 0ecc822..9c90403 100644 --- a/assets/scss/main.scss +++ b/assets/scss/main.scss @@ -12,10 +12,73 @@ // Import base (variables and mixins), typography and general colors
@import 'base/_all',
- 'fonts/_all',
'colors/variables';
+// Fonts
+// "A Hassle-Free Way to Self-Host Google Fonts" by Mario Ranftl
+// https://google-webfonts-helper.herokuapp.com/fonts
+
+// NOTE
+// Added the font-display afterwards
+
+$display: swap;
+
+/* oswald-700 - latin */
+@font-face {
+ font-family: 'Oswald';
+ font-style: normal;
+ font-weight: 700;
+ font-display: $display;
+ src: local('Oswald'),
+ url('{{ "fonts/oswald-v29-latin-700.woff2" | absURL }}') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+ url('{{ "fonts/oswald-v29-latin-700.woff" | absURL }}') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* open-sans-regular - latin */
+@font-face {
+ font-family: 'Open Sans';
+ font-style: normal;
+ font-weight: 400;
+ font-display: $display;
+ src: local('Open Sans Regular'), local('OpenSans-Regular'),
+ url('{{ "fonts/open-sans-v17-latin-regular.woff2" | absURL }}') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+ url('{{ "fonts/open-sans-v17-latin-regular.woff" | absURL }}') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* open-sans-700 - latin */
+@font-face {
+ font-family: 'Open Sans';
+ font-style: normal;
+ font-weight: 700;
+ font-display: $display;
+ src: local('Open Sans Bold'), local('OpenSans-Bold'),
+ url('{{ "fonts/open-sans-v17-latin-700.woff2" | absURL }}') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+ url('{{ "fonts/open-sans-v17-latin-700.woff" | absURL }}') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* open-sans-italic - latin */
+@font-face {
+ font-family: 'Open Sans';
+ font-style: italic;
+ font-weight: 400;
+ font-display: $display;
+ src: local('Open Sans Italic'), local('OpenSans-Italic'),
+ url('{{ "fonts/open-sans-v17-latin-italic.woff2" | absURL }}') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+ url('{{ "fonts/open-sans-v17-latin-italic.woff" | absURL }}') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+
+$heading-font: 'Oswald', sans-serif;
+$body-font: 'Open Sans', sans-serif;
+$code-font: monospace;
+
+$font-size: 18px;
+
+$heading-weight: 700;
+$body-bold-weight: 700;
+
+
// Transition for color changes
$change-transition: {{ .Site.Params.Style.changeTransition | default ".5s ease" }}
|