From f7f975d117f698d8db00cac7c3821cfec6252705 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 14 Mar 2023 11:19:28 +0000 Subject: [PATCH] CSS: Convert _fonts.scss to SASS Signed-off-by: Michael Tremer --- Makefile.am | 4 +- src/sass/{_fonts.scss => _fonts.sass} | 78 +++++++++++++-------------- 2 files changed, 37 insertions(+), 45 deletions(-) rename src/sass/{_fonts.scss => _fonts.sass} (50%) diff --git a/Makefile.am b/Makefile.am index 1c685cd4..4a9789fc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -342,7 +342,7 @@ templates_wiki_modulesdir = $(templates_wikidir)/modules SASS_FILES = \ src/sass/main.sass \ src/sass/_code-highlighting.scss \ - src/sass/_fonts.scss \ + src/sass/_fonts.sass \ src/sass/_icons.scss \ src/sass/_variables.scss @@ -356,12 +356,10 @@ CLEANFILES += \ static_DATA = \ src/static/favicon.ico \ src/static/robots.txt \ - src/sass/fonts.css \ src/sass/listing.css \ src/sass/main.css CLEANFILES += \ - src/sass/fonts.css \ src/sass/listing.css \ src/sass/main.css diff --git a/src/sass/_fonts.scss b/src/sass/_fonts.sass similarity index 50% rename from src/sass/_fonts.scss rename to src/sass/_fonts.sass index c1782fbe..d2a18d21 100644 --- a/src/sass/_fonts.scss +++ b/src/sass/_fonts.sass @@ -1,53 +1,47 @@ /* latin-ext */ -@font-face { - font-family: "Prompt"; - font-style: normal; - font-weight: 400; - src: local("Prompt Regular"), local("Prompt-Regular"), url(/static/fonts/Prompt-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; -} +@font-face + font-family: "Prompt" + font-style: normal + font-weight: 400 + src: local("Prompt Regular"), local("Prompt-Regular"), url(/static/fonts/Prompt-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: "Prompt"; - font-style: normal; - font-weight: 400; - src: local("Prompt Regular"), local("Prompt-Regular"), url(/static/fonts/Prompt-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; -} +@font-face + font-family: "Prompt" + font-style: normal + font-weight: 400 + src: local("Prompt Regular"), local("Prompt-Regular"), url(/static/fonts/Prompt-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: 'Prompt'; - font-style: normal; - font-weight: 500; - src: local('Prompt Medium'), local('Prompt-Medium'), url(/static/fonts/Prompt-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; -} +@font-face + font-family: 'Prompt' + font-style: normal + font-weight: 500 + src: local('Prompt Medium'), local('Prompt-Medium'), url(/static/fonts/Prompt-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: 'Prompt'; - font-style: normal; - font-weight: 500; - src: local('Prompt Medium'), local('Prompt-Medium'), url(/static/fonts/Prompt-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; -} +@font-face + font-family: 'Prompt' + font-style: normal + font-weight: 500 + src: local('Prompt Medium'), local('Prompt-Medium'), url(/static/fonts/Prompt-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: "Prompt"; - font-style: normal; - font-weight: 700; - src: local("Prompt Bold"), local("Prompt-Bold"), url(/static/fonts/Prompt-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; -} +@font-face + font-family: "Prompt" + font-style: normal + font-weight: 700 + src: local("Prompt Bold"), local("Prompt-Bold"), url(/static/fonts/Prompt-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: "Prompt"; - font-style: normal; - font-weight: 700; - src: local("Prompt Bold"), local("Prompt-Bold"), url(/static/fonts/Prompt-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; -} +@font-face + font-family: "Prompt" + font-style: normal + font-weight: 700 + src: local("Prompt Bold"), local("Prompt-Bold"), url(/static/fonts/Prompt-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 -- 2.47.3