From 7df3935a5b9451736dbe6fbbcc30f2e5b17f0297 Mon Sep 17 00:00:00 2001 From: LightSaveUs <108632621+LightSaveUs@users.noreply.github.com> Date: Sun, 16 Oct 2022 04:35:56 +0300 Subject: [PATCH 01/12] Update Monochrome.css --- themes/Monochrome.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/Monochrome.css b/themes/Monochrome.css index 4e1b7b2c..15a7be05 100644 --- a/themes/Monochrome.css +++ b/themes/Monochrome.css @@ -411,7 +411,7 @@ a { /* Popup */ -.popup_list_area .model_item .model{ +.popup .model_item { border: 1px solid #2f3b4b; } From 4d0319a29fdaafca8e6ed1a17eb93d974e09cd7c Mon Sep 17 00:00:00 2001 From: LightSaveUs <108632621+LightSaveUs@users.noreply.github.com> Date: Sun, 16 Oct 2022 04:36:16 +0300 Subject: [PATCH 02/12] Update Darkness.css --- themes/Darkness.css | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/themes/Darkness.css b/themes/Darkness.css index 23146ddb..bbf49433 100644 --- a/themes/Darkness.css +++ b/themes/Darkness.css @@ -393,10 +393,12 @@ a { /* Popup */ +.popup .model_item { + border: 1px solid #333333; +} + .popup .item { - border: solid #000; - border-width: 1 1px; - border-color: #333333 !important; + border: 1px solid #333333; } .popup .action_button { From 8f8cf16fbe53f511304a205c0b592cd601fa9cb3 Mon Sep 17 00:00:00 2001 From: LightSaveUs <108632621+LightSaveUs@users.noreply.github.com> Date: Sun, 16 Oct 2022 04:36:41 +0300 Subject: [PATCH 03/12] Update Unicorn.css --- themes/Unicorn.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/themes/Unicorn.css b/themes/Unicorn.css index af004ebf..6dc46d12 100644 --- a/themes/Unicorn.css +++ b/themes/Unicorn.css @@ -447,11 +447,9 @@ a:hover, a:focus { /* Popup */ -.popup_list_area .model_item .model{ +.popup .model_item { border: 1px solid #c9c9c9; - border-radius: 10px; } - .popup .popup_load_cancel { border: 1px solid #c9c9c9 !important; } From a46102d12f9afb61545a08cb8e4841464b10b2c5 Mon Sep 17 00:00:00 2001 From: LightSaveUs <108632621+LightSaveUs@users.noreply.github.com> Date: Sun, 16 Oct 2022 06:01:19 +0300 Subject: [PATCH 04/12] Update Darkness.css --- themes/Darkness.css | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/themes/Darkness.css b/themes/Darkness.css index bbf49433..6b09feaf 100644 --- a/themes/Darkness.css +++ b/themes/Darkness.css @@ -351,13 +351,13 @@ span.material-icons-outlined.cursor.search_icon { } .true-t + label::before { - color: #999 !important; filter: brightness(85%); + color: #999 !important; } .true-t:checked + label::before { - color: #e0e0e0 !important; filter: brightness(100%); + color: #e0e0e0 !important; } /* Import */ @@ -369,6 +369,7 @@ a { .form-control { border: none; color: #e0e0e0 !important; + transform: translateX(6px)!important; background-color: #333333 !important; } @@ -381,8 +382,8 @@ a { /* Lists */ .settings_select, .var_sync_system_theme_list { - border-color: #535353 !important; border-radius:5px !important; + border-color: #535353 !important; } /* Palette */ @@ -412,22 +413,28 @@ a { } .popup .action_button:hover { - background-color: #424243 !important; filter: brightness(100%) !important; + background-color: #424243 !important; } .popup_load_cancel_button:hover { + outline: none !important; color: #e0e0e0 !important; border-color: #535353 !important; background-color: #424243 !important; - outline: none !important; +} + +.popup .action_button:focus { + outline: none; + box-shadow: none; } .popup_load_cancel_button:focus { + outline: none; + box-shadow: none; color: #e0e0e0 !important; border-color: #535353 !important; background-color: #424243 !important; - outline: none; } .popup .action_button:active { @@ -435,8 +442,8 @@ a { } .popup_load_cancel_button:active { - filter: brightness(60%) !important; outline: none !important; + filter: brightness(60%) !important; } #error_message.popup .btn-primary { From 37906f49857a536b6e1b11d2026e34d5bba8b4e0 Mon Sep 17 00:00:00 2001 From: LightSaveUs <108632621+LightSaveUs@users.noreply.github.com> Date: Sun, 16 Oct 2022 06:02:14 +0300 Subject: [PATCH 05/12] Update Monochrome.css --- themes/Monochrome.css | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/themes/Monochrome.css b/themes/Monochrome.css index 15a7be05..461c7351 100644 --- a/themes/Monochrome.css +++ b/themes/Monochrome.css @@ -218,13 +218,13 @@ } .bias_phrase input { - border-color: #2f3b4b !important; border-radius:2px !important; + border-color: #2f3b4b !important; } .substitution-card input { - border-color: #2f3b4b !important; border-radius:2px !important; + border-color: #2f3b4b !important; } .sequence { @@ -246,8 +246,8 @@ .action_button:focus { color: #e0e0e0; - box-shadow: none; outline: none !important; + box-shadow: none !important; } .settings_button { @@ -270,8 +270,8 @@ .toggle-off.btn { color: #eedcb8 !important; - background-color: #131c22 !important; border-color: #131c22 !important; + background-color: #131c22 !important; } .toggle-off.btn:hover { @@ -357,13 +357,13 @@ span.helpicon.material-icons-outlined:hover:not(::after) { } .true-t + label::before { - color: #999 !important; filter: brightness(85%); + color: #999 !important; } .true-t:checked + label::before { - color: #e0e0e0 !important; filter: brightness(100%); + color: #e0e0e0 !important; } /* Import */ @@ -375,6 +375,7 @@ a { .form-control { border: none; color: #e0e0e0 !important; + transform: translateX(6px)!important; background-color: #25323d !important; } @@ -395,8 +396,8 @@ a { /* Lists */ .settings_select, .var_sync_system_theme_list { - border-color: #2f3b4b !important; border-radius:2px !important; + border-color: #2f3b4b !important; } .settings_footer { @@ -446,9 +447,21 @@ a { .popup_load_cancel_button:hover { color: #e0e0e0 !important; - background-color: #30435b !important; - border-color: #ffffff00 !important; filter: brightness(120%) !important; + border-color: #ffffff00 !important; + background-color: #30435b !important; +} + +.popup .action_button:focus { + outline: none !important; + box-shadow: none !important; + color: #e0e0e0 !important; +} + +.popup_load_cancel_button:focus { + outline: none !important; + box-shadow: none !important; + color: #e0e0e0 !important; } /* Tabs */ @@ -500,9 +513,9 @@ a { } .world_info_text { + border-color: #2f3b4b !important; filter: brightness(100%) !important; background-color: #1d2835 !important; - border-color: #2f3b4b !important; } .world_info_title:hover { From 0ea589da58bba10d7af688dfa44742c97be1cb96 Mon Sep 17 00:00:00 2001 From: LightSaveUs <108632621+LightSaveUs@users.noreply.github.com> Date: Sun, 16 Oct 2022 06:03:49 +0300 Subject: [PATCH 06/12] Update Nostalgia.css --- themes/Nostalgia.css | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/themes/Nostalgia.css b/themes/Nostalgia.css index 4b376edf..5e67e545 100644 --- a/themes/Nostalgia.css +++ b/themes/Nostalgia.css @@ -316,13 +316,13 @@ } .true-t + label::before { - color: #999 !important; filter: brightness(85%); + color: #999 !important; } .true-t:checked + label::before { - color: #fff !important; filter: brightness(100%); + color: #fff !important; } /* Import */ @@ -332,9 +332,10 @@ a { } .form-control { - background-color: #404040 !important; - color: #ffffff !important; border: none; + color: #ffffff !important; + transform: translateX(6px)!important; + background-color: #404040 !important; } /* Lines */ @@ -346,8 +347,8 @@ a { /* Lists */ .settings_select, .var_sync_system_theme_list { - border-color: #376590 !important; border-radius: 5px !important; + border-color: #376590 !important; } /* Palette */ @@ -384,11 +385,11 @@ a { } .popup_load_cancel_button:focus { - background-color: #337ab7 !important; - border-color: #ffffff !important; - outline: none !important; - box-shadow: none; color: #ffffff + outline: none !important; + box-shadow: none !important; + border-color: #ffffff !important; + background-color: #337ab7 !important; } #error_message.popup .btn-primary { From e926660eccd06ab64a10623b70e32ece662f719d Mon Sep 17 00:00:00 2001 From: LightSaveUs <108632621+LightSaveUs@users.noreply.github.com> Date: Sun, 16 Oct 2022 06:04:32 +0300 Subject: [PATCH 07/12] Update Unicorn.css --- themes/Unicorn.css | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/themes/Unicorn.css b/themes/Unicorn.css index 6dc46d12..18c4b29d 100644 --- a/themes/Unicorn.css +++ b/themes/Unicorn.css @@ -259,9 +259,9 @@ } .action_button:focus { - color: #f2f1f1 !important; - outline: none !important; box-shadow: none; + outline: none !important; + color: #f2f1f1 !important; } .settings_button { @@ -278,14 +278,14 @@ .btn-success { color: #f2f1f1 !important; - background-color: #e26771 !important; border-color: #e26771 !important; + background-color: #e26771 !important; } .toggle-off.btn { color: #f2f1f1 !important; - background-color: #828282 !important; border-color: #828282 !important; + background-color: #828282 !important; } .advanced_theme:hover { @@ -379,13 +379,13 @@ } .true-t + label::before { - color: #999 !important; filter: brightness(85%); + color: #999 !important; } .true-t:checked + label::before { - color: #e26771 !important; filter: brightness(100%); + color: #e26771 !important; } .oi[folder] { @@ -416,9 +416,9 @@ a:hover, a:focus { } .form-control { - border: 1px solid #c9c9c9 !important; color: #3d3d3d !important; transform: translateX(6px)!important; + border: 1px solid #c9c9c9 !important; background-color: #f0f0f0 !important; } @@ -435,8 +435,8 @@ a:hover, a:focus { /* Lists */ .settings_select, .var_sync_system_theme_list { - border-color: #c9c9c9 !important; border-radius: 10px !important; + border-color: #c9c9c9 !important; } /* Palette */ @@ -581,8 +581,8 @@ a:hover, a:focus { } .world_info_title:focus { - color: #e26771 !important; outline: none !important; + color: #e26771 !important; } .WI_Folder_Header .title:focus { From 5f388546f6ce8ae44fb8a0635d23a66a105cfbf6 Mon Sep 17 00:00:00 2001 From: LightSaveUs <108632621+LightSaveUs@users.noreply.github.com> Date: Sun, 16 Oct 2022 06:16:21 +0300 Subject: [PATCH 08/12] Form-Control Adjustments --- themes/Darkness.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/themes/Darkness.css b/themes/Darkness.css index 6b09feaf..6b84ba0a 100644 --- a/themes/Darkness.css +++ b/themes/Darkness.css @@ -368,8 +368,9 @@ a { .form-control { border: none; + border-radius: 0px; color: #e0e0e0 !important; - transform: translateX(6px)!important; + transform: translateX(5px)!important; background-color: #333333 !important; } From c1d33aae73cf04e160d23038238d3f7de8fa0361 Mon Sep 17 00:00:00 2001 From: LightSaveUs <108632621+LightSaveUs@users.noreply.github.com> Date: Sun, 16 Oct 2022 06:16:52 +0300 Subject: [PATCH 09/12] Form-Control Adjustments --- themes/Monochrome.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/themes/Monochrome.css b/themes/Monochrome.css index 461c7351..fe17da6b 100644 --- a/themes/Monochrome.css +++ b/themes/Monochrome.css @@ -374,8 +374,9 @@ a { .form-control { border: none; + border-radius: 0px; color: #e0e0e0 !important; - transform: translateX(6px)!important; + transform: translateX(5px)!important; background-color: #25323d !important; } From c8623bb66d6d2e5fb28eeaffe100db76fb7d6dd1 Mon Sep 17 00:00:00 2001 From: LightSaveUs <108632621+LightSaveUs@users.noreply.github.com> Date: Sun, 16 Oct 2022 06:17:15 +0300 Subject: [PATCH 10/12] Form-Control Adjustments --- themes/Nostalgia.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/themes/Nostalgia.css b/themes/Nostalgia.css index 5e67e545..a37fd328 100644 --- a/themes/Nostalgia.css +++ b/themes/Nostalgia.css @@ -333,8 +333,9 @@ a { .form-control { border: none; + border-radius: 0px; color: #ffffff !important; - transform: translateX(6px)!important; + transform: translateX(5px)!important; background-color: #404040 !important; } From d641f1ab1b3b812bad675e909394e88535c786e8 Mon Sep 17 00:00:00 2001 From: LightSaveUs <108632621+LightSaveUs@users.noreply.github.com> Date: Sun, 16 Oct 2022 06:17:41 +0300 Subject: [PATCH 11/12] Form-Control Adjustments --- themes/Unicorn.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/themes/Unicorn.css b/themes/Unicorn.css index 18c4b29d..80da55b4 100644 --- a/themes/Unicorn.css +++ b/themes/Unicorn.css @@ -416,8 +416,9 @@ a:hover, a:focus { } .form-control { + border-radius: 0px; color: #3d3d3d !important; - transform: translateX(6px)!important; + transform: translateX(5px)!important; border: 1px solid #c9c9c9 !important; background-color: #f0f0f0 !important; } From fcfb9c665ee648b9a2e83db9645d353bc1daffbc Mon Sep 17 00:00:00 2001 From: somebody Date: Sun, 16 Oct 2022 10:39:25 -0500 Subject: [PATCH 12/12] Fix Chrome onload --- static/koboldai.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/static/koboldai.js b/static/koboldai.js index a8c81f1a..144aed7e 100644 --- a/static/koboldai.js +++ b/static/koboldai.js @@ -2670,8 +2670,18 @@ function calc_token_usage( } function Change_Theme(theme) { - var css = document.getElementById("CSSTheme"); - css.setAttribute("href", "/themes/"+theme+".css"); + const oldCSS = $el("#CSSTheme"); + if (oldCSS) oldCSS.remove(); + + const css = $e( + "link", + document.head, + { + id: "CSSTheme", + rel: "stylesheet", + href: `/themes/${theme}.css` + } + ); // We must wait for the style to load before we read it css.onload = function() {