diff --git a/assets/makai.css/ascii.css b/assets/makai.css/ascii.css index a101e94..4de293f 100644 --- a/assets/makai.css/ascii.css +++ b/assets/makai.css/ascii.css @@ -28,7 +28,7 @@ } .ascii-char-print { white-space: pre; - font-family: 'Victor Mono', Consolas, 'Liberation Mono', Menlo, Courier, monospace; + font-family: var(--font-monospace, monospace); font-size: 2.5em; text-align: center; padding: 10px; @@ -65,7 +65,7 @@ font-variant: small-caps; } .ascii-char-misc-item-value { - font-family: 'Victor Mono', Consolas, 'Liberation Mono', Menlo, Courier, monospace; + font-family: var(--font-monospace, monospace); text-align: right; } .ascii-search { diff --git a/assets/makai.css/featured.css b/assets/makai.css/featured.css index 6449ca7..6c14074 100644 --- a/assets/makai.css/featured.css +++ b/assets/makai.css/featured.css @@ -29,7 +29,7 @@ height: 100%; } .index-feature-header-title { - font-family: 'Electrolize', Verdana, 'Dejavu Sans', Arial, Helvetica, sans-serif; + font-family: var(--font-header, sans-serif); font-size: 2em; line-height: 1.5em; pointer-events: none; diff --git a/assets/makai.css/fonts.css b/assets/makai.css/fonts.css deleted file mode 100644 index 0c7558f..0000000 --- a/assets/makai.css/fonts.css +++ /dev/null @@ -1,206 +0,0 @@ -@font-face { - font-family: 'Electrolize'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(/fonts/electrolize-400-normal-latin.woff2) format('woff2'); - 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; -} - -@font-face { - font-family: 'Victor Mono'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(/fonts/victormono-400-normal-cyrillic.woff2) format('woff2'); - unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} -@font-face { - font-family: 'Victor Mono'; - font-style: italic; - font-weight: 400; - font-display: swap; - src: url(/fonts/victormono-400-italic-cyrillic.woff2) format('woff2'); - unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} -@font-face { - font-family: 'Victor Mono'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(/fonts/victormono-700-normal-cyrillic.woff2) format('woff2'); - unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} -@font-face { - font-family: 'Victor Mono'; - font-style: italic; - font-weight: 700; - font-display: swap; - src: url(/fonts/victormono-700-italic-cyrillic.woff2) format('woff2'); - unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} - -@font-face { - font-family: 'Victor Mono'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(/fonts/victormono-400-normal-cyrillic-ext.woff2) format('woff2'); - unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; -} -@font-face { - font-family: 'Victor Mono'; - font-style: italic; - font-weight: 400; - font-display: swap; - src: url(/fonts/victormono-400-italic-cyrillic-ext.woff2) format('woff2'); - unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; -} -@font-face { - font-family: 'Victor Mono'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(/fonts/victormono-700-normal-cyrillic-ext.woff2) format('woff2'); - unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; -} -@font-face { - font-family: 'Victor Mono'; - font-style: italic; - font-weight: 700; - font-display: swap; - src: url(/fonts/victormono-700-italic-cyrillic-ext.woff2) format('woff2'); - unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; -} - -@font-face { - font-family: 'Victor Mono'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(/fonts/victormono-400-normal-greek.woff2) format('woff2'); - unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF; -} -@font-face { - font-family: 'Victor Mono'; - font-style: italic; - font-weight: 400; - font-display: swap; - src: url(/fonts/victormono-400-italic-greek.woff2) format('woff2'); - unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF; -} -@font-face { - font-family: 'Victor Mono'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(/fonts/victormono-700-normal-greek.woff2) format('woff2'); - unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF; -} -@font-face { - font-family: 'Victor Mono'; - font-style: italic; - font-weight: 700; - font-display: swap; - src: url(/fonts/victormono-700-italic-greek.woff2) format('woff2'); - unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF; -} - -@font-face { - font-family: 'Victor Mono'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(/fonts/victormono-400-normal-latin.woff2) format('woff2'); - 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; -} -@font-face { - font-family: 'Victor Mono'; - font-style: italic; - font-weight: 400; - font-display: swap; - src: url(/fonts/victormono-400-italic-latin.woff2) format('woff2'); - 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; -} -@font-face { - font-family: 'Victor Mono'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(/fonts/victormono-700-normal-latin.woff2) format('woff2'); - 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; -} -@font-face { - font-family: 'Victor Mono'; - font-style: italic; - font-weight: 700; - font-display: swap; - src: url(/fonts/victormono-700-italic-latin.woff2) format('woff2'); - 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; -} - -@font-face { - font-family: 'Victor Mono'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(/fonts/victormono-400-normal-latin-ext.woff2) format('woff2'); - 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: 'Victor Mono'; - font-style: italic; - font-weight: 400; - font-display: swap; - src: url(/fonts/victormono-400-italic-latin-ext.woff2) format('woff2'); - 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: 'Victor Mono'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(/fonts/victormono-700-normal-latin-ext.woff2) format('woff2'); - 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: 'Victor Mono'; - font-style: italic; - font-weight: 700; - font-display: swap; - src: url(/fonts/victormono-700-italic-latin-ext.woff2) format('woff2'); - 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: 'Victor Mono'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(/fonts/victormono-400-normal-vietnamese.woff2) format('woff2'); - 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: 'Victor Mono'; - font-style: italic; - font-weight: 400; - font-display: swap; - src: url(/fonts/victormono-400-italic-vietnamese.woff2) format('woff2'); - 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: 'Victor Mono'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(/fonts/victormono-700-normal-vietnamese.woff2) format('woff2'); - 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: 'Victor Mono'; - font-style: italic; - font-weight: 700; - font-display: swap; - src: url(/fonts/victormono-700-italic-vietnamese.woff2) format('woff2'); - 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; -} diff --git a/assets/makai.css/home.css b/assets/makai.css/home.css index 27699fe..3e89ad5 100644 --- a/assets/makai.css/home.css +++ b/assets/makai.css/home.css @@ -35,7 +35,7 @@ border-width: 0; background-color: transparent; color: #000; - font-family: Verdana, Geneva, 'Dejavu Sans', Arial, Helvetica, sans-serif; + font-family: var(--font-regular, sans-serif); font-size: 24px; line-height: 35px; width: 100%; @@ -59,7 +59,7 @@ align-items: center; flex-direction: column; width: 300px; - font-family: 'Electrolize', Verdana, 'Dejavu Sans', Arial, Helvetica, sans-serif; + font-family: var(--font-header, sans-serif); filter: drop-shadow(0 1px 5px #000); color: transparent; } diff --git a/assets/makai.css/main.css b/assets/makai.css/main.css index 74b1b9e..31e39aa 100644 --- a/assets/makai.css/main.css +++ b/assets/makai.css/main.css @@ -1,5 +1,3 @@ -@include fonts.css; - * { margin: 0; padding: 0; @@ -13,6 +11,15 @@ html, body { height: 100%; } +:root { + --font-size: 12px; + --line-height: 20px; + --font-regular: 'Zen Maru Gothic', Verdana, Geneva, 'Dejavu Sans', sans-serif; + --font-cursive: 'Hachi Maru Pop', cursive; + --font-monospace: 'Victor Mono', Consolas, 'Liberation Mono', Menlo, Courier, monospace; + --font-header: 'Electrolize', Verdana, 'Dejavu Sans', sans-serif; +} + .hidden { display: none !important; visibility: hidden !important; @@ -27,7 +34,7 @@ html { } pre, code { - font-family: 'Victor Mono', Consolas, 'Liberation Mono', Menlo, Courier, monospace; + font-family: var(--font-monospace, monospace); } /* an attempt to replicate scrollbar-color for chromosome */ @@ -48,9 +55,9 @@ pre, code { body { background-color: #111; color: #fff; - font-size: 12px; - line-height: 20px; - font-family: Verdana, Geneva, 'Dejavu Sans', Arial, Helvetica, sans-serif; + font-size: var(--font-size, 12px); + line-height: var(--line-height, 20px); + font-family: var(--font-regular, sans-serif); display: flex; flex-direction: column; } @@ -124,7 +131,7 @@ body { flex-direction: column; } .header-logo { - font-family: 'Electrolize', Verdana, 'Dejavu Sans', Arial, Helvetica, sans-serif; + font-family: var(--font-header, sans-serif); font-size: 3em; line-height: 1.2em; filter: drop-shadow(0 1px 5px #000); diff --git a/assets/makai.css/project.css b/assets/makai.css/project.css index dedf8b1..d412daf 100644 --- a/assets/makai.css/project.css +++ b/assets/makai.css/project.css @@ -18,7 +18,7 @@ font-size: 0; line-height: 0; display: inline-block; - font-family: Verdana, Geneva, 'Dejavu Sans', Arial, Helvetica, sans-serif; + font-family: var(--font-regular, sans-serif); margin-left: 4px; } .project-language { @@ -39,7 +39,7 @@ margin-bottom: 0; } .project-details h2 { - font-family: 'Electrolize', Verdana, 'Dejavu Sans', Arial, Helvetica, sans-serif; + font-family: var(--font-header, sans-serif); font-size: 2em; line-height: 1em; font-weight: 400; @@ -94,7 +94,7 @@ pointer-events: none; } .index-project-name { - font-family: 'Electrolize', Verdana, 'Dejavu Sans', Arial, Helvetica, sans-serif; + font-family: var(--font-header, sans-serif); flex: 1 1 auto; font-size: 1.5em; line-height: 1.5em; diff --git a/assets/makai.css/section.css b/assets/makai.css/section.css index 3280259..1bfff3f 100644 --- a/assets/makai.css/section.css +++ b/assets/makai.css/section.css @@ -20,7 +20,7 @@ transform: skew(-15deg); } .section-content h1 { - font-family: 'Electrolize', Verdana, 'Dejavu Sans', Arial, Helvetica, sans-serif; + font-family: var(--font-header, sans-serif); font-size: 2em; line-height: 1em; font-weight: 400; diff --git a/assets/makai.css/socials.css b/assets/makai.css/socials.css index 3d70db0..ac14a01 100644 --- a/assets/makai.css/socials.css +++ b/assets/makai.css/socials.css @@ -57,5 +57,5 @@ .social-handle { font-size: 1.5em; line-height: 1.3em; - font-family: 'Electrolize', Verdana, 'Dejavu Sans', Arial, Helvetica, sans-serif; + font-family: var(--font-header, sans-serif); } diff --git a/assets/makai.css/whois.css b/assets/makai.css/whois.css index 107cecf..9859da2 100644 --- a/assets/makai.css/whois.css +++ b/assets/makai.css/whois.css @@ -22,7 +22,7 @@ background-image: linear-gradient(0deg, #262626, #202020); border-width: 0; color: #fff; - font-family: Verdana, Geneva, 'Dejavu Sans', Arial, Helvetica, sans-serif; + font-family: var(--font-regular, sans-serif); } .whois-lookup-form-submit { flex: 0 0 auto; @@ -47,7 +47,7 @@ margin: 10px; padding: 6px 10px; white-space: pre-wrap; - font-family: 'Victor Mono', Consolas, 'Liberation Mono', Menlo, Courier, monospace; + font-family: var(--font-monospace, monospace); font-size: 14px; transition: opacity .2s; background-color: #202020; @@ -96,5 +96,5 @@ line-height: 1.2em; color: #888; white-space: pre-wrap; - font-family: 'Victor Mono', Consolas, 'Liberation Mono', Menlo, Courier, monospace; + font-family: var(--font-monospace, monospace); } diff --git a/public/fonts/electrolize-400-normal-latin.woff2 b/public/fonts/electrolize-400-normal-latin.woff2 deleted file mode 100644 index e6c94c3..0000000 Binary files a/public/fonts/electrolize-400-normal-latin.woff2 and /dev/null differ diff --git a/public/fonts/victormono-400-italic-cyrillic-ext.woff2 b/public/fonts/victormono-400-italic-cyrillic-ext.woff2 deleted file mode 100644 index f163ff6..0000000 Binary files a/public/fonts/victormono-400-italic-cyrillic-ext.woff2 and /dev/null differ diff --git a/public/fonts/victormono-400-italic-cyrillic.woff2 b/public/fonts/victormono-400-italic-cyrillic.woff2 deleted file mode 100644 index eebaafd..0000000 Binary files a/public/fonts/victormono-400-italic-cyrillic.woff2 and /dev/null differ diff --git a/public/fonts/victormono-400-italic-greek.woff2 b/public/fonts/victormono-400-italic-greek.woff2 deleted file mode 100644 index 508a565..0000000 Binary files a/public/fonts/victormono-400-italic-greek.woff2 and /dev/null differ diff --git a/public/fonts/victormono-400-italic-latin-ext.woff2 b/public/fonts/victormono-400-italic-latin-ext.woff2 deleted file mode 100644 index 5726859..0000000 Binary files a/public/fonts/victormono-400-italic-latin-ext.woff2 and /dev/null differ diff --git a/public/fonts/victormono-400-italic-latin.woff2 b/public/fonts/victormono-400-italic-latin.woff2 deleted file mode 100644 index b575698..0000000 Binary files a/public/fonts/victormono-400-italic-latin.woff2 and /dev/null differ diff --git a/public/fonts/victormono-400-italic-vietnamese.woff2 b/public/fonts/victormono-400-italic-vietnamese.woff2 deleted file mode 100644 index d312599..0000000 Binary files a/public/fonts/victormono-400-italic-vietnamese.woff2 and /dev/null differ diff --git a/public/fonts/victormono-400-normal-cyrillic-ext.woff2 b/public/fonts/victormono-400-normal-cyrillic-ext.woff2 deleted file mode 100644 index ece3fed..0000000 Binary files a/public/fonts/victormono-400-normal-cyrillic-ext.woff2 and /dev/null differ diff --git a/public/fonts/victormono-400-normal-cyrillic.woff2 b/public/fonts/victormono-400-normal-cyrillic.woff2 deleted file mode 100644 index c1ec29b..0000000 Binary files a/public/fonts/victormono-400-normal-cyrillic.woff2 and /dev/null differ diff --git a/public/fonts/victormono-400-normal-greek.woff2 b/public/fonts/victormono-400-normal-greek.woff2 deleted file mode 100644 index c534493..0000000 Binary files a/public/fonts/victormono-400-normal-greek.woff2 and /dev/null differ diff --git a/public/fonts/victormono-400-normal-latin-ext.woff2 b/public/fonts/victormono-400-normal-latin-ext.woff2 deleted file mode 100644 index ae90f9f..0000000 Binary files a/public/fonts/victormono-400-normal-latin-ext.woff2 and /dev/null differ diff --git a/public/fonts/victormono-400-normal-latin.woff2 b/public/fonts/victormono-400-normal-latin.woff2 deleted file mode 100644 index 9a9daad..0000000 Binary files a/public/fonts/victormono-400-normal-latin.woff2 and /dev/null differ diff --git a/public/fonts/victormono-400-normal-vietnamese.woff2 b/public/fonts/victormono-400-normal-vietnamese.woff2 deleted file mode 100644 index eef8f57..0000000 Binary files a/public/fonts/victormono-400-normal-vietnamese.woff2 and /dev/null differ diff --git a/public/fonts/victormono-700-italic-cyrillic-ext.woff2 b/public/fonts/victormono-700-italic-cyrillic-ext.woff2 deleted file mode 100644 index 5e56630..0000000 Binary files a/public/fonts/victormono-700-italic-cyrillic-ext.woff2 and /dev/null differ diff --git a/public/fonts/victormono-700-italic-cyrillic.woff2 b/public/fonts/victormono-700-italic-cyrillic.woff2 deleted file mode 100644 index 01ca699..0000000 Binary files a/public/fonts/victormono-700-italic-cyrillic.woff2 and /dev/null differ diff --git a/public/fonts/victormono-700-italic-greek.woff2 b/public/fonts/victormono-700-italic-greek.woff2 deleted file mode 100644 index 18e6e4b..0000000 Binary files a/public/fonts/victormono-700-italic-greek.woff2 and /dev/null differ diff --git a/public/fonts/victormono-700-italic-latin-ext.woff2 b/public/fonts/victormono-700-italic-latin-ext.woff2 deleted file mode 100644 index c6f7615..0000000 Binary files a/public/fonts/victormono-700-italic-latin-ext.woff2 and /dev/null differ diff --git a/public/fonts/victormono-700-italic-latin.woff2 b/public/fonts/victormono-700-italic-latin.woff2 deleted file mode 100644 index d69b097..0000000 Binary files a/public/fonts/victormono-700-italic-latin.woff2 and /dev/null differ diff --git a/public/fonts/victormono-700-italic-vietnamese.woff2 b/public/fonts/victormono-700-italic-vietnamese.woff2 deleted file mode 100644 index f5a6622..0000000 Binary files a/public/fonts/victormono-700-italic-vietnamese.woff2 and /dev/null differ diff --git a/public/fonts/victormono-700-normal-cyrillic-ext.woff2 b/public/fonts/victormono-700-normal-cyrillic-ext.woff2 deleted file mode 100644 index 0138bf1..0000000 Binary files a/public/fonts/victormono-700-normal-cyrillic-ext.woff2 and /dev/null differ diff --git a/public/fonts/victormono-700-normal-cyrillic.woff2 b/public/fonts/victormono-700-normal-cyrillic.woff2 deleted file mode 100644 index 17eac05..0000000 Binary files a/public/fonts/victormono-700-normal-cyrillic.woff2 and /dev/null differ diff --git a/public/fonts/victormono-700-normal-greek.woff2 b/public/fonts/victormono-700-normal-greek.woff2 deleted file mode 100644 index 462a22b..0000000 Binary files a/public/fonts/victormono-700-normal-greek.woff2 and /dev/null differ diff --git a/public/fonts/victormono-700-normal-latin-ext.woff2 b/public/fonts/victormono-700-normal-latin-ext.woff2 deleted file mode 100644 index f54c202..0000000 Binary files a/public/fonts/victormono-700-normal-latin-ext.woff2 and /dev/null differ diff --git a/public/fonts/victormono-700-normal-latin.woff2 b/public/fonts/victormono-700-normal-latin.woff2 deleted file mode 100644 index c96be32..0000000 Binary files a/public/fonts/victormono-700-normal-latin.woff2 and /dev/null differ diff --git a/public/fonts/victormono-700-normal-vietnamese.woff2 b/public/fonts/victormono-700-normal-vietnamese.woff2 deleted file mode 100644 index 7ee18b3..0000000 Binary files a/public/fonts/victormono-700-normal-vietnamese.woff2 and /dev/null differ diff --git a/templates/errors/500.html b/templates/errors/500.html deleted file mode 100644 index 66c7d79..0000000 --- a/templates/errors/500.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - HTTP 500 Internal Server Error // flash.moe - - - - - -
-
- -
-

HTTP 500 Internal Server Error

-
- 500 -
-

Something happened that caused the server to be unable to complete the request.

-
- -
-
- - diff --git a/templates/errors/503.html b/templates/errors/503.html deleted file mode 100644 index 1b614f9..0000000 --- a/templates/errors/503.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - HTTP 503 Service Temporarily Unavailable // flash.moe - - - - - -
-
- -
-

HTTP 503 Service Temporarily Unavailable

-
- 503 -
-

The website is currently unavailable, it will likely be back soon!

-
- -
-
- - diff --git a/templates/errors/master.twig b/templates/errors/master.twig index e11776a..10393a7 100644 --- a/templates/errors/master.twig +++ b/templates/errors/master.twig @@ -6,9 +6,9 @@ {% block master_head %} + {% endblock %} -{% set styles = ['/errors.css'] %} {% set master_body_attrs = {'style': '--error-colour: ' ~ error_colour} %} {% block master_body %} diff --git a/templates/html.twig b/templates/html.twig index d19c05e..24a8ae6 100644 --- a/templates/html.twig +++ b/templates/html.twig @@ -5,14 +5,8 @@ {% if master_title is defined and master_title is not empty %}{{ master_title }}{% endif %} {% block master_head %}{% endblock %} {% if csrfp_available() %}{% endif %} - {% for style in styles|default([]) %} - - {% endfor %} {% block master_body %}{% endblock %} - {% for script in scripts|default([]) %} - - {% endfor %} diff --git a/templates/master.twig b/templates/master.twig index def703d..ec561d3 100644 --- a/templates/master.twig +++ b/templates/master.twig @@ -2,8 +2,13 @@ {% set master_title = (header_title is defined ? (header_title ~ ' // ') : '') ~ 'flash.moe' %} -{% set styles = [ globals.assetsInfo.get('makai.css') ] %} -{% set scripts = [ globals.assetsInfo.get('makai.js') ] %} +{% block master_head %} + + + + + +{% endblock %} {% set master_body_attrs = master_body_attrs|default([])|merge({ 'class': html_classes({ @@ -14,10 +19,6 @@ }), }) %} -{% block master_head %} - -{% endblock %} - {% block master_body %}
@@ -50,10 +51,10 @@
- {% block container %} - {% endblock %} + {% block container %}{% endblock %}
© flashwave {{ footer_copy_start|default('2010') }}-{{ footer_copy_end|default(('now'|date('Y'))) }} - {{ random(globals.siteInfo.footerQuotes) }}
+ {% endblock %}