diff --git a/CHANGELOG.md b/CHANGELOG.md index bb5423b..be3085c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,5 @@ Added: -- `Report Bugs` and `Changelog` buttons to `Settings > About` \ No newline at end of file +- `Report Bugs` and `Changelog` buttons to `Settings > About` + +Fixed: +- Fonts looking blurry \ No newline at end of file diff --git a/src/assets/glue-resources/fonts/GoogleSans-Black.ttf b/src/assets/glue-resources/fonts/GoogleSans-Black.ttf new file mode 100644 index 0000000..5864e26 Binary files /dev/null and b/src/assets/glue-resources/fonts/GoogleSans-Black.ttf differ diff --git a/src/assets/glue-resources/fonts/GoogleSans-Bold.ttf b/src/assets/glue-resources/fonts/GoogleSans-Bold.ttf new file mode 100644 index 0000000..96619df Binary files /dev/null and b/src/assets/glue-resources/fonts/GoogleSans-Bold.ttf differ diff --git a/src/assets/glue-resources/fonts/GoogleSans-Light.ttf b/src/assets/glue-resources/fonts/GoogleSans-Light.ttf new file mode 100644 index 0000000..33de1c3 Binary files /dev/null and b/src/assets/glue-resources/fonts/GoogleSans-Light.ttf differ diff --git a/src/assets/glue-resources/fonts/GoogleSans-Medium.ttf b/src/assets/glue-resources/fonts/GoogleSans-Medium.ttf new file mode 100644 index 0000000..fd818d6 Binary files /dev/null and b/src/assets/glue-resources/fonts/GoogleSans-Medium.ttf differ diff --git a/src/assets/glue-resources/fonts/GoogleSans-Regular.ttf b/src/assets/glue-resources/fonts/GoogleSans-Regular.ttf new file mode 100644 index 0000000..e2c69c3 Binary files /dev/null and b/src/assets/glue-resources/fonts/GoogleSans-Regular.ttf differ diff --git a/src/assets/glue-resources/fonts/GoogleSans-Thin.ttf b/src/assets/glue-resources/fonts/GoogleSans-Thin.ttf new file mode 100644 index 0000000..5e046b5 Binary files /dev/null and b/src/assets/glue-resources/fonts/GoogleSans-Thin.ttf differ diff --git a/src/assets/glue-resources/fonts/GoogleSansDisplayMedium.woff2 b/src/assets/glue-resources/fonts/GoogleSansDisplayMedium.woff2 deleted file mode 100644 index 2430944..0000000 Binary files a/src/assets/glue-resources/fonts/GoogleSansDisplayMedium.woff2 and /dev/null differ diff --git a/src/assets/glue-resources/fonts/GoogleSansDisplayRegular.woff2 b/src/assets/glue-resources/fonts/GoogleSansDisplayRegular.woff2 deleted file mode 100644 index 911e5f8..0000000 Binary files a/src/assets/glue-resources/fonts/GoogleSansDisplayRegular.woff2 and /dev/null differ diff --git a/src/assets/glue-resources/fonts/Roboto-Black.ttf b/src/assets/glue-resources/fonts/Roboto-Black.ttf new file mode 100644 index 0000000..43a00e0 Binary files /dev/null and b/src/assets/glue-resources/fonts/Roboto-Black.ttf differ diff --git a/src/assets/glue-resources/fonts/Roboto-Bold.ttf b/src/assets/glue-resources/fonts/Roboto-Bold.ttf new file mode 100644 index 0000000..3742457 Binary files /dev/null and b/src/assets/glue-resources/fonts/Roboto-Bold.ttf differ diff --git a/src/assets/glue-resources/fonts/Roboto-Light.ttf b/src/assets/glue-resources/fonts/Roboto-Light.ttf new file mode 100644 index 0000000..0e97751 Binary files /dev/null and b/src/assets/glue-resources/fonts/Roboto-Light.ttf differ diff --git a/src/assets/glue-resources/fonts/Roboto-Medium.ttf b/src/assets/glue-resources/fonts/Roboto-Medium.ttf new file mode 100644 index 0000000..e89b0b7 Binary files /dev/null and b/src/assets/glue-resources/fonts/Roboto-Medium.ttf differ diff --git a/src/assets/glue-resources/fonts/Roboto-Regular.ttf b/src/assets/glue-resources/fonts/Roboto-Regular.ttf new file mode 100644 index 0000000..3d6861b Binary files /dev/null and b/src/assets/glue-resources/fonts/Roboto-Regular.ttf differ diff --git a/src/assets/glue-resources/fonts/Roboto-Thin.ttf b/src/assets/glue-resources/fonts/Roboto-Thin.ttf new file mode 100644 index 0000000..7d084ae Binary files /dev/null and b/src/assets/glue-resources/fonts/Roboto-Thin.ttf differ diff --git a/src/assets/glue-resources/fonts/Roboto.woff2 b/src/assets/glue-resources/fonts/Roboto.woff2 deleted file mode 100644 index 9a0064e..0000000 Binary files a/src/assets/glue-resources/fonts/Roboto.woff2 and /dev/null differ diff --git a/src/assets/glue-resources/fonts/RobotoMedium.woff2 b/src/assets/glue-resources/fonts/RobotoMedium.woff2 deleted file mode 100644 index 6a88805..0000000 Binary files a/src/assets/glue-resources/fonts/RobotoMedium.woff2 and /dev/null differ diff --git a/src/styles/Fonts.scss b/src/styles/Fonts.scss new file mode 100644 index 0000000..1f6192c --- /dev/null +++ b/src/styles/Fonts.scss @@ -0,0 +1,32 @@ +// GoogleSans: https://www.cufonfonts.com/font/google-sans +// Roboto: https://fonts.google.com/specimen/Roboto +$font-names: ( + "glue": "GoogleSans", + "info": "Roboto" +); +$font-styles: ( + "Thin": 100, + "Light": 300, + "Regular": 400, + "Medium": 500, + "Bold": 700, + "Black": 900 +); + +@each $prefix, $font in $font-names { + @each $style, $weight in $font-styles { + @font-face { + font-family: $font; + font-weight: $weight; + font-style: normal; + src: url("glue-resources/fonts/#{$font}-#{$style}.ttf") format("truetype"); + } + } +} + +body { + --glue-font-family: #{map-get($font-names, "glue")}, #{map-get($font-names, "info")}, spotify-circular, spotify-circular-cyrillic, spotify-circular-arabic, spotify-circular-hebrew, Helvetica Neue, helvetica, arial, Hiragino Kaku Gothic Pro, Meiryo, MS Gothic, sans-serif; + --info-font-family: #{map-get($font-names, "info")}, spotify-circular, spotify-circular-cyrillic, spotify-circular-arabic, spotify-circular-hebrew, Helvetica Neue, helvetica, arial, Hiragino Kaku Gothic Pro, Meiryo, MS Gothic, sans-serif; + font-family: var(--glue-font-family); + letter-spacing: normal; +} diff --git a/src/styles/main.scss b/src/styles/main.scss index ffd583d..41bfcaa 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -4,6 +4,7 @@ } @import "Colors"; +@import "Fonts"; @import "Inputs"; @import "ConfigMenu"; @import "ContextMenu.scss"; @@ -22,41 +23,6 @@ --song-transition-speed: 3s; } -@font-face { - font-family: "Google Sans Display"; - src: url("glue-resources/fonts/GoogleSansDisplayRegular.woff2") format("woff2"); - font-style: normal; - font-weight: 400; -} - -@font-face { - font-family: "Google Sans Display"; - src: url("glue-resources/fonts/GoogleSansDisplayMedium.woff2") format("woff2"); - font-style: normal; - font-weight: 500; -} - -@font-face { - font-family: "Roboto"; - src: url("glue-resources/fonts/Roboto.woff2") format("woff2"); - font-style: normal; - font-weight: 400; -} - -@font-face { - font-family: "Roboto"; - src: url("glue-resources/fonts/RobotoMedium.woff2") format("woff2"); - font-style: normal; - font-weight: 500; -} - -body { - --glue-font-family: "Google Sans Display", "Roboto", spotify-circular, spotify-circular-cyrillic, spotify-circular-arabic, spotify-circular-hebrew, Helvetica Neue, helvetica, arial, Hiragino Kaku Gothic Pro, Meiryo, MS Gothic, sans-serif; - --info-font-family: "Roboto", spotify-circular, spotify-circular-cyrillic, spotify-circular-arabic, spotify-circular-hebrew, Helvetica Neue, helvetica, arial, Hiragino Kaku Gothic Pro, Meiryo, MS Gothic, sans-serif; - font-family: var(--glue-font-family); - letter-spacing: normal; -} - .os-scrollbar-handle { background-color: spiceColor("text") !important; border-radius: calc(var(--scrollbar-vertical-size) / 2);