From: Lanius Trolling Date: Wed, 26 Jul 2023 17:46:17 +0000 (-0400) Subject: Change color scheme from blue to gold X-Git-Url: https://gitweb.starshipfights.net/?a=commitdiff_plain;h=c0961e5574b6e4199cd9be8d0c15e43e56af6bcc;p=factbooks Change color scheme from blue to gold --- diff --git a/.idea/misc.xml b/.idea/misc.xml index f6d0002..96c2c27 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/graphics/external-link-dark.svg b/graphics/external-link-dark.svg index 33b87b4..a052903 100644 --- a/graphics/external-link-dark.svg +++ b/graphics/external-link-dark.svg @@ -27,8 +27,8 @@ inkscape:deskcolor="#d1d1d1" showgrid="false" inkscape:zoom="59" - inkscape:cx="5.0677966" - inkscape:cy="7.9661017" + inkscape:cx="6.9745763" + inkscape:cy="8.2033898" inkscape:window-width="2560" inkscape:window-height="1529" inkscape:window-x="-8" @@ -36,15 +36,15 @@ inkscape:window-maximized="1" inkscape:current-layer="svg187" /> diff --git a/graphics/external-link.svg b/graphics/external-link.svg index 0a259c3..d9a6bac 100644 --- a/graphics/external-link.svg +++ b/graphics/external-link.svg @@ -26,9 +26,9 @@ inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" showgrid="false" - inkscape:zoom="41.7193" - inkscape:cx="6.280067" - inkscape:cy="7.4785531" + inkscape:zoom="59" + inkscape:cx="7.6864407" + inkscape:cy="8.4745763" inkscape:window-width="2560" inkscape:window-height="1529" inkscape:window-x="-8" @@ -36,15 +36,15 @@ inkscape:window-maximized="1" inkscape:current-layer="svg5" /> diff --git a/graphics/panel-dark.svg b/graphics/panel-dark.svg index a325fb1..92306d4 100644 --- a/graphics/panel-dark.svg +++ b/graphics/panel-dark.svg @@ -4,7 +4,7 @@ viewBox="0 0 64 64" height="64px" width="64px" - id="svg248" + id="svg6" sodipodi:docname="panel-dark.svg" inkscape:export-filename="panel-dark.png" inkscape:export-xdpi="192" @@ -15,9 +15,9 @@ xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> + id="defs10" /> + inkscape:current-layer="svg6" /> + + + + id="rect340-0" + style="fill:#ffcc33;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:square;stroke-miterlimit:32;stroke-dasharray:none" + d="M 0,0 V 20 H 6 V 6 H 20 V 0 Z" + sodipodi:nodetypes="ccccccc" /> + id="rect340-0-87" + style="fill:#ffcc33;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:square;stroke-miterlimit:32;stroke-dasharray:none" + d="M 0,64 H 20 V 58 H 6 V 44 H 0 Z" + sodipodi:nodetypes="ccccccc" /> + + + + diff --git a/graphics/panel.svg b/graphics/panel.svg index ed07178..b601a13 100644 --- a/graphics/panel.svg +++ b/graphics/panel.svg @@ -26,21 +26,71 @@ inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" showgrid="false" - inkscape:zoom="5.2149125" - inkscape:cx="24.544995" - inkscape:cy="35.858703" + inkscape:zoom="14.75" + inkscape:cx="36.847458" + inkscape:cy="35.254237" inkscape:window-width="2560" inkscape:window-height="1529" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:current-layer="svg6" /> + + + + id="rect340-0" + style="fill:#554411;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:square;stroke-miterlimit:32;stroke-dasharray:none" + d="M 0,0 V 20 H 6 V 6 H 20 V 0 Z" + sodipodi:nodetypes="ccccccc" /> + id="rect340-0-87" + style="fill:#554411;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:square;stroke-miterlimit:32;stroke-dasharray:none" + d="M 0,64 H 20 V 58 H 6 V 44 H 0 Z" + sodipodi:nodetypes="ccccccc" /> + + + + diff --git a/src/main/kotlin/info/mechyrdia/lore/views_error.kt b/src/main/kotlin/info/mechyrdia/lore/views_error.kt index 2acb954..49cde50 100644 --- a/src/main/kotlin/info/mechyrdia/lore/views_error.kt +++ b/src/main/kotlin/info/mechyrdia/lore/views_error.kt @@ -32,7 +32,7 @@ suspend fun ApplicationCall.error403PageExpired(formData: Parameters): HTML.() - p { +"The page you were on has expired." request.header(HttpHeaders.Referrer)?.let { referrer -> - +" You can" + +" You can " a(href = referrer) { +"return to the previous page" } +" and retry your action." } diff --git a/src/main/resources/static/images/external-link-dark.png b/src/main/resources/static/images/external-link-dark.png index 8871d2a..dff1058 100644 Binary files a/src/main/resources/static/images/external-link-dark.png and b/src/main/resources/static/images/external-link-dark.png differ diff --git a/src/main/resources/static/images/external-link.png b/src/main/resources/static/images/external-link.png index 2621ef5..d9b69ab 100644 Binary files a/src/main/resources/static/images/external-link.png and b/src/main/resources/static/images/external-link.png differ diff --git a/src/main/resources/static/images/panel-dark.png b/src/main/resources/static/images/panel-dark.png index ab42418..7551027 100644 Binary files a/src/main/resources/static/images/panel-dark.png and b/src/main/resources/static/images/panel-dark.png differ diff --git a/src/main/resources/static/images/panel.png b/src/main/resources/static/images/panel.png index 0b9ee1e..00f564b 100644 Binary files a/src/main/resources/static/images/panel.png and b/src/main/resources/static/images/panel.png differ diff --git a/src/main/resources/static/style.css b/src/main/resources/static/style.css index 7452f27..831710e 100644 --- a/src/main/resources/static/style.css +++ b/src/main/resources/static/style.css @@ -137,13 +137,11 @@ html { padding: 0; color: var(--text-color); - background-color: #aaa; + background-color: var(--back-color); font-family: 'Noto Sans', sans-serif; font-size: 100%; - --text-color: #222; - --h1-size: 1.6em; --h2-size: 1.4em; --h3-size: 1.2em; @@ -154,41 +152,44 @@ html { * color params * ***************/ + --text-color: #222; + --back-color: #eda; + --selection-fg: #eee; - --selection-bg: rgba(51, 102, 204, 0.6); + --selection-bg: rgba(170, 136, 34, 0.6); - --h1-border: #888; - --h1-shadow: #444; - --h1-backgr: #aaa; + --h1-border: #862; + --h1-shadow: #431; + --h1-backgr: #c93; - --h2-border: #666; + --h2-border: #430; - --h3-unline: #888; + --h3-unline: #652; - --list-a-fg: #369; - --list-a-h-fg: #fff; - --list-a-h-bg: #69c; + --list-a-fg: #541; + --list-a-h-fg: #feb; + --list-a-h-bg: #a82; --a-fg: #36c; --a-v-fg: #63c; - --tbl-border: #036; - --tbl-td-bgr: #eee; - --tbl-th-bgr: #258; + --tbl-border: #431; + --tbl-td-bgr: #feb; + --tbl-th-bgr: #862; - --input-bg: #aaa; - --input-ul: #222; - --input-fg: #024; - --input-f-bg: #777; + --input-bg: #ba7; + --input-ul: #444133; + --input-fg: #111; + --input-f-bg: #985; --err-bg: #e77; --err-fg: #422; --err-ul: #211; - --btn-fg: #bdf; - --btn-bg: #06c; - --btn-h-bg: #05a; - --btn-a-bg: #048; + --btn-fg: #feb; + --btn-bg: #ca4; + --btn-h-bg: #a82; + --btn-a-bg: #860; --evil-btn-fg: #fcc; --evil-btn-bg: #c33; @@ -198,14 +199,14 @@ html { --btn-na-bg: #444; --btn-na-fg: #bbb; - --iframe-border: #036; + --iframe-border: #541; --error-popup-border: #933; --error-popup-backgr: #faa; --error-popup-foregr: #622; - --comment-stroke: #025; - --comment-fill: #bbb; + --comment-stroke: #541; + --comment-fill: #ec6; --quote-bg: rgba(0, 0, 0, 0.1); @@ -214,54 +215,53 @@ html { *************/ --panel: url("/static/images/panel.png"); - --bgimg: linear-gradient(to bottom, #def, #abc); + --bgimg: linear-gradient(to bottom, #feb, #cb8); --extln: url("/static/images/external-link.png"); } html[data-theme="dark"] { - background-color: #555; - /*************** * color params * ***************/ --text-color: #ddd; + --back-color: #652; --selection-fg: #111; - --selection-bg: rgba(102, 153, 255, 0.9); + --selection-bg: rgba(255, 221, 119, 0.9); - --h1-border: #333; - --h1-shadow: #bbb; - --h1-backgr: #111; + --h1-border: #862; + --h1-shadow: #c93; + --h1-backgr: #431; - --h2-border: #999; + --h2-border: #feb; - --h3-unline: #777; + --h3-unline: #dc9; - --list-a-fg: #9cf; - --list-a-h-fg: #333; - --list-a-h-bg: #9cf; + --list-a-fg: #feb; + --list-a-h-fg: #541; + --list-a-h-bg: #fd7; --a-fg: #69f; --a-v-fg: #96f; - --tbl-border: #9cf; - --tbl-td-bgr: #111; - --tbl-th-bgr: #7ad; + --tbl-border: #c93; + --tbl-td-bgr: #430; + --tbl-th-bgr: #a82; - --input-bg: #555; - --input-ul: #ddd; - --input-fg: #bdf; - --input-f-bg: #888; + --input-bg: #985; + --input-ul: #ccc399; + --input-fg: #eee; + --input-f-bg: #ba7; --err-bg: #844; --err-fg: #fcc; --err-ul: #422; - --btn-fg: #024; - --btn-bg: #39f; - --btn-h-bg: #7bf; - --btn-a-bg: #bdf; + --btn-fg: #111; + --btn-bg: #860; + --btn-h-bg: #a82; + --btn-a-bg: #ca4; --evil-btn-fg: #411; --evil-btn-bg: #d33; @@ -271,14 +271,14 @@ html[data-theme="dark"] { --btn-na-bg: #bbb; --btn-na-fg: #444; - --iframe-border: #9cf; + --iframe-border: #feb; --error-popup-border: #311; --error-popup-backgr: #622; --error-popup-foregr: #fcc; - --comment-stroke: #bdf; - --comment-fill: #222; + --comment-stroke: #feb; + --comment-fill: #652; --quote-bg: rgba(255, 255, 255, 0.1); @@ -287,55 +287,54 @@ html[data-theme="dark"] { *************/ --panel: url("/static/images/panel-dark.png"); - --bgimg: linear-gradient(to bottom, #347, #123); + --bgimg: linear-gradient(to bottom, #763, #430); --extln: url("/static/images/external-link-dark.png"); } @media only screen and (prefers-color-scheme: dark) { html[data-theme="light"] { - background-color: #aaa; - /*************** * color params * ***************/ --text-color: #222; + --back-color: #eda; --selection-fg: #eee; - --selection-bg: rgba(51, 102, 204, 0.6); + --selection-bg: rgba(170, 136, 34, 0.6); - --h1-border: #888; - --h1-shadow: #444; - --h1-backgr: #aaa; + --h1-border: #862; + --h1-shadow: #431; + --h1-backgr: #c93; - --h2-border: #666; + --h2-border: #430; - --h3-unline: #888; + --h3-unline: #652; - --list-a-fg: #369; - --list-a-h-fg: #fff; - --list-a-h-bg: #69c; + --list-a-fg: #541; + --list-a-h-fg: #feb; + --list-a-h-bg: #a82; --a-fg: #36c; --a-v-fg: #63c; - --tbl-border: #036; - --tbl-td-bgr: #eee; - --tbl-th-bgr: #258; + --tbl-border: #431; + --tbl-td-bgr: #feb; + --tbl-th-bgr: #862; - --input-bg: #aaa; - --input-ul: #222; - --input-fg: #024; - --input-f-bg: #777; + --input-bg: #ba7; + --input-ul: #444133; + --input-fg: #111; + --input-f-bg: #985; --err-bg: #e77; --err-fg: #422; --err-ul: #211; - --btn-fg: #bdf; - --btn-bg: #06c; - --btn-h-bg: #05a; - --btn-a-bg: #048; + --btn-fg: #feb; + --btn-bg: #ca4; + --btn-h-bg: #a82; + --btn-a-bg: #860; --evil-btn-fg: #fcc; --evil-btn-bg: #c33; @@ -345,14 +344,14 @@ html[data-theme="dark"] { --btn-na-bg: #444; --btn-na-fg: #bbb; - --iframe-border: #036; + --iframe-border: #541; --error-popup-border: #933; --error-popup-backgr: #faa; --error-popup-foregr: #622; - --comment-stroke: #025; - --comment-fill: #bbb; + --comment-stroke: #541; + --comment-fill: #ec6; --quote-bg: rgba(0, 0, 0, 0.1); @@ -361,54 +360,53 @@ html[data-theme="dark"] { *************/ --panel: url("/static/images/panel.png"); - --bgimg: linear-gradient(to bottom, #def, #abc); + --bgimg: linear-gradient(to bottom, #feb, #cb8); --extln: url("/static/images/external-link.png"); } html { - background-color: #555; - /*************** * color params * ***************/ --text-color: #ddd; + --back-color: #652; --selection-fg: #111; - --selection-bg: rgba(102, 153, 255, 0.9); + --selection-bg: rgba(255, 221, 119, 0.9); - --h1-border: #333; - --h1-shadow: #bbb; - --h1-backgr: #111; + --h1-border: #862; + --h1-shadow: #c93; + --h1-backgr: #431; - --h2-border: #999; + --h2-border: #feb; - --h3-unline: #777; + --h3-unline: #dc9; - --list-a-fg: #9cf; - --list-a-h-fg: #333; - --list-a-h-bg: #9cf; + --list-a-fg: #feb; + --list-a-h-fg: #541; + --list-a-h-bg: #fd7; --a-fg: #69f; --a-v-fg: #96f; - --tbl-border: #9cf; - --tbl-td-bgr: #111; - --tbl-th-bgr: #7ad; + --tbl-border: #c93; + --tbl-td-bgr: #430; + --tbl-th-bgr: #a82; - --input-bg: #555; - --input-ul: #ddd; - --input-fg: #bdf; - --input-f-bg: #888; + --input-bg: #985; + --input-ul: #ccc399; + --input-fg: #eee; + --input-f-bg: #ba7; --err-bg: #844; --err-fg: #fcc; --err-ul: #422; - --btn-fg: #024; - --btn-bg: #39f; - --btn-h-bg: #7bf; - --btn-a-bg: #bdf; + --btn-fg: #111; + --btn-bg: #860; + --btn-h-bg: #a82; + --btn-a-bg: #ca4; --evil-btn-fg: #411; --evil-btn-bg: #d33; @@ -418,14 +416,14 @@ html[data-theme="dark"] { --btn-na-bg: #bbb; --btn-na-fg: #444; - --iframe-border: #9cf; + --iframe-border: #feb; --error-popup-border: #311; --error-popup-backgr: #622; --error-popup-foregr: #fcc; - --comment-stroke: #bdf; - --comment-fill: #222; + --comment-stroke: #feb; + --comment-fill: #652; --quote-bg: rgba(255, 255, 255, 0.1); @@ -434,7 +432,7 @@ html[data-theme="dark"] { *************/ --panel: url("/static/images/panel-dark.png"); - --bgimg: linear-gradient(to bottom, #457, #013); + --bgimg: linear-gradient(to bottom, #763, #430); --extln: url("/static/images/external-link-dark.png"); } }