From cf0c8875f884273891cdee7f5b591c5b61c272a9 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 17 Jul 2018 10:52:52 +0100 Subject: [PATCH] Go back to Ubuntu's font Signed-off-by: Michael Tremer --- Makefile.am | 6 +++-- src/scss/_fonts.scss | 52 +++++++++++++++++++++++++++++++++------- src/scss/_variables.scss | 4 ++-- 3 files changed, 50 insertions(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9db1b204..4cc5dfb4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -152,8 +152,10 @@ EXTRA_DIST += \ staticdir = $(datadir)/static static_fonts_DATA = \ - src/fonts/ofl/karla/Karla-Bold.ttf \ - src/fonts/ofl/karla/Karla-Regular.ttf + src/fonts/ufl/ubuntu/Ubuntu-Bold.ttf \ + src/fonts/ufl/ubuntu/Ubuntu-Light.ttf \ + src/fonts/ufl/ubuntu/Ubuntu-Medium.ttf \ + src/fonts/ufl/ubuntu/Ubuntu-Regular.ttf static_fontsdir = $(staticdir)/fonts diff --git a/src/scss/_fonts.scss b/src/scss/_fonts.scss index 0b01270f..8dea5044 100644 --- a/src/scss/_fonts.scss +++ b/src/scss/_fonts.scss @@ -1,35 +1,71 @@ /* latin-ext */ @font-face { - font-family: "Karla"; + font-family: "Ubuntu"; + font-style: normal; + font-weight: 300; + src: local("Ubuntu"), local("Ubuntu-Light"), url(fonts/Ubuntu-Light.ttf) format("truetype"); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} + +/* latin */ +@font-face { + font-family: "Ubuntu"; + font-style: normal; + font-weight: 300; + src: local("Ubuntu"), local("Ubuntu-Light"), url(fonts/Ubuntu-Light.ttf) format("truetype"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + +/* latin-ext */ +@font-face { + font-family: "Ubuntu"; font-style: normal; font-weight: 400; - src: local("Karla"), local("Karla-Regular"), url(fonts/Karla-Regular.ttf) format("ttf"); + src: local("Ubuntu"), local("Ubuntu-Regular"), url(fonts/Ubuntu-Regular.ttf) format("truetype"); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @font-face { - font-family: "Karla"; + font-family: "Ubuntu"; font-style: normal; font-weight: 400; - src: local("Karla"), local("Karla-Regular"), url(fonts/Karla-Regular.ttf) format("ttf"); + src: local("Ubuntu"), local("Ubuntu-Regular"), url(fonts/Ubuntu-Regular.ttf) format("truetype"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + +/* latin-ext */ +@font-face { + font-family: "Ubuntu"; + font-style: normal; + font-weight: 500; + src: local("Ubuntu"), local("Ubuntu-Medium"), url(fonts/Ubuntu-Medium.ttf) format("truetype"); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} + +/* latin */ +@font-face { + font-family: "Ubuntu"; + font-style: normal; + font-weight: 500; + src: local("Ubuntu"), local("Ubuntu-Medium"), url(fonts/Ubuntu-Medium.ttf) format("truetype"); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } /* latin-ext */ @font-face { - font-family: "Karla"; + font-family: "Ubuntu"; font-style: normal; font-weight: 700; - src: local("Karla Bold"), local("Karla-Bold"), url(fonts/Karla-Bold.ttf) format("ttf"); + src: local("Ubuntu Bold"), local("Ubuntu-Bold"), url(fonts/Ubuntu-Bold.ttf) format("truetype"); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @font-face { - font-family: "Karla"; + font-family: "Ubuntu"; font-style: normal; font-weight: 700; - src: local("Karla Bold"), local("Karla-Bold"), url(fonts/Karla-Bold.ttf) format("ttf"); + src: local("Ubuntu Bold"), local("Ubuntu-Bold"), url(fonts/Ubuntu-Bold.ttf) format("truetype"); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss index d5dc326c..36840546 100644 --- a/src/scss/_variables.scss +++ b/src/scss/_variables.scss @@ -57,9 +57,9 @@ $border-radius: 2px; $border-radius-lg: 2px; // Fonts -$font-family-sans-serif: "Karla", sans-serif; +$font-family-sans-serif: "Ubuntu", sans-serif; -$font-weight-light: 200; +$font-weight-light: 300; $font-weight-normal: 400; $font-weight-bold: 700; -- 2.47.3