diff --git a/docroot/css/S6u8w4BMUTPHjxsAUi-qJCY.woff2 b/docroot/css/S6u8w4BMUTPHjxsAUi-qJCY.woff2 new file mode 100755 index 00000000..69af6c08 Binary files /dev/null and b/docroot/css/S6u8w4BMUTPHjxsAUi-qJCY.woff2 differ diff --git a/docroot/css/S6u8w4BMUTPHjxsAXC-q.woff2 b/docroot/css/S6u8w4BMUTPHjxsAXC-q.woff2 new file mode 100755 index 00000000..3246c128 Binary files /dev/null and b/docroot/css/S6u8w4BMUTPHjxsAXC-q.woff2 differ diff --git a/docroot/css/S6u9w4BMUTPHh6UVSwaPGR_p.woff2 b/docroot/css/S6u9w4BMUTPHh6UVSwaPGR_p.woff2 new file mode 100755 index 00000000..c5d944d2 Binary files /dev/null and b/docroot/css/S6u9w4BMUTPHh6UVSwaPGR_p.woff2 differ diff --git a/docroot/css/S6u9w4BMUTPHh6UVSwiPGQ.woff2 b/docroot/css/S6u9w4BMUTPHh6UVSwiPGQ.woff2 new file mode 100755 index 00000000..f8c37ecd Binary files /dev/null and b/docroot/css/S6u9w4BMUTPHh6UVSwiPGQ.woff2 differ diff --git a/docroot/css/S6uyw4BMUTPHjx4wXg.woff2 b/docroot/css/S6uyw4BMUTPHjx4wXg.woff2 new file mode 100755 index 00000000..6904b664 Binary files /dev/null and b/docroot/css/S6uyw4BMUTPHjx4wXg.woff2 differ diff --git a/docroot/css/S6uyw4BMUTPHjxAwXjeu.woff2 b/docroot/css/S6uyw4BMUTPHjxAwXjeu.woff2 new file mode 100755 index 00000000..0a0ee5ea Binary files /dev/null and b/docroot/css/S6uyw4BMUTPHjxAwXjeu.woff2 differ diff --git a/docroot/css/bootstrap-darkly.min.css b/docroot/css/bootstrap-darkly.min.css index 68048ef2..afed1509 100755 --- a/docroot/css/bootstrap-darkly.min.css +++ b/docroot/css/bootstrap-darkly.min.css @@ -1,4 +1,4 @@ -@import url("https://fonts.googleapis.com/css?family=Lato:400,700,400italic&display=swap");/*! +/*! * bootswatch v3.4.1 * Homepage: http://bootswatch.com * Copyright 2012-2019 Thomas Park diff --git a/docroot/css/bootstrap-flatly.min.css b/docroot/css/bootstrap-flatly.min.css index 7d99e1b6..14ea2fc1 100755 --- a/docroot/css/bootstrap-flatly.min.css +++ b/docroot/css/bootstrap-flatly.min.css @@ -1,4 +1,4 @@ -@import url("https://fonts.googleapis.com/css?family=Lato:400,700,400italic&display=swap");/*! +/*! * bootswatch v3.4.1 * Homepage: http://bootswatch.com * Copyright 2012-2019 Thomas Park diff --git a/docroot/css/fonts.css b/docroot/css/fonts.css new file mode 100755 index 00000000..f2f53989 --- /dev/null +++ b/docroot/css/fonts.css @@ -0,0 +1,54 @@ +/* latin-ext */ +@font-face { + font-family: 'Lato'; + font-style: italic; + font-weight: 400; + font-display: swap; + src: local('Lato Italic'), local('Lato-Italic'), url(S6u8w4BMUTPHjxsAUi-qJCY.woff2) format('woff2'); + 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: 'Lato'; + font-style: italic; + font-weight: 400; + font-display: swap; + src: local('Lato Italic'), local('Lato-Italic'), url(S6u8w4BMUTPHjxsAXC-q.woff2) format('woff2'); + 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: 'Lato'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: local('Lato Regular'), local('Lato-Regular'), url(S6uyw4BMUTPHjxAwXjeu.woff2) format('woff2'); + 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: 'Lato'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: local('Lato Regular'), local('Lato-Regular'), url(S6uyw4BMUTPHjx4wXg.woff2) format('woff2'); + 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: 'Lato'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: local('Lato Bold'), local('Lato-Bold'), url(S6u9w4BMUTPHh6UVSwaPGR_p.woff2) format('woff2'); + 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: 'Lato'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: local('Lato Bold'), local('Lato-Bold'), url(S6u9w4BMUTPHh6UVSwiPGQ.woff2) format('woff2'); + 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/lms/ui/LmsTheme.cpp b/src/lms/ui/LmsTheme.cpp index 6c6c97a2..d56cbe5a 100644 --- a/src/lms/ui/LmsTheme.cpp +++ b/src/lms/ui/LmsTheme.cpp @@ -66,6 +66,7 @@ LmsTheme::getStyleSheets(Database::User::UITheme theme) case Database::User::UITheme::Dark: return { + {"css/fonts.css"}, {"css/bootstrap-darkly.min.css"}, {"resources/themes/bootstrap/3/wt.css"}, {"css/lms.css"}, @@ -75,6 +76,7 @@ LmsTheme::getStyleSheets(Database::User::UITheme theme) case Database::User::UITheme::Light: return { + {"css/fonts.css"}, {"css/bootstrap-flatly.min.css"}, {"resources/themes/bootstrap/3/wt.css"}, {"css/lms.css"},