diff --git a/assets/styles/application.template.scss b/assets/styles/application.template.scss
index 3278c8a..219cadb 100644
--- a/assets/styles/application.template.scss
+++ b/assets/styles/application.template.scss
@@ -1,11 +1,21 @@
+// loading bootstrap
+// TODO: Refactor to use bootstrap sass variable for theming.
@import 'bootstrap/scss/bootstrap.scss';
+// The Mulish font, we use font-weight 300 - 700
+@import '@fontsource/mulish/300';
+@import '@fontsource/mulish/index'; // 400
+@import '@fontsource/mulish/500';
+@import '@fontsource/mulish/600';
+@import '@fontsource/mulish/700';
+
+// layouts
@import './layouts/main';
+// navigators
@import './navigators/navbar';
-
-
+// features and services, only imported if enabled.
{{ range $feature, $featureDef := site.Params.features }}
{{ with $featureDef }}
{{ $featureEnabled := or (not (isset . "enable")) .enable }}
diff --git a/assets/styles/colortheme/colortheme.css b/assets/styles/colortheme/colortheme.css
new file mode 100644
index 0000000..8199df0
--- /dev/null
+++ b/assets/styles/colortheme/colortheme.css
@@ -0,0 +1,20 @@
+/* Note: No need to invert when the screen is small because the navbar is
+ collapsed to a hamburger menu. */
+ @media only screen and (min-width: 1200px) {
+ .dynamic-navbar .navbar-icon-svg-dark {
+ filter: invert(1);
+ };
+ }
+
+ @media only screen and (min-width: 1200px) {
+ .dropdown-menu-icons-only {
+ width: 25px;
+ min-width: 3rem;
+ }
+ }
+
+ .menu-icon-center {
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+ }
\ No newline at end of file
diff --git a/assets/styles/layouts/main.css b/assets/styles/layouts/main.css
index 747631f..8286c46 100644
--- a/assets/styles/layouts/main.css
+++ b/assets/styles/layouts/main.css
@@ -35,7 +35,7 @@ Yellow: #FFC212
body {
background-color: #f9fafc;
- font-family: "Muli";
+ font-family: "Mulish";
}
h1,
diff --git a/config.yaml b/config.yaml
index 14f0114..a8cb1ff 100644
--- a/config.yaml
+++ b/config.yaml
@@ -15,4 +15,6 @@ module:
- source: archetypes
target: archetypes
- source: ../../node_modules/flag-icon-css/flags
- target: static/flags
\ No newline at end of file
+ target: static/flags
+ - source: ../../node_modules/@fontsource/mulish/files
+ target: static/files
\ No newline at end of file
diff --git a/data/toha/styles.yml b/data/toha/styles.yml
index 984c8f0..76a6c1f 100644
--- a/data/toha/styles.yml
+++ b/data/toha/styles.yml
@@ -6,4 +6,10 @@ videoplayer:
services:
plyr:
styles:
- - plyr/dist/plyr
\ No newline at end of file
+ - plyr/dist/plyr
+
+darkmode:
+ services:
+ darkreader:
+ styles:
+ - ./colortheme/colortheme
\ No newline at end of file
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index bf9dd28..20c962e 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -4,14 +4,6 @@
{{ partial "helpers/style-bundle.html" . }}
-
-
-
-
-{{ if site.Params.features.darkMode.enable }}
-
-{{ end }}
-
{{/* add favicon only if the site author has provided the the favicon */}}
{{ if site.Params.logo.favicon }}
diff --git a/static/css/colortheme/colortheme.css b/static/css/colortheme/colortheme.css
deleted file mode 100644
index 2bcf17c..0000000
--- a/static/css/colortheme/colortheme.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Note: No need to invert when the screen is small because the navbar is
- collapsed to a hamburger menu. */
-@media only screen and (min-width: 1200px) {
- .dynamic-navbar .navbar-icon-svg-dark {
- filter: invert(1);
- };
-}
-
-@media only screen and (min-width: 1200px) {
- .dropdown-menu-icons-only {
- width: 25px;
- min-width: 3rem;
- }
-}
-
-.menu-icon-center {
- display: block;
- margin-left: auto;
- margin-right: auto;
-}
\ No newline at end of file
diff --git a/static/google-fonts/Mulish/Mulish-Italic-VariableFont_wght.ttf b/static/google-fonts/Mulish/Mulish-Italic-VariableFont_wght.ttf
deleted file mode 100644
index b31ad31..0000000
Binary files a/static/google-fonts/Mulish/Mulish-Italic-VariableFont_wght.ttf and /dev/null differ
diff --git a/static/google-fonts/Mulish/Mulish-VariableFont_wght.ttf b/static/google-fonts/Mulish/Mulish-VariableFont_wght.ttf
deleted file mode 100644
index 74a3dbd..0000000
Binary files a/static/google-fonts/Mulish/Mulish-VariableFont_wght.ttf and /dev/null differ
diff --git a/static/google-fonts/Mulish/OFL.txt b/static/google-fonts/Mulish/OFL.txt
deleted file mode 100644
index d277408..0000000
--- a/static/google-fonts/Mulish/OFL.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-Copyright 2016 The Mulish Project Authors (https://github.com/googlefonts/mulish)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/static/google-fonts/Mulish/README.txt b/static/google-fonts/Mulish/README.txt
deleted file mode 100644
index 4bb527f..0000000
--- a/static/google-fonts/Mulish/README.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-Mulish Variable Font
-====================
-
-This download contains Mulish as both variable fonts and static fonts.
-
-Mulish is a variable font with this axis:
- wght
-
-This means all the styles are contained in these files:
- Mulish-VariableFont_wght.ttf
- Mulish-Italic-VariableFont_wght.ttf
-
-If your app fully supports variable fonts, you can now pick intermediate styles
-that aren’t available as static fonts. Not all apps support variable fonts, and
-in those cases you can use the static font files for Mulish:
- static/Mulish-ExtraLight.ttf
- static/Mulish-Light.ttf
- static/Mulish-Regular.ttf
- static/Mulish-Medium.ttf
- static/Mulish-SemiBold.ttf
- static/Mulish-Bold.ttf
- static/Mulish-ExtraBold.ttf
- static/Mulish-Black.ttf
- static/Mulish-ExtraLightItalic.ttf
- static/Mulish-LightItalic.ttf
- static/Mulish-Italic.ttf
- static/Mulish-MediumItalic.ttf
- static/Mulish-SemiBoldItalic.ttf
- static/Mulish-BoldItalic.ttf
- static/Mulish-ExtraBoldItalic.ttf
- static/Mulish-BlackItalic.ttf
-
-Get started
------------
-
-1. Install the font files you want to use
-
-2. Use your app's font picker to view the font family and all the
-available styles
-
-Learn more about variable fonts
--------------------------------
-
- https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
- https://variablefonts.typenetwork.com
- https://medium.com/variable-fonts
-
-In desktop apps
-
- https://theblog.adobe.com/can-variable-fonts-illustrator-cc
- https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
-
-Online
-
- https://developers.google.com/fonts/docs/getting_started
- https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
- https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
-
-Installing fonts
-
- MacOS: https://support.apple.com/en-us/HT201749
- Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
- Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
-
-Android Apps
-
- https://developers.google.com/fonts/docs/android
- https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
-
-License
--------
-Please read the full license text (OFL.txt) to understand the permissions,
-restrictions and requirements for usage, redistribution, and modification.
-
-You can use them in your products & projects – print or digital,
-commercial or otherwise.
-
-This isn't legal advice, please consider consulting a lawyer and see the full
-license for all details.
diff --git a/static/google-fonts/Mulish/mulish.css b/static/google-fonts/Mulish/mulish.css
deleted file mode 100644
index dd14ddb..0000000
--- a/static/google-fonts/Mulish/mulish.css
+++ /dev/null
@@ -1,96 +0,0 @@
- /* vietnamese */
-@font-face {
- font-family: 'Muli';
- font-style: normal;
- font-weight: 300;
- src: url(/google-fonts/Mulish/Mulish-VariableFont_wght.ttf) format('truetype');
- unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
-}
-/* latin-ext */
-@font-face {
- font-family: 'Muli';
- font-style: normal;
- font-weight: 300;
- src: url(/google-fonts/Mulish/Mulish-VariableFont_wght.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: 'Muli';
- font-style: normal;
- font-weight: 300;
- src: url(/google-fonts/Mulish/Mulish-VariableFont_wght.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;
-}
-/* vietnamese */
-@font-face {
- font-family: 'Muli';
- font-style: normal;
- font-weight: 400;
- src: url(/google-fonts/Mulish/Mulish-VariableFont_wght.ttf) format('truetype');
- unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
-}
-/* latin-ext */
-@font-face {
- font-family: 'Muli';
- font-style: normal;
- font-weight: 400;
- src: url(/google-fonts/Mulish/Mulish-VariableFont_wght.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: 'Muli';
- font-style: normal;
- font-weight: 400;
- src: url(/google-fonts/Mulish/Mulish-VariableFont_wght.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;
-}
-/* vietnamese */
-@font-face {
- font-family: 'Muli';
- font-style: normal;
- font-weight: 500;
- src: url(/google-fonts/Mulish/Mulish-VariableFont_wght.ttf) format('truetype');
- unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
-}
-/* latin-ext */
-@font-face {
- font-family: 'Muli';
- font-style: normal;
- font-weight: 500;
- src: url(/google-fonts/Mulish/Mulish-VariableFont_wght.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: 'Muli';
- font-style: normal;
- font-weight: 500;
- src: url(/google-fonts/Mulish/Mulish-VariableFont_wght.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;
-}
-/* vietnamese */
-@font-face {
- font-family: 'Muli';
- font-style: normal;
- font-weight: 600;
- src: url(/google-fonts/Mulish/Mulish-VariableFont_wght.ttf) format('truetype');
- unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
-}
-/* latin-ext */
-@font-face {
- font-family: 'Muli';
- font-style: normal;
- font-weight: 600;
- src: url(/google-fonts/Mulish/Mulish-VariableFont_wght.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: 'Muli';
- font-style: normal;
- font-weight: 600;
- src: url(/google-fonts/Mulish/Mulish-VariableFont_wght.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;
-}
\ No newline at end of file
diff --git a/static/google-fonts/Mulish/static/Mulish-Black.ttf b/static/google-fonts/Mulish/static/Mulish-Black.ttf
deleted file mode 100644
index 2fab2a5..0000000
Binary files a/static/google-fonts/Mulish/static/Mulish-Black.ttf and /dev/null differ
diff --git a/static/google-fonts/Mulish/static/Mulish-BlackItalic.ttf b/static/google-fonts/Mulish/static/Mulish-BlackItalic.ttf
deleted file mode 100644
index 144fa2c..0000000
Binary files a/static/google-fonts/Mulish/static/Mulish-BlackItalic.ttf and /dev/null differ
diff --git a/static/google-fonts/Mulish/static/Mulish-Bold.ttf b/static/google-fonts/Mulish/static/Mulish-Bold.ttf
deleted file mode 100644
index 1cfe324..0000000
Binary files a/static/google-fonts/Mulish/static/Mulish-Bold.ttf and /dev/null differ
diff --git a/static/google-fonts/Mulish/static/Mulish-BoldItalic.ttf b/static/google-fonts/Mulish/static/Mulish-BoldItalic.ttf
deleted file mode 100644
index 88e88dd..0000000
Binary files a/static/google-fonts/Mulish/static/Mulish-BoldItalic.ttf and /dev/null differ
diff --git a/static/google-fonts/Mulish/static/Mulish-ExtraBold.ttf b/static/google-fonts/Mulish/static/Mulish-ExtraBold.ttf
deleted file mode 100644
index f203a0f..0000000
Binary files a/static/google-fonts/Mulish/static/Mulish-ExtraBold.ttf and /dev/null differ
diff --git a/static/google-fonts/Mulish/static/Mulish-ExtraBoldItalic.ttf b/static/google-fonts/Mulish/static/Mulish-ExtraBoldItalic.ttf
deleted file mode 100644
index b629858..0000000
Binary files a/static/google-fonts/Mulish/static/Mulish-ExtraBoldItalic.ttf and /dev/null differ
diff --git a/static/google-fonts/Mulish/static/Mulish-ExtraLight.ttf b/static/google-fonts/Mulish/static/Mulish-ExtraLight.ttf
deleted file mode 100644
index 0cb1a3a..0000000
Binary files a/static/google-fonts/Mulish/static/Mulish-ExtraLight.ttf and /dev/null differ
diff --git a/static/google-fonts/Mulish/static/Mulish-ExtraLightItalic.ttf b/static/google-fonts/Mulish/static/Mulish-ExtraLightItalic.ttf
deleted file mode 100644
index 45a263f..0000000
Binary files a/static/google-fonts/Mulish/static/Mulish-ExtraLightItalic.ttf and /dev/null differ
diff --git a/static/google-fonts/Mulish/static/Mulish-Italic.ttf b/static/google-fonts/Mulish/static/Mulish-Italic.ttf
deleted file mode 100644
index 1a92be1..0000000
Binary files a/static/google-fonts/Mulish/static/Mulish-Italic.ttf and /dev/null differ
diff --git a/static/google-fonts/Mulish/static/Mulish-Light.ttf b/static/google-fonts/Mulish/static/Mulish-Light.ttf
deleted file mode 100644
index 3b6feb1..0000000
Binary files a/static/google-fonts/Mulish/static/Mulish-Light.ttf and /dev/null differ
diff --git a/static/google-fonts/Mulish/static/Mulish-LightItalic.ttf b/static/google-fonts/Mulish/static/Mulish-LightItalic.ttf
deleted file mode 100644
index ad149d9..0000000
Binary files a/static/google-fonts/Mulish/static/Mulish-LightItalic.ttf and /dev/null differ
diff --git a/static/google-fonts/Mulish/static/Mulish-Medium.ttf b/static/google-fonts/Mulish/static/Mulish-Medium.ttf
deleted file mode 100644
index 50c337b..0000000
Binary files a/static/google-fonts/Mulish/static/Mulish-Medium.ttf and /dev/null differ
diff --git a/static/google-fonts/Mulish/static/Mulish-MediumItalic.ttf b/static/google-fonts/Mulish/static/Mulish-MediumItalic.ttf
deleted file mode 100644
index 627d045..0000000
Binary files a/static/google-fonts/Mulish/static/Mulish-MediumItalic.ttf and /dev/null differ
diff --git a/static/google-fonts/Mulish/static/Mulish-Regular.ttf b/static/google-fonts/Mulish/static/Mulish-Regular.ttf
deleted file mode 100644
index 57d7f11..0000000
Binary files a/static/google-fonts/Mulish/static/Mulish-Regular.ttf and /dev/null differ
diff --git a/static/google-fonts/Mulish/static/Mulish-SemiBold.ttf b/static/google-fonts/Mulish/static/Mulish-SemiBold.ttf
deleted file mode 100644
index 22fd7bc..0000000
Binary files a/static/google-fonts/Mulish/static/Mulish-SemiBold.ttf and /dev/null differ
diff --git a/static/google-fonts/Mulish/static/Mulish-SemiBoldItalic.ttf b/static/google-fonts/Mulish/static/Mulish-SemiBoldItalic.ttf
deleted file mode 100644
index 89a7757..0000000
Binary files a/static/google-fonts/Mulish/static/Mulish-SemiBoldItalic.ttf and /dev/null differ