diff --git a/marko/browser.json b/marko/browser.json index bd85bb1..601772d 100644 --- a/marko/browser.json +++ b/marko/browser.json @@ -1,8 +1,8 @@ { "dependencies": [ + "./global/fonts.less", "./global/base.less", "./global/colors.less", - "./global/navbar.less", - "./global/fonts.less" + "./global/navbar.less" ] } \ No newline at end of file diff --git a/marko/components/menu/index.marko b/marko/components/menu/index.marko index 9f543e4..bacb2fe 100644 --- a/marko/components/menu/index.marko +++ b/marko/components/menu/index.marko @@ -6,10 +6,12 @@ Login Logout (${input.user.name}) - + +

Logging you in...

You may be redirected to Auth0 if it's been a while.

- + +

Logging you out...

You can probably log back in without entering your info if you're quick.

diff --git a/marko/components/modal/index.marko b/marko/components/modal/index.marko index e04912d..52a9f71 100644 --- a/marko/components/modal/index.marko +++ b/marko/components/modal/index.marko @@ -3,7 +3,6 @@
X
-

${input.title}

diff --git a/marko/global/base.less b/marko/global/base.less index 821a699..8ee352a 100644 --- a/marko/global/base.less +++ b/marko/global/base.less @@ -2,6 +2,7 @@ body { margin: 0; padding: 0; font-family: Aneliza, sans-serif; + font-display: swap; background-color: black; color: white; diff --git a/marko/global/colors.less b/marko/global/colors.less index 9861792..5fceb71 100644 --- a/marko/global/colors.less +++ b/marko/global/colors.less @@ -8,7 +8,7 @@ body.theme-story { .menu-link:hover, .menu > .head-menu > a:hover { background-color: rgba(17, 187, 255, 0.25); } - .color-primary, .markdown-content h1, .markdown-content h2, .markdown-content h3, .markdown-content h4, .markdown-content hr, .markdown-content a { + .color-primary, .modal h1, .modal h2, .markdown-content h1, .markdown-content h2, .markdown-content h3, .markdown-content h4, .markdown-content hr, .markdown-content a { color: #4BF; } .color-text { @@ -33,7 +33,7 @@ body.theme-logs { .menu-link:hover, .Menu > .head-menu > a:hover { background-color: rgba(255, 187, 17, 0.25); } - .color-primary, .markdown-content h1, .markdown-content h2, .markdown-content h3, .markdown-content h4, .markdown-content hr, .markdown-content a { + .color-primary, .modal h1, .modal h2, .markdown-content h1, .markdown-content h2, .markdown-content h3, .markdown-content h4, .markdown-content hr, .markdown-content a { color: #DA1; } .color-text { @@ -58,7 +58,7 @@ body.theme-logs { .menu-link:hover, .menu > .head-menu > a:hover { background-color: rgba(35, 255, 128, 0.25); } - .color-primary, .markdown-content h1, .markdown-content h2, .markdown-content h3, .markdown-content h4, .markdown-content hr, .markdown-content a { + .color-primary, .modal h1, .modal h2, .markdown-content h1, .markdown-content h2, .markdown-content h3, .markdown-content h4, .markdown-content hr, .markdown-content a { color: #1F8; } .color-text { diff --git a/marko/global/fonts.less b/marko/global/fonts.less index 1eae11c..762f174 100644 --- a/marko/global/fonts.less +++ b/marko/global/fonts.less @@ -3,6 +3,7 @@ font-family: 'Aneliza'; font-weight: normal; font-style: normal; + font-display: swap; src: url(/assets/fonts/Aneliza-Regular.eot); src: url(/assets/fonts/Aneliza-Regular.eot?#iefix) format('embedded-opentype'), url(/assets/fonts/Aneliza-Regular.woff2) format('woff2'), @@ -16,6 +17,7 @@ font-family: 'Aneliza'; font-weight: normal; font-style: italic; + font-display: swap; src: url(/assets/fonts/Aneliza-Italic.eot); src: url(/assets/fonts/Aneliza-Italic.eot?#iefix) format('embedded-opentype'), url(/assets/fonts/Aneliza-Italic.woff2) format('woff2'), @@ -29,6 +31,7 @@ font-family: 'Aneliza'; font-weight: 100; font-style: normal; + font-display: swap; src: url(/assets/fonts/Aneliza-Thin.eot); src: url(/assets/fonts/Aneliza-Thin.eot?#iefix) format('embedded-opentype'), url(/assets/fonts/Aneliza-Thin.woff2) format('woff2'), @@ -42,6 +45,7 @@ font-family: 'Aneliza'; font-weight: 100; font-style: italic; + font-display: swap; src: url(/assets/fonts/Aneliza-ThinItalic.eot); src: url(/assets/fonts/Aneliza-ThinItalic.eot?#iefix) format('embedded-opentype'), url(/assets/fonts/Aneliza-ThinItalic.woff2) format('woff2'), @@ -55,6 +59,7 @@ font-family: 'Aneliza'; font-weight: 200; font-style: normal; + font-display: swap; src: url(/assets/fonts/Aneliza-Light.eot); src: url(/assets/fonts/Aneliza-Light.eot?#iefix) format('embedded-opentype'), url(/assets/fonts/Aneliza-Light.woff2) format('woff2'), @@ -68,6 +73,7 @@ font-family: 'Aneliza'; font-weight: 200; font-style: italic; + font-display: swap; src: url(/assets/fonts/Aneliza-LightItalic.eot); src: url(/assets/fonts/Aneliza-LightItalic.eot?#iefix) format('embedded-opentype'), url(/assets/fonts/Aneliza-LightItalic.woff2) format('woff2'), @@ -81,6 +87,7 @@ font-family: 'Aneliza'; font-weight: bold; font-style: normal; + font-display: swap; src: url(/assets/fonts/Aneliza-Bold.eot); src: url(/assets/fonts/Aneliza-Bold.eot?#iefix) format('embedded-opentype'), url(/assets/fonts/Aneliza-Bold.woff2) format('woff2'), @@ -94,6 +101,7 @@ font-family: 'Aneliza'; font-weight: bold; font-style: italic; + font-display: swap; src: url(/assets/fonts/Aneliza-BoldItalic.eot); src: url(/assets/fonts/Aneliza-BoldItalic.eot?#iefix) format('embedded-opentype'), url(/assets/fonts/Aneliza-BoldItalic.woff2) format('woff2'),