Remove some overhead

diff --git a/src/jvmMain/kotlin/info/mechyrdia/lore/view_tpl.kt b/src/jvmMain/kotlin/info/mechyrdia/lore/view_tpl.kt
index 8841296a5c4b5192c26240d8d233ec3eb6419a15..5260aac8d52ffe4c0d8389c59460a3b1169a777d 100644 (file)
--- a/src/jvmMain/kotlin/info/mechyrdia/lore/view_tpl.kt
+++ b/src/jvmMain/kotlin/info/mechyrdia/lore/view_tpl.kt
@@ -15,25 +15,21 @@ val preloadFonts = listOf(
        "JetBrainsMono-ExtraBoldItalic.woff",
        "JetBrainsMono-Medium.woff",
        "JetBrainsMono-MediumItalic.woff",
-       "NotoSans-Black.woff",
-       "NotoSans-BlackItalic.woff",
-       "NotoSans-Medium.woff",
-       "NotoSans-MediumItalic.woff",
        "NotoSansGothic-Regular.woff",
        "Oxanium-Bold.woff",
        "Oxanium-ExtraBold.woff",
        "Oxanium-Regular.woff",
        "Oxanium-SemiBold.woff",
-       "thedish-language-alphabet.woff",
        "tylan-language-alphabet-3.woff",
+       "thedish-language-alphabet.woff",
+       "pokhval-language-alphabet.woff",
+       "kishari-language-alphabet.woff",
 )
 
 val preloadImages = listOf(
        "external-link-dark.png",
        "external-link.png",
        "icon.png",
-       "panel-dark.png",
-       "panel.png",
 )
 
 fun ApplicationCall.page(pageTitle: String, navBar: List<NavItem>? = null, sidebar: Sidebar? = null, ogData: OpenGraphData? = null, content: SECTIONS.() -> Unit): HTML.() -> Unit {

diff --git a/src/jvmMain/kotlin/info/mechyrdia/lore/views_robots.kt b/src/jvmMain/kotlin/info/mechyrdia/lore/views_robots.kt
index 8f7177b42129ee38e475bb01325741391e518d30..5ea8eff92ece9675d9d5a5127e05febbb9322537 100644 (file)
--- a/src/jvmMain/kotlin/info/mechyrdia/lore/views_robots.kt
+++ b/src/jvmMain/kotlin/info/mechyrdia/lore/views_robots.kt
@@ -68,7 +68,7 @@ private fun Appendable.renderIntroSitemap() {
        val introLastModified = Instant.ofEpochMilli(max(introFile.lastModified(), introMetaFile.lastModified()))
        
        appendLine("\t<url>")
-       appendLine("\t\t<loc>https://mechyrdia.info</loc>")
+       appendLine("\t\t<loc>https://mechyrdia.info/</loc>")
        appendLine("\t\t<lastmod>$introLastModified</lastmod>")
        appendLine("\t\t<changefreq>$AVERAGE_FACTBOOK_INTRO_CHANGEFREQ</changefreq>")
        appendLine("\t\t<priority>$FACTBOOK_INTRO_PRIORITY</priority>")

diff --git a/src/jvmMain/resources/static/font/NotoSans-Black.woff b/src/jvmMain/resources/static/font/NotoSans-Black.woff
deleted file mode 100644 (file)
index fd4a950..0000000
Binary files a/src/jvmMain/resources/static/font/NotoSans-Black.woff and /dev/null differ

diff --git a/src/jvmMain/resources/static/font/NotoSans-BlackItalic.woff b/src/jvmMain/resources/static/font/NotoSans-BlackItalic.woff
deleted file mode 100644 (file)
index e3884d7..0000000
Binary files a/src/jvmMain/resources/static/font/NotoSans-BlackItalic.woff and /dev/null differ

diff --git a/src/jvmMain/resources/static/font/NotoSans-Medium.woff b/src/jvmMain/resources/static/font/NotoSans-Medium.woff
deleted file mode 100644 (file)
index 7319e69..0000000
Binary files a/src/jvmMain/resources/static/font/NotoSans-Medium.woff and /dev/null differ

diff --git a/src/jvmMain/resources/static/font/NotoSans-MediumItalic.woff b/src/jvmMain/resources/static/font/NotoSans-MediumItalic.woff
deleted file mode 100644 (file)
index 12ce7cc..0000000
Binary files a/src/jvmMain/resources/static/font/NotoSans-MediumItalic.woff and /dev/null differ

diff --git a/src/jvmMain/resources/static/images/panel-dark.png b/src/jvmMain/resources/static/images/panel-dark.png
deleted file mode 100644 (file)
index 7551027..0000000
Binary files a/src/jvmMain/resources/static/images/panel-dark.png and /dev/null differ

diff --git a/src/jvmMain/resources/static/images/panel.png b/src/jvmMain/resources/static/images/panel.png
deleted file mode 100644 (file)
index 00f564b..0000000
Binary files a/src/jvmMain/resources/static/images/panel.png and /dev/null differ

diff --git a/src/jvmMain/resources/static/style.css b/src/jvmMain/resources/static/style.css
index 826e0d57160d6c28f3ba5287011646835d72b23c..a2fefb0fe1b9d7cd65d823f213e15e34c14e7246 100644 (file)
--- a/src/jvmMain/resources/static/style.css
+++ b/src/jvmMain/resources/static/style.css
@@ -1,35 +1,3 @@
-@font-face {
-       font-family: 'Noto Sans';
-       font-style: normal;
-       font-weight: normal;
-       font-display: block;
-       src: url("/static/font/NotoSans-Medium.woff");
-}
-
-@font-face {
-       font-family: 'Noto Sans';
-       font-style: italic;
-       font-weight: normal;
-       font-display: block;
-       src: url("/static/font/NotoSans-MediumItalic.woff");
-}
-
-@font-face {
-       font-family: 'Noto Sans';
-       font-style: normal;
-       font-weight: bold;
-       font-display: block;
-       src: url("/static/font/NotoSans-Black.woff");
-}
-
-@font-face {
-       font-family: 'Noto Sans';
-       font-style: italic;
-       font-weight: bold;
-       font-display: block;
-       src: url("/static/font/NotoSans-BlackItalic.woff");
-}
-
 @font-face {
        font-family: 'Noto Sans Gothic';
        font-display: block;
@@ -139,7 +107,7 @@ html {
        color: var(--text-color);
        background-color: var(--back-color);
 
-       font-family: 'Noto Sans', sans-serif;
+       font-family: sans-serif;
        font-size: 100%;
 
        --h1-size: 1.6em;
@@ -155,6 +123,9 @@ html {
        --text-color: #222;
        --back-color: #eda;
 
+       --panel-stroke: #a82;
+       --panel-fill: rgba(255, 204, 51, 40%);
+
        --selection-fg: #eee;
        --selection-bg: rgba(170, 136, 34, 0.6);
 
@@ -214,7 +185,6 @@ html {
        * url params *
        *************/
 
-       --panel: url("/static/images/panel.png");
        --bgimg: linear-gradient(to bottom, #feb, #cb8);
        --extln: url("/static/images/external-link.png");
 }
@@ -227,6 +197,9 @@ html[data-theme="dark"] {
        --text-color: #ddd;
        --back-color: #652;
 
+       --panel-stroke: #fd7;
+       --panel-fill: rgba(85, 68, 17, 40%);
+
        --selection-fg: #111;
        --selection-bg: rgba(255, 221, 119, 0.9);
 
@@ -286,7 +259,6 @@ html[data-theme="dark"] {
        * url params *
        *************/
 
-       --panel: url("/static/images/panel-dark.png");
        --bgimg: linear-gradient(to bottom, #763, #430);
        --extln: url("/static/images/external-link-dark.png");
 }
@@ -300,6 +272,9 @@ html[data-theme="dark"] {
                --text-color: #222;
                --back-color: #eda;
 
+               --panel-stroke: #a82;
+               --panel-fill: rgba(255, 204, 51, 40%);
+
                --selection-fg: #eee;
                --selection-bg: rgba(170, 136, 34, 0.6);
 
@@ -359,7 +334,6 @@ html[data-theme="dark"] {
                * url params *
                *************/
 
-               --panel: url("/static/images/panel.png");
                --bgimg: linear-gradient(to bottom, #feb, #cb8);
                --extln: url("/static/images/external-link.png");
        }
@@ -372,6 +346,9 @@ html[data-theme="dark"] {
                --text-color: #ddd;
                --back-color: #652;
 
+               --panel-stroke: #fd7;
+               --panel-fill: rgba(85, 68, 17, 40%);
+
                --selection-fg: #111;
                --selection-bg: rgba(255, 221, 119, 0.9);
 
@@ -431,7 +408,6 @@ html[data-theme="dark"] {
                * url params *
                *************/
 
-               --panel: url("/static/images/panel-dark.png");
                --bgimg: linear-gradient(to bottom, #763, #430);
                --extln: url("/static/images/external-link-dark.png");
        }
@@ -489,10 +465,9 @@ h3 {
 
 /*noinspection CssOverwrittenProperties*/
 main > section, main > nav.mobile, main > aside.mobile {
-       border-image-source: var(--panel);
-       border-image-slice: 40% fill;
-       border-image-width: 1em;
-       border-width: 1em;
+       border: 0.125em solid var(--panel-stroke);
+       border-radius: 0.75em;
+       background-color: var(--panel-fill);
 
        padding: 1.5em 1.5em;
 
@@ -544,9 +519,9 @@ aside.mobile img {
 
        /*noinspection CssOverwrittenProperties*/
        main > section, nav.desktop, aside.desktop {
-               border-image-source: var(--panel);
-               border-image-slice: 40% fill;
-               border-image-width: 2em;
+               border: 0.25em solid var(--panel-stroke);
+               border-radius: 1.5em;
+               background-color: var(--panel-fill);
 
                box-sizing: border-box;
                padding: 2.5em 3em;
@@ -757,7 +732,7 @@ textarea {
 }
 
 textarea {
-       font-family: 'Noto Sans', sans-serif;
+       font-family: sans-serif;
        resize: vertical;
 }