From 37aee798a00fca98fc0afe9398bb198966120d1f Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 31 Aug 2018 17:35:00 +0100 Subject: [PATCH] Revert "Go back to Ubuntu's font" This reverts commit cf0c8875f884273891cdee7f5b591c5b61c272a9. Signed-off-by: Michael Tremer --- Makefile.am | 6 ++--- src/scss/_fonts.scss | 52 +++++++--------------------------------- src/scss/_variables.scss | 4 ++-- 3 files changed, 12 insertions(+), 50 deletions(-) diff --git a/Makefile.am b/Makefile.am index ed421521..ab39af06 100644 --- a/Makefile.am +++ b/Makefile.am @@ -173,10 +173,8 @@ EXTRA_DIST += \ staticdir = $(datadir)/static static_fonts_DATA = \ - 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 + src/fonts/ofl/karla/Karla-Bold.ttf \ + src/fonts/ofl/karla/Karla-Regular.ttf static_fontsdir = $(staticdir)/fonts diff --git a/src/scss/_fonts.scss b/src/scss/_fonts.scss index 8dea5044..0b01270f 100644 --- a/src/scss/_fonts.scss +++ b/src/scss/_fonts.scss @@ -1,71 +1,35 @@ /* latin-ext */ @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+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-family: "Karla"; font-style: normal; font-weight: 400; - src: local("Ubuntu"), local("Ubuntu-Regular"), url(fonts/Ubuntu-Regular.ttf) format("truetype"); + src: local("Karla"), local("Karla-Regular"), url(fonts/Karla-Regular.ttf) format("ttf"); 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-family: "Karla"; font-style: normal; font-weight: 400; - 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"); + src: local("Karla"), local("Karla-Regular"), url(fonts/Karla-Regular.ttf) format("ttf"); 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-family: "Karla"; font-style: normal; font-weight: 700; - src: local("Ubuntu Bold"), local("Ubuntu-Bold"), url(fonts/Ubuntu-Bold.ttf) format("truetype"); + src: local("Karla Bold"), local("Karla-Bold"), url(fonts/Karla-Bold.ttf) format("ttf"); 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-family: "Karla"; font-style: normal; font-weight: 700; - src: local("Ubuntu Bold"), local("Ubuntu-Bold"), url(fonts/Ubuntu-Bold.ttf) format("truetype"); + src: local("Karla Bold"), local("Karla-Bold"), url(fonts/Karla-Bold.ttf) format("ttf"); 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 24882b54..72010d77 100644 --- a/src/scss/_variables.scss +++ b/src/scss/_variables.scss @@ -66,9 +66,9 @@ $border-radius: 2px; $border-radius-lg: 2px; // Fonts -$font-family-sans-serif: "Ubuntu", sans-serif; +$font-family-sans-serif: "Karla", sans-serif; -$font-weight-light: 300; +$font-weight-light: 200; $font-weight-normal: 400; $font-weight-bold: 700; -- 2.39.2