From: Michael Tremer Date: Tue, 25 Sep 2018 12:49:15 +0000 (+0100) Subject: Change font to "Mukta" X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74bded456c9cc156c58559d5783c9f184025bf7a;p=ipfire.org.git Change font to "Mukta" Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index 3d1ce5a0..c9c19123 100644 --- a/Makefile.am +++ b/Makefile.am @@ -193,8 +193,13 @@ EXTRA_DIST += \ staticdir = $(datadir)/static static_fonts_DATA = \ - src/fonts/ofl/karla/Karla-Bold.ttf \ - src/fonts/ofl/karla/Karla-Regular.ttf + src/fonts/ofl/mukta/Mukta-Bold.ttf \ + src/fonts/ofl/mukta/Mukta-ExtraBold.ttf \ + src/fonts/ofl/mukta/Mukta-ExtraLight.ttf \ + src/fonts/ofl/mukta/Mukta-Light.ttf \ + src/fonts/ofl/mukta/Mukta-Medium.ttf \ + src/fonts/ofl/mukta/Mukta-Regular.ttf \ + src/fonts/ofl/mukta/Mukta-SemiBold.ttf static_fontsdir = $(staticdir)/fonts diff --git a/src/scss/_fonts.scss b/src/scss/_fonts.scss index 0b01270f..1d2a6b25 100644 --- a/src/scss/_fonts.scss +++ b/src/scss/_fonts.scss @@ -1,35 +1,35 @@ /* latin-ext */ @font-face { - font-family: "Karla"; + font-family: "Mukta"; font-style: normal; font-weight: 400; - src: local("Karla"), local("Karla-Regular"), url(fonts/Karla-Regular.ttf) format("ttf"); + src: local("Mukta Regular"), local("Mukta-Regular"), url(fonts/Mukta-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: "Mukta"; font-style: normal; font-weight: 400; - src: local("Karla"), local("Karla-Regular"), url(fonts/Karla-Regular.ttf) format("ttf"); + src: local("Mukta Regular"), local("Mukta-Regular"), url(fonts/Mukta-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: "Karla"; + font-family: "Mukta"; font-style: normal; font-weight: 700; - src: local("Karla Bold"), local("Karla-Bold"), url(fonts/Karla-Bold.ttf) format("ttf"); + src: local("Mukta Bold"), local("Mukta-Bold"), url(fonts/Mukta-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: "Mukta"; font-style: normal; font-weight: 700; - src: local("Karla Bold"), local("Karla-Bold"), url(fonts/Karla-Bold.ttf) format("ttf"); + src: local("Mukta Bold"), local("Mukta-Bold"), url(fonts/Mukta-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 72010d77..5ff67607 100644 --- a/src/scss/_variables.scss +++ b/src/scss/_variables.scss @@ -66,7 +66,7 @@ $border-radius: 2px; $border-radius-lg: 2px; // Fonts -$font-family-sans-serif: "Karla", sans-serif; +$font-family-sans-serif: "Mukta", sans-serif; $font-weight-light: 200; $font-weight-normal: 400;