diff --git a/.prettierignore b/.prettierignore index fc7b519b9f..c444d6c11b 100644 --- a/.prettierignore +++ b/.prettierignore @@ -11,7 +11,6 @@ layouts static/css/auto-complete.css static/css/*.min.css static/css/swagger*.css -static/fonts static/js/d3 static/js/lunr static/js/mathjax diff --git a/layouts/partials/version.txt b/layouts/partials/version.txt index 996373d262..845f1a09a4 100644 --- a/layouts/partials/version.txt +++ b/layouts/partials/version.txt @@ -1 +1 @@ -7.1.1+348702d8c2926bae9111a239755ac66866129748 \ No newline at end of file +7.1.1+ce72cce3e975a2df3fd86891e32d6b8921c55b92 \ No newline at end of file diff --git a/static/css/fonts.css b/static/css/fonts.css index fecbb16256..079ca049cb 100644 --- a/static/css/fonts.css +++ b/static/css/fonts.css @@ -1,73 +1,73 @@ -/* Roboto Flex -/* Variant 1: Every glyph, every axis, one big file */ -/* - Download TTF font from https://github.com/googlefonts/roboto-flex */ -/* - Convert TTF to WOFF2 using any converter tool */ -/* -@font-face { - font-family: 'Roboto Flex'; - font-style: normal; - font-weight: 100 1000; - font-stretch: 100%; - font-display: swap; - src: url("../fonts/RobotoFlex.woff2") format('woff2-variations'); -} -*/ - -/* Variant 2: Splitted glyphs, selected axes, multiple moderatly sized files */ -/* - Download CSS with selected axes https://fonts.googleapis.com/css2?family=Roboto+Flex:opsz,wdth,wght,GRAD,YTFI@8..144,118,100..1000,-200..150,710&display=swap -/* - Downlaod fonts of src attributes of resulting CSS and edit file names accordingly */ - -@font-face { - font-family: 'Roboto Flex'; - font-style: normal; - font-weight: 100 1000; - font-stretch: 100%; - font-display: swap; - src: url('../fonts/RobotoFlex.cyrillic-ext.woff2') format('woff2-variations'); - unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; -} -@font-face { - font-family: 'Roboto Flex'; - font-style: normal; - font-weight: 100 1000; - font-stretch: 100%; - font-display: swap; - src: url('../fonts/RobotoFlex.cyrillic.woff2') format('woff2-variations'); - unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} -@font-face { - font-family: 'Roboto Flex'; - font-style: normal; - font-weight: 100 1000; - font-stretch: 100%; - font-display: swap; - src: url('../fonts/RobotoFlex.greek.woff2') format('woff2-variations'); - unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF; -} -@font-face { - font-family: 'Roboto Flex'; - font-style: normal; - font-weight: 100 1000; - font-stretch: 100%; - font-display: swap; - src: url('../fonts/RobotoFlex.vietnamese.woff2') format('woff2-variations'); - unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB; -} -@font-face { - font-family: 'Roboto Flex'; - font-style: normal; - font-weight: 100 1000; - font-stretch: 100%; - font-display: swap; - src: url('../fonts/RobotoFlex.latin-ext.woff2') format('woff2-variations'); - unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF; -} -@font-face { - font-family: 'Roboto Flex'; - font-style: normal; - font-weight: 100 1000; - font-stretch: 100%; - font-display: swap; - src: url('../fonts/RobotoFlex.latin.woff2') format('woff2-variations'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} +/* Roboto Flex +/* Variant 1: Every glyph, every axis, one big file */ +/* - Download TTF font from https://github.com/googlefonts/Roboto-flex */ +/* - Convert TTF to WOFF2 using any converter tool */ +/* +@font-face { + font-family: 'Roboto Flex'; + font-style: normal; + font-weight: 100 1000; + font-stretch: 100%; + font-display: swap; + src: url("../webfonts/RobotoFlex.woff2") format('woff2-variations'); +} +*/ + +/* Variant 2: Splitted glyphs, selected axes, multiple moderatly sized files */ +/* - Download CSS with selected axes https://fonts.googleapis.com/css2?family=Roboto+Flex:opsz,wdth,wght,GRAD,YTFI@8..144,118,100..1000,-200..150,710&display=swap +/* - Downlaod fonts of src attributes of resulting CSS and edit file names accordingly */ + +@font-face { + font-family: 'Roboto Flex'; + font-style: normal; + font-weight: 100 1000; + font-stretch: 100%; + font-display: swap; + src: url('../webfonts/RobotoFlex.cyrillic-ext.woff2') format('woff2-variations'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; +} +@font-face { + font-family: 'Roboto Flex'; + font-style: normal; + font-weight: 100 1000; + font-stretch: 100%; + font-display: swap; + src: url('../webfonts/RobotoFlex.cyrillic.woff2') format('woff2-variations'); + unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +@font-face { + font-family: 'Roboto Flex'; + font-style: normal; + font-weight: 100 1000; + font-stretch: 100%; + font-display: swap; + src: url('../webfonts/RobotoFlex.greek.woff2') format('woff2-variations'); + unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF; +} +@font-face { + font-family: 'Roboto Flex'; + font-style: normal; + font-weight: 100 1000; + font-stretch: 100%; + font-display: swap; + src: url('../webfonts/RobotoFlex.vietnamese.woff2') format('woff2-variations'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB; +} +@font-face { + font-family: 'Roboto Flex'; + font-style: normal; + font-weight: 100 1000; + font-stretch: 100%; + font-display: swap; + src: url('../webfonts/RobotoFlex.latin-ext.woff2') format('woff2-variations'); + unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +@font-face { + font-family: 'Roboto Flex'; + font-style: normal; + font-weight: 100 1000; + font-stretch: 100%; + font-display: swap; + src: url('../webfonts/RobotoFlex.latin.woff2') format('woff2-variations'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} diff --git a/static/fonts/RobotoFlex.cyrillic-ext.woff2 b/static/webfonts/RobotoFlex.cyrillic-ext.woff2 similarity index 100% rename from static/fonts/RobotoFlex.cyrillic-ext.woff2 rename to static/webfonts/RobotoFlex.cyrillic-ext.woff2 diff --git a/static/fonts/RobotoFlex.cyrillic.woff2 b/static/webfonts/RobotoFlex.cyrillic.woff2 similarity index 100% rename from static/fonts/RobotoFlex.cyrillic.woff2 rename to static/webfonts/RobotoFlex.cyrillic.woff2 diff --git a/static/fonts/RobotoFlex.greek.woff2 b/static/webfonts/RobotoFlex.greek.woff2 similarity index 100% rename from static/fonts/RobotoFlex.greek.woff2 rename to static/webfonts/RobotoFlex.greek.woff2 diff --git a/static/fonts/RobotoFlex.latin-ext.woff2 b/static/webfonts/RobotoFlex.latin-ext.woff2 similarity index 100% rename from static/fonts/RobotoFlex.latin-ext.woff2 rename to static/webfonts/RobotoFlex.latin-ext.woff2 diff --git a/static/fonts/RobotoFlex.latin.woff2 b/static/webfonts/RobotoFlex.latin.woff2 similarity index 100% rename from static/fonts/RobotoFlex.latin.woff2 rename to static/webfonts/RobotoFlex.latin.woff2 diff --git a/static/fonts/RobotoFlex.vietnamese.woff2 b/static/webfonts/RobotoFlex.vietnamese.woff2 similarity index 100% rename from static/fonts/RobotoFlex.vietnamese.woff2 rename to static/webfonts/RobotoFlex.vietnamese.woff2 diff --git a/static/fonts/RobotoFlex.woff2 b/static/webfonts/RobotoFlex.woff2 similarity index 100% rename from static/fonts/RobotoFlex.woff2 rename to static/webfonts/RobotoFlex.woff2