diff options
author | 2021-08-13 00:45:01 +0530 | |
---|---|---|
committer | 2021-08-13 00:45:01 +0530 | |
commit | 2d27d5e66649d4f5baf127a53ee5ae524eae3a59 (patch) | |
tree | c592ea219ac8cd987fc367f57b54034c450ab2ab /src/styles/fonts.scss | |
parent | Ferdi v5.6.0 (diff) | |
parent | 5.6.1-nightly.24 [skip ci] (diff) | |
download | ferdium-app-2d27d5e66649d4f5baf127a53ee5ae524eae3a59.tar.gz ferdium-app-2d27d5e66649d4f5baf127a53ee5ae524eae3a59.tar.zst ferdium-app-2d27d5e66649d4f5baf127a53ee5ae524eae3a59.zip |
chore: merge from nightly branch into release branch in prep for next beta
Diffstat (limited to 'src/styles/fonts.scss')
-rw-r--r-- | src/styles/fonts.scss | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/styles/fonts.scss b/src/styles/fonts.scss index bd96ea867..1b2c99945 100644 --- a/src/styles/fonts.scss +++ b/src/styles/fonts.scss | |||
@@ -1,44 +1,49 @@ | |||
1 | @import './config.scss'; | 1 | @import './config.scss'; |
2 | // @import './node_modules/mdi/scss/materialdesignicons.scss'; | ||
3 | 2 | ||
4 | @font-face { | 3 | @font-face { |
5 | font-family: 'Open Sans'; | 4 | font-family: 'Open Sans'; |
6 | src: url('../assets/fonts/OpenSans-Light.ttf'); | 5 | src: url('../assets/fonts/OpenSans-Light.ttf'); |
7 | font-weight: 300; | 6 | font-weight: 300; |
8 | font-style: normal; | 7 | font-style: normal; |
8 | display: swap; | ||
9 | } | 9 | } |
10 | 10 | ||
11 | @font-face { | 11 | @font-face { |
12 | font-family: 'Open Sans'; | 12 | font-family: 'Open Sans'; |
13 | src: url('../assets/fonts/OpenSans-Regular.ttf'); | 13 | src: url('../assets/fonts/OpenSans-Regular.ttf'); |
14 | font-weight: normal; | 14 | font-weight: normal; |
15 | font-style: normal; | 15 | font-style: normal; |
16 | display: swap; | ||
16 | } | 17 | } |
17 | 18 | ||
18 | @font-face { | 19 | @font-face { |
19 | font-family: 'Open Sans'; | 20 | font-family: 'Open Sans'; |
20 | src: url('../assets/fonts/OpenSans-Bold.ttf'); | 21 | src: url('../assets/fonts/OpenSans-Bold.ttf'); |
21 | font-weight: bold; | 22 | font-weight: bold; |
22 | font-style: normal; | 23 | font-style: normal; |
24 | display: swap; | ||
23 | } | 25 | } |
24 | 26 | ||
25 | @font-face { | 27 | @font-face { |
26 | font-family: 'Open Sans'; | 28 | font-family: 'Open Sans'; |
27 | src: url('../assets/fonts/OpenSans-BoldItalic.ttf'); | 29 | src: url('../assets/fonts/OpenSans-BoldItalic.ttf'); |
28 | font-weight: bold; | 30 | font-weight: bold; |
29 | font-style: italic; | 31 | font-style: italic; |
32 | display: swap; | ||
30 | } | 33 | } |
31 | 34 | ||
32 | @font-face { | 35 | @font-face { |
33 | font-family: 'Open Sans'; | 36 | font-family: 'Open Sans'; |
34 | src: url('../assets/fonts/OpenSans-ExtraBold.ttf'); | 37 | src: url('../assets/fonts/OpenSans-ExtraBold.ttf'); |
35 | font-weight: 800; | 38 | font-weight: 800; |
36 | font-style: normal; | 39 | font-style: normal; |
40 | display: swap; | ||
37 | } | 41 | } |
38 | 42 | ||
39 | @font-face { | 43 | @font-face { |
40 | font-family: 'Open Sans'; | 44 | font-family: 'Open Sans'; |
41 | src: url('../assets/fonts/OpenSans-ExtraBoldItalic.ttf'); | 45 | src: url('../assets/fonts/OpenSans-ExtraBoldItalic.ttf'); |
42 | font-weight: 800; | 46 | font-weight: 800; |
43 | font-style: italic; | 47 | font-style: italic; |
48 | display: swap; | ||
44 | } | 49 | } |