From 04b530865e7ce89202d13c403cf825f4b3420bc6 Mon Sep 17 00:00:00 2001 From: GuiAworld Date: Mon, 8 Aug 2022 20:23:58 -0300 Subject: [PATCH 01/20] a --- templates/settings flyout.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/settings flyout.html b/templates/settings flyout.html index 8b89d79b..6c787711 100644 --- a/templates/settings flyout.html +++ b/templates/settings flyout.html @@ -63,10 +63,10 @@

Biasing: + document.getElementById("biasing").classList.add("hidden");'> Biasinga: + document.getElementById("biasing").classList.remove("hidden");'> Biasinga:

From 0bcc05cf9817891986d26c9f53fa96bdd7431999 Mon Sep 17 00:00:00 2001 From: GuiAworld Date: Tue, 9 Aug 2022 14:42:03 -0300 Subject: [PATCH 02/20] skin v1 --- templates/index_new.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/index_new.html b/templates/index_new.html index 9cfc99d7..ad703325 100644 --- a/templates/index_new.html +++ b/templates/index_new.html @@ -58,6 +58,10 @@
+ +
+ Padding Image +
From 1931748fa6568da5caee1ddd93cc81eddee8f316 Mon Sep 17 00:00:00 2001 From: GuiAworld Date: Tue, 9 Aug 2022 14:43:51 -0300 Subject: [PATCH 03/20] skin v1 --- .gitignore | 5 +- static/koboldai.css | 215 ++++++++++++++++++++++++++------- static/padding_image.png | Bin 0 -> 27883 bytes templates/settings flyout.html | 4 +- 4 files changed, 174 insertions(+), 50 deletions(-) create mode 100644 static/padding_image.png diff --git a/.gitignore b/.gitignore index b97d1d30..77840728 100644 --- a/.gitignore +++ b/.gitignore @@ -34,4 +34,7 @@ Uninstall *.pyc # Don't ignore defaults -!defaults/* \ No newline at end of file +!defaults/* +flask_session/1074228e7055acfb7de9d07a471d0b92 +.gitignore +flask_session/2029240f6d1128be89ddc32729463129 diff --git a/static/koboldai.css b/static/koboldai.css index f3c9178c..822e18c3 100644 --- a/static/koboldai.css +++ b/static/koboldai.css @@ -6,37 +6,77 @@ } @media only screen and (min-aspect-ratio: 7/5) { :root { - --flyout_menu_width: 450px; + --flyout_menu_width: 400px; } } :root { +/*----------------Palette Theme--------------------*/ + --primary: #afc6ff; + --on_primary: #002d6c; + --primary_container: #004397; + --on_primary_container: #d9e2ff; + --secondary: #ffabf0; + --on_secondary: #5c0059; + --secondary_container: #82007e; + --on_secondary_container: #ffd7f4; + --tertiary: #a8d473; + --on_tertiary: #1f3700; + --tertiary_container: #2f4f00; + --on_tertiary_container: #c3f18c; + --error: #ffb4ab; + --on_error: #690005; + --error_container: #93000a; + --on_error_container: #ffdad6; + --p_background: #1b1b1f; + --on_background:#e3e2e6; + --outline: #8e9099; + --middle: #232328; + --on_middle: #232328; + --surface: #232328; + --on_surface: #e3e2e6; + --surface_variant: rgb(58, 61, 68); + --on_surface_variant: #c5c6d0; + --layer1: #212126; + --layer2: #28282D; + --layer3: #2F2F35; + --layer_1_brightness: 120%; + --layer_2_brightness: 140%; + --layer_3_brightness: 160%; + --layer_4_brightness: ; + --layer_5_brightness: ; + +/*----------------Advanced Theme--------------------*/ --flyout_menu_closed_width: 0px; - --background: #222f39; - --text: white; - --text_to_ai_color: #CCECFF; - --text_edit: #cdf; - --flyout_background: #18222a; - --setting_background: #2c3a51; - --setting_text: white; - --dropdown-select: white; - --dropdown-background: #212734; - --preset-item-background: black; - --tooltip_text: white; - --tooltip_background: #212734; - --gamescreen_background: #121a1e; - --textarea_background: #1a242b; - --options_background: #404040; - --enabled_button_text: #fff; - --enabled_button_background_color: #4259a0; - --enabled_button_border_color: #91acd4; + --background: var(--p_background); + --text: var(--on_background); + --text_to_ai_color: var(--on_background); + --text_edit: var(--on_background); + --flyout_background: var(--layer2); + --flyout_background_pinned: var(--layer1); + --setting_background: var(--surface); + --setting_text: var(--on_surface); + --dropdown-select: var(--on_secondary); + --dropdown-background: var(--secondary); + --preset-item-background: var(--secondary); + --tooltip_text: var(--on_primary); + --tooltip_background: var(--primary); + --gamescreen_background: var(--layer1); + --textarea_background: var(--layer2); + --sequence: var(--primary); + --on_sequence: var(--on_primary); + --enabled_button_text: var(--on_primary); + --enabled_button_background_color: var(--primary); + --enabled_button_border_color: var(--on_primary); + --help_icon: var(--secondary); + --help_icon_text: var(--on_secondary); --popup_title_bar_color: #337ab7; --popup_item_color: #262626; --disabled_button_text: #303030; --disabled_button_background_color: #495762; --disabled_button_border_color: #686c68; - --menu_button_level_1_bg_color: #2b5471; - --menu_button_level_2_bg_color: #285070; + --menu_button_level_1_bg_color: var(--primary_container); + --menu_button_level_2_bg_color: --on_prima; --wi_card_border_color: white; --wi_card_border_color_to_ai: green; --wi_card_bg_color: #262626; @@ -70,13 +110,13 @@ -ms-user-select: none; /* Internet Explorer/Edge */ user-select: none; /* Non-prefixed version, currently supported by Chrome, Edge, Opera and Firefox */ - border: 1px solid #888; + border: 1px solid var(--primary); background: var(--menu_button_level_1_bg_color); - background: -o-linear-gradient(top, #337ab70 50%, #28507 100%); + /*background: -o-linear-gradient(top, #337ab70 50%, #28507 100%); background: -ms-linear-gradient(top, #337ab70 50%, #28507 100%); background: -moz-linear-gradient(top, #337ab70 50%, #28507 100%); background: -webkit-linear-gradient(top, #337ab70 50%, #28507 100%); - background: linear-gradient(top, #337ab70 50%, #28507 100%); + background: linear-gradient(top, #337ab7 50%, #28507 100%);*/ display: inline-block; position: relative; z-index: 0; @@ -145,10 +185,12 @@ } .setting_tile_area { - padding-left: 10px; - display: flex; + padding: 0px 10px 0px 10px; + display: grid; + grid-template-columns: auto auto; + /*flex; flex-direction: row; - flex-wrap: wrap; + flex-wrap: wrap;*/ width: 100%; } @@ -157,8 +199,8 @@ grid-template-areas: "label value" "item item" "minlabel maxlabel"; - grid-template-rows: 20px 25px 10px; - grid-template-columns: 160px 40px; + grid-template-rows: 20px 20px 20px; + grid-template-columns: 80% 20%; row-gap: 0.2em; background-color: var(--setting_background); color: var(--text); @@ -166,12 +208,14 @@ } .setting_minlabel { + padding-top: 6px; grid-area: minlabel; overflow: hidden; font-size: 0.8em; } .setting_maxlabel { + padding-top: 6px; grid-area: maxlabel; overflow: hidden; text-align: right; @@ -204,6 +248,49 @@ .setting_item_input { width:95%; } +/*Chrome*/ +@media screen and (-webkit-min-device-pixel-ratio:0) { + input[type='range'] { + overflow: hidden; + -webkit-appearance: none; + background-color: var(--primary); + border-radius: 5px; + } + + input[type='range']::-webkit-slider-runnable-track { + height: 10px; + -webkit-appearance: none; + color: var(--primary_container); + margin-top: -1px; + } + + input[type='range']::-webkit-slider-thumb { + width: 10px; + overflow: visible; + -webkit-appearance: none; + height: 10px; + cursor: ew-resize; + background: var(--primary_container); + box-shadow: -300px 0 0 300px var(--primary_container); + border: 5px solid var(--primary_container); + border-radius: 5px; + } + +} +/** FF*/ +input[type="range"]::-moz-range-progress { + background-color: var(--primary); +} +input[type="range"]::-moz-range-track { + background-color: var(--primary_container); +} +/* IE*/ +input[type="range"]::-ms-fill-lower { + background-color: var(--primary); +} +input[type="range"]::-ms-fill-upper { + background-color: var(--primary_container); +} .helpicon { display: inline-block; @@ -212,14 +299,14 @@ text-align: center; width: 2ex; height: 2ex; - font-size: 1.4ex; + font-size: 1.8ex; line-height: 1.8ex; border-radius: 1.2ex; margin-right: 4px; padding: 1px; - color: var(--setting_background); - background: var(--setting_text); - border: 1px solid white; + color: var(--help_icon_text); + background: var(--help_icon); + border: 1px solid var(--help_icon_text); text-decoration: none; cursor: help; } @@ -267,7 +354,7 @@ .menu_pin { position: absolute; top:10px; - left: calc(var(--flyout_menu_width) - 20px); + left: calc(var(--flyout_menu_width) - 25px); z-index:50; width: 25px; height: 25px; @@ -289,6 +376,7 @@ .SideMenu { height: 100%; width: var(--flyout_menu_closed_width); + box-shadow: 0 0px 8px 0 rgba(0, 0, 0, 0.2), 0px 0px 20px 0 rgba(0, 0, 0, 0.19); position: fixed; z-index: 1; top: 0; @@ -296,6 +384,8 @@ background-color: var(--flyout_background); overflow-x: hidden; transition: 0.5s; + border-radius: 0px 20px 20px 0px; + } @media only screen and (min-aspect-ratio: 7/5) { @@ -306,9 +396,11 @@ z-index: 1; top: 0; left: 0; - background-color: var(--flyout_background); + background-color: var(--flyout_background_pinned); + box-shadow: 0 0px 8px 0 rgba(0, 0, 0, 0.2), 25px 0px 20px 0 rgba(0, 0, 0, 0.19); overflow-x: hidden; transition: 0.5s; + border-radius: 0px; } } @@ -461,6 +553,7 @@ height: 100%; width: 0; position: fixed; + box-shadow: 0 0px 8px 0 rgba(0, 0, 0, 0.2), -25px 0px 20px 0 rgba(0, 0, 0, 0.19); z-index: 1; top: 0; right: 0; @@ -469,6 +562,7 @@ transition: 0.5s; padding-top: 20px; padding-bottom: 10px; + border-radius: 20px 0px 0px 20px; } @@ -572,7 +666,7 @@ body { margin-left: var(--flyout_menu_closed_width); grid-template-areas: "menuicon gamescreen options lefticon" "menuicon inputrow inputrow lefticon"; - grid-template-columns: 30px auto fit-content(30%) 20px; + grid-template-columns: 420px auto 400px 20px; grid-template-rows: auto 100px; } } @@ -593,13 +687,14 @@ body { @media only screen and (min-aspect-ratio: 7/5) { .main-grid.pinned { - margin-left: var(--flyout_menu_width); + margin-left: calc(-var(--flyout_menu_width)); } } /* ---------------------------------- GAME SCREEN ----------------------------------*/ .gamescreen { background-color: var(--gamescreen_background); + box-shadow: 0 0px 8px 0 rgba(0, 0, 0, 0.2), -25px 0px 20px 0 rgba(0, 0, 0, 0.19); color: white; width: 100%; grid-area: gamescreen; @@ -615,7 +710,7 @@ body { .gametext { margin-top: auto; - padding-bottom: 1px; + padding: 0px 5px 10px 10px; vertical-align: bottom; overflow-y: scroll; -ms-overflow-style: none; /* IE and Edge */ @@ -637,11 +732,17 @@ body { font-style: italic; } +.sequence_area::-webkit-scrollbar { + display: none; + } + @media only screen and (min-aspect-ratio: 7/5) { .sequence_area { margin-top: 10px; grid-area: options; background-color: var(--gamescreen_background); + /*border-left: 5px solid var(--primary);*/ + box-shadow: 4px 0 8px 0 rgba(0, 0, 0, 0.2), 5px 0px 25px 0 rgba(0, 0, 0, 0.19); overflow-y: scroll; } } @@ -657,6 +758,7 @@ body { @media only screen and (max-aspect-ratio: 7/5) { .sequences { + margin-top: 5px; width: 100%; border: 0px; border-spacing: 0; @@ -669,6 +771,7 @@ body { @media only screen and (min-aspect-ratio: 7/5) { .sequences { + margin-top: 5px; width: 100%; border: 0px; border-spacing: 0; @@ -684,16 +787,18 @@ body { min-width: 100%; display: grid; grid-template-areas: "text icon"; - grid-template-columns: auto 20px; + grid-template-columns: auto 25px; } .sequence { - border: 1px solid #959595; - border-radius: 5px; - width=100%; + margin: 5px 0px 5px 10px; + border: 2px solid var(--on_sequence); + border-radius: 10px; + width:100%; grid-area: text; - padding: 0px; - background-color: var(--options_background); + padding: 5px; + color: var(--on_sequence); + background-color: var(--sequence); -moz-transition: all 0.15s ease-in; -o-transition: all 0.15s ease-in; -webkit-transition: all 0.15s ease-in; @@ -703,6 +808,8 @@ body { .sequnce_icon { grid-area: icon; + padding-left: 10px; + margin: auto auto auto auto; } .sequence:hover { @@ -770,8 +877,8 @@ body { } .statusbar_outer { - color: #000; - background-color: #f1f1f1; + color: var(--primary_container); + background-color: var(--on_primary_container); grid-area: statusbar; height: 20px; } @@ -781,7 +888,7 @@ body { } .statusbar_inner { - background-color: #4CAF50; + background-color: var(--primary_container); text-align: center; font-size: 0.875em; @@ -815,6 +922,18 @@ body { overflow: hidden; } +@media only screen and (min-aspect-ratio: 7/5) { + .paddingimage { + grid-area: 1 / 1 / span 2 ; + margin: auto auto 5px auto; + } +} + +@media only screen and (max-aspect-ratio: 7/5) { + .paddingimage { + visibility: hidden; + } +} /*---------------------------------- Popup -------------------------------------------------*/ .popup { @@ -987,9 +1106,11 @@ body { grid-area: textarea; background-color: var(--textarea_background); color: var(--text); + padding: 5px; resize: none; border-color: white; border-width: 1px; + border-radius: 15px; border-style:solid; } diff --git a/static/padding_image.png b/static/padding_image.png new file mode 100644 index 0000000000000000000000000000000000000000..e2862c0822e334fc2aa8dd1fef52cf2efa532263 GIT binary patch literal 27883 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 hfr Biasinga: + document.getElementById("biasing").classList.add("hidden");'> Biasing: + document.getElementById("biasing").classList.remove("hidden");'> Biasing:
From 81925684a8e2c4bfb4feadbdb3009260a8d49db2 Mon Sep 17 00:00:00 2001 From: GuiAworld Date: Tue, 9 Aug 2022 18:09:37 -0300 Subject: [PATCH 04/20] fix --- static/koboldai.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/static/koboldai.css b/static/koboldai.css index 822e18c3..04bbfe7d 100644 --- a/static/koboldai.css +++ b/static/koboldai.css @@ -559,6 +559,7 @@ input[type="range"]::-ms-fill-upper { right: 0; background-color: var(--flyout_background); overflow-x: hidden; + overflow-y: hidden; transition: 0.5s; padding-top: 20px; padding-bottom: 10px; @@ -1002,6 +1003,7 @@ body { .popup .popup_load_cancel { text-align: center; + vertical-align: bottom; background-color: var(--popup_title_bar_color); } @@ -1203,3 +1205,13 @@ textarea { body.NotConnected { filter: grayscale(80%); } + +.cursor { + cursor: pointer; +} + +.flout_menu_contents { + overflow-x: hidden; + overflow-y: auto; + height: 80vh; +} From a3f195135794106b063473b4092fb65ba9e2ad9a Mon Sep 17 00:00:00 2001 From: GuiAworld Date: Tue, 9 Aug 2022 18:41:26 -0300 Subject: [PATCH 05/20] 1 --- static/koboldai.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/static/koboldai.css b/static/koboldai.css index 04bbfe7d..d06f3b73 100644 --- a/static/koboldai.css +++ b/static/koboldai.css @@ -40,11 +40,6 @@ --layer1: #212126; --layer2: #28282D; --layer3: #2F2F35; - --layer_1_brightness: 120%; - --layer_2_brightness: 140%; - --layer_3_brightness: 160%; - --layer_4_brightness: ; - --layer_5_brightness: ; /*----------------Advanced Theme--------------------*/ --flyout_menu_closed_width: 0px; From 07fceea0711658d883ababbaa9812f8487019b7f Mon Sep 17 00:00:00 2001 From: GuiAworld Date: Tue, 9 Aug 2022 20:06:54 -0300 Subject: [PATCH 06/20] 1 --- static/koboldai.css | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/static/koboldai.css b/static/koboldai.css index d06f3b73..3be4625d 100644 --- a/static/koboldai.css +++ b/static/koboldai.css @@ -91,7 +91,10 @@ overflow: hidden; font-size: 12px; font-family: verdana; - position: relative; + grid-row: 1; + position: fixed; + width: var(--flyout_menu_closed_width); + background: var(--background); } .tabrow.nomenu_icon { padding-left: 10px; @@ -107,11 +110,11 @@ supported by Chrome, Edge, Opera and Firefox */ border: 1px solid var(--primary); background: var(--menu_button_level_1_bg_color); - /*background: -o-linear-gradient(top, #337ab70 50%, #28507 100%); - background: -ms-linear-gradient(top, #337ab70 50%, #28507 100%); - background: -moz-linear-gradient(top, #337ab70 50%, #28507 100%); - background: -webkit-linear-gradient(top, #337ab70 50%, #28507 100%); - background: linear-gradient(top, #337ab7 50%, #28507 100%);*/ + background: -o-linear-gradient(top, #337ab7 50%, #285070 100%); + background: -ms-linear-gradient(top, #337ab7 50%, #285070 100%); + background: -moz-linear-gradient(top, #337ab7 50%, #285070 100%); + background: -webkit-linear-gradient(top, #337ab7 50%, #285070 100%); + background: linear-gradient(top, #337ab7 50%, #285070 100%); display: inline-block; position: relative; z-index: 0; @@ -179,10 +182,17 @@ width: 100%; } +.settings_category_area { + width: 100%; + background: #82007e; + grid-row: 2; +} + + .setting_tile_area { padding: 0px 10px 0px 10px; display: grid; - grid-template-columns: auto auto; + grid-template-columns: auto; /*flex; flex-direction: row; flex-wrap: wrap;*/ @@ -371,6 +381,9 @@ input[type="range"]::-ms-fill-upper { .SideMenu { height: 100%; width: var(--flyout_menu_closed_width); + display: grid; + grid-template-columns: var(--flyout_menu_width); + grid-template-rows: 30px auto; box-shadow: 0 0px 8px 0 rgba(0, 0, 0, 0.2), 0px 0px 20px 0 rgba(0, 0, 0, 0.19); position: fixed; z-index: 1; @@ -387,6 +400,9 @@ input[type="range"]::-ms-fill-upper { .SideMenu.pinned { height: 100%; width: var(--flyout_menu_width); + display: grid; + grid-template-columns: var(--flyout_menu_width); + grid-template-rows: 30px auto; position: fixed; z-index: 1; top: 0; From 4ae7a12df57739b8cd3b7c9e62f869a310aa5405 Mon Sep 17 00:00:00 2001 From: GuiAworld Date: Tue, 9 Aug 2022 21:41:59 -0300 Subject: [PATCH 07/20] skin v2 --- static/koboldai.css | 57 ++++++++++++++++++++-------------------- templates/index_new.html | 2 +- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/static/koboldai.css b/static/koboldai.css index 919e70fd..8cf085ee 100644 --- a/static/koboldai.css +++ b/static/koboldai.css @@ -56,8 +56,9 @@ --preset-item-background: var(--secondary); --tooltip_text: var(--on_primary); --tooltip_background: var(--primary); - --gamescreen_background: var(--layer1); - --textarea_background: var(--layer2); + --gamescreen_background: var(--layer2); + --textarea_background: var(--layer3); + --sequece_background: var(--layer1); --sequence: var(--primary); --on_sequence: var(--on_primary); --enabled_button_text: var(--on_primary); @@ -91,10 +92,7 @@ overflow: hidden; font-size: 12px; font-family: verdana; - grid-row: 1; - position: fixed; - width: var(--flyout_menu_closed_width); - background: var(--background); + position: relative; } .tabrow.nomenu_icon { padding-left: 10px; @@ -184,7 +182,7 @@ .settings_category_area { width: 100%; - background: #82007e; + background: var(--layer1); grid-row: 2; } @@ -192,7 +190,7 @@ .setting_tile_area { padding: 0px 10px 0px 10px; display: grid; - grid-template-columns: auto; + grid-template-columns: auto auto; /*flex; flex-direction: row; flex-wrap: wrap;*/ @@ -380,10 +378,8 @@ input[type="range"]::-ms-fill-upper { .SideMenu { height: 100%; + z-index: 4; width: var(--flyout_menu_closed_width); - display: grid; - grid-template-columns: var(--flyout_menu_width); - grid-template-rows: 30px auto; box-shadow: 0 0px 8px 0 rgba(0, 0, 0, 0.2), 0px 0px 20px 0 rgba(0, 0, 0, 0.19); position: fixed; z-index: 1; @@ -400,11 +396,8 @@ input[type="range"]::-ms-fill-upper { .SideMenu.pinned { height: 100%; width: var(--flyout_menu_width); - display: grid; - grid-template-columns: var(--flyout_menu_width); - grid-template-rows: 30px auto; position: fixed; - z-index: 1; + z-index: 3; top: 0; left: 0; background-color: var(--flyout_background_pinned); @@ -417,6 +410,7 @@ input[type="range"]::-ms-fill-upper { .SideMenu.open { width: var(--flyout_menu_width); + z-index: 3; } .SideMenu .flyout_menu_contents { @@ -567,6 +561,7 @@ input[type="range"]::-ms-fill-upper { } .rightSideMenu { + z-index: 3; height: 100%; width: 0; position: fixed; @@ -586,6 +581,7 @@ input[type="range"]::-ms-fill-upper { .rightSideMenu.open { width: var(--flyout_menu_width); + z-index: 3; } .rightSideMenu .flyout_menu_contents { @@ -692,13 +688,14 @@ body { height: 98vh; margin-left: var(--flyout_menu_width); margin-right: var(--flyout_menu_closed_width); - grid-template-areas: "menuicon gamescreen options lefticon" + grid-template-areas: "enuicon gamescreen options lefticon" "menuicon inputrow inputrow lefticon"; grid-template-columns: 30px auto 30% 30px; grid-template-rows: auto 100px; } .main-grid.settings_pinned { margin-left: var(--flyout_menu_width); + grid-template-columns: 30px auto 30% 30px; } .main-grid.story_pinned { margin-left: var(--flyout_menu_closed_width); @@ -734,9 +731,19 @@ body { /* ---------------------------------- GAME SCREEN ----------------------------------*/ +.sequence_area { + margin-top: 10px; + z-index: 1; + grid-area: options; + background-color: var(--sequece_background); + /*border-left: 5px solid var(--primary);*/ + /*box-shadow: 4px 0 8px 0 rgba(0, 0, 0, 0.2), 0px 0px 25px 0 rgba(0, 0, 0, 0.19);*/ + overflow-y: scroll; +} .gamescreen { background-color: var(--gamescreen_background); - box-shadow: 0 0px 8px 0 rgba(0, 0, 0, 0.2), -25px 0px 20px 0 rgba(0, 0, 0, 0.19); + z-index: 2; + box-shadow: 0 0px 8px 0 rgba(0, 0, 0, 0.2), 0px 0px 20px 0 rgba(0, 0, 0, 0.19); color: white; width: 100%; grid-area: gamescreen; @@ -778,15 +785,6 @@ body { display: none; } -.sequence_area { - margin-top: 10px; - grid-area: options; - background-color: var(--gamescreen_background); - /*border-left: 5px solid var(--primary);*/ - box-shadow: 4px 0 8px 0 rgba(0, 0, 0, 0.2), 5px 0px 25px 0 rgba(0, 0, 0, 0.19); - overflow-y: scroll; -} - @media only screen and (max-aspect-ratio: 7/5) { .sequences { margin-top: 5px; @@ -860,6 +858,7 @@ body { .inputrow { grid-area: inputrow; + z-index: 2; display: grid; grid-template-areas: "textarea statusbar statusbar statusbar" "textarea submit submit submit" @@ -955,9 +954,10 @@ body { @media only screen and (min-aspect-ratio: 7/5) { .paddingimage { - grid-area: 1 / 1 / span 2 ; - margin: auto auto 5px auto; + grid-area: paddingimage; + margin: auto auto auto auto; } + } @media only screen and (max-aspect-ratio: 7/5) { @@ -1238,7 +1238,6 @@ body.NotConnected { .cursor { cursor: pointer; -<<<<<<< HEAD } .flout_menu_contents { diff --git a/templates/index_new.html b/templates/index_new.html index b8df05c8..a123e3fd 100644 --- a/templates/index_new.html +++ b/templates/index_new.html @@ -64,7 +64,7 @@
-
+
From a6073e98950b47d99dc0d380f7396b0359a14b67 Mon Sep 17 00:00:00 2001 From: GuiAworld Date: Wed, 10 Aug 2022 13:09:47 -0300 Subject: [PATCH 08/20] changed behaviour of StoryM pin&adjusted Left size --- static/koboldai.css | 4 ++-- static/koboldai.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/static/koboldai.css b/static/koboldai.css index c042b326..8d627424 100644 --- a/static/koboldai.css +++ b/static/koboldai.css @@ -703,9 +703,9 @@ body { .main-grid.story_pinned { margin-left: var(--flyout_menu_closed_width); margin-right: var(--flyout_menu_width); - grid-template-areas: "menuicon gamescreen options lefticon" + grid-template-areas: "menuicon options gamescreen lefticon" "menuicon inputrow inputrow lefticon"; - grid-template-columns: 30px auto 30% 30px; + grid-template-columns: 30px 30% auto 30px; } .main-grid.settings_pinned.story_pinned { margin-left: var(--flyout_menu_width); diff --git a/static/koboldai.js b/static/koboldai.js index c390861f..3a41fab2 100644 --- a/static/koboldai.js +++ b/static/koboldai.js @@ -1349,7 +1349,7 @@ function preserve_game_space(preserve) { document.getElementById('preserve_game_space_setting').checked = true; } else { setCookie("preserve_game_space", "false"); - r.style.setProperty('--setting_menu_closed_width_no_pins_width', '450px'); + r.style.setProperty('--setting_menu_closed_width_no_pins_width', '400px'); document.getElementById('preserve_game_space_setting').checked = false; } } From 779077d8cdcb738be67edb55ca239ac7dc906a43 Mon Sep 17 00:00:00 2001 From: GuiAworld Date: Wed, 10 Aug 2022 18:40:27 -0300 Subject: [PATCH 09/20] 1 --- static/koboldai.css | 15 ++++++++------- templates/settings flyout.html | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/static/koboldai.css b/static/koboldai.css index 8d627424..7fa2e6da 100644 --- a/static/koboldai.css +++ b/static/koboldai.css @@ -107,13 +107,13 @@ -ms-user-select: none; /* Internet Explorer/Edge */ user-select: none; /* Non-prefixed version, currently supported by Chrome, Edge, Opera and Firefox */ - border: 1px solid var(--primary); + border: 1px solid var(--menu_button_level_1_bg_color); background: var(--menu_button_level_1_bg_color); - background: -o-linear-gradient(top, #337ab7 50%, #285070 100%); + /*background: -o-linear-gradient(top, #337ab7 50%, #285070 100%); background: -ms-linear-gradient(top, #337ab7 50%, #285070 100%); background: -moz-linear-gradient(top, #337ab7 50%, #285070 100%); background: -webkit-linear-gradient(top, #337ab7 50%, #285070 100%); - background: linear-gradient(top, #337ab7 50%, #285070 100%); + background: linear-gradient(top, #337ab7 50%, #285070 100%);*/ display: inline-block; position: relative; z-index: 0; @@ -121,8 +121,8 @@ border-top-right-radius: 6px; box-shadow: 0 3px 3px rgba(0, 0, 0, 0.4), inset 0 1px 0 #AAA; text-shadow: 0 1px #AAA; - margin: 0 -5px; - padding: 0 20px; + margin: 0 -1px; + padding: 0 15px; } .tabrow span.selected { background: #FFF; @@ -190,9 +190,10 @@ .setting_tile_area { padding-left: 10px; - display: flex; + padding-right: 10px; + /*display: flex; flex-direction: row; - flex-wrap: wrap; + flex-wrap: wrap;*/ width: 100%; } diff --git a/templates/settings flyout.html b/templates/settings flyout.html index a1a2b96e..763b1c84 100644 --- a/templates/settings flyout.html +++ b/templates/settings flyout.html @@ -55,8 +55,8 @@
- - Download Story + +
From b562584d6df16ef2bff02f93cfb11e7d7be4395c Mon Sep 17 00:00:00 2001 From: GuiAworld Date: Sat, 13 Aug 2022 19:41:36 -0300 Subject: [PATCH 10/20] Palette Implentation 0.1 --- .gitignore | 1 + static/koboldai.css | 155 +++++++++++++++++++++++++-------- static/koboldai.js | 2 +- templates/popups.html | 8 +- templates/settings flyout.html | 25 ++++-- 5 files changed, 141 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index 77840728..13300c2d 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ Uninstall flask_session/1074228e7055acfb7de9d07a471d0b92 .gitignore flask_session/2029240f6d1128be89ddc32729463129 +flask_session diff --git a/static/koboldai.css b/static/koboldai.css index 88e6edfc..54844a9a 100644 --- a/static/koboldai.css +++ b/static/koboldai.css @@ -40,17 +40,16 @@ --layer1: #212126; --layer2: #28282D; --layer3: #2F2F35; + --layer4: #35353D; /*----------------Advanced Theme--------------------*/ - --flyout_menu_closed_width: 0px; - --setting_menu_closed_width_no_pins_width: 0px; --background: var(--p_background); --text: var(--on_background); --text_to_ai_color: var(--on_background); --text_edit: var(--on_background); --flyout_background: var(--layer2); --flyout_background_pinned: var(--layer1); - --setting_background: var(--surface); + --setting_background: transparent; --setting_text: var(--on_surface); --dropdown-select: var(--on_secondary); --dropdown-background: var(--secondary); @@ -59,7 +58,7 @@ --tooltip_background: var(--primary); --gamescreen_background: var(--layer2); --textarea_background: var(--layer3); - --sequece_background: var(--layer1); + --sequence_background: var(--layer1); --sequence: var(--primary); --on_sequence: var(--on_primary); --enabled_button_text: var(--on_primary); @@ -67,8 +66,15 @@ --enabled_button_border_color: var(--on_primary); --help_icon: var(--secondary); --help_icon_text: var(--on_secondary); - --popup_title_bar_color: #337ab7; - --popup_item_color: #262626; + --popup_background_color: var(--layer4); + --popup_title_bar_color: var(--primary); + --popup_title_bar_color_text: var(--on_primary); + --popup_item_color: var(--primary); + --popup_item_color_text: var(--on_primary); + --popup_hover_color: var(--secondary); + --popup_hover_color_text: var(--on_secondary); + --popup_selected_color: var(--secondary_container); + --popup_selected_color_text: var(--on_secondary_container); --disabled_button_text: #303030; --disabled_button_background_color: #495762; --disabled_button_border_color: #686c68; @@ -79,7 +85,11 @@ --wi_card_bg_color: #262626; --wi_card_tag_bg_color: #404040; --wi_tag_color: #337ab7; - --sample_order_select_color: blue; + --sample_order_select_color: var(--primary); + --sample_order_select_color_text: var(--on_primary); +/*----------------Positioning--------------------*/ + --flyout_menu_closed_width: 0px; + --setting_menu_closed_width_no_pins_width: 0px; --story_options_size: 30%; --story_pinned_areas: "menuicon options gamescreen lefticon" "menuicon inputrow inputrow lefticon"; @@ -92,11 +102,11 @@ list-style: none; /*margin: 200px 0 20px;*/ padding: 0; - padding-left: 40px; + padding-left: 30px; /*Gui: should change when pinned*/ line-height: 24px; - height: 26px; + height: 32px; overflow: hidden; - font-size: 12px; + font-size: 14px; font-family: verdana; position: relative; } @@ -122,12 +132,13 @@ display: inline-block; position: relative; z-index: 0; - border-top-left-radius: 6px; + border-radius: 6px 6px 6px 6px; + /*border-top-left-radius: 6px; border-top-right-radius: 6px; - box-shadow: 0 3px 3px rgba(0, 0, 0, 0.4), inset 0 1px 0 #AAA; + box-shadow: 0 3px 3px rgba(0, 0, 0, 0.4), inset 0 1px 0 #AAA;*/ text-shadow: 0 1px #AAA; margin: 0 -1px; - padding: 0 15px; + padding: 0 12px; } .tabrow span.selected { background: #FFF; @@ -151,7 +162,7 @@ bottom: -1px; width: 5px; height: 5px; - content: " "; + /*content: " ";*/ } .tabrow span:before { left: -6px; @@ -160,7 +171,7 @@ box-shadow: 2px 2px 0 #D1D1D1; } .tabrow span:after { - right: -6px; + right: 6px; border-bottom-left-radius: 6px; border-width: 0 0 1px 1px; box-shadow: -2px 2px 0 #D1D1D1; @@ -175,7 +186,7 @@ /*----------------SETTINGS AREA------------------*/ .menu_pin_area { - height: 10px; + height: 8px; } .load_model { @@ -269,6 +280,7 @@ .setting_item_input { width:95%; } +/*----------------Custom Range Slider------------------*/ /*Chrome*/ @media screen and (-webkit-min-device-pixel-ratio:0) { input[type='range'] { @@ -292,7 +304,7 @@ height: 10px; cursor: ew-resize; background: var(--primary_container); - box-shadow: -300px 0 0 300px var(--primary_container); + box-shadow: -800px 0 0 800px var(--primary_container); border: 5px solid var(--primary_container); border-radius: 5px; } @@ -312,7 +324,7 @@ input[type="range"]::-ms-fill-lower { input[type="range"]::-ms-fill-upper { background-color: var(--primary_container); } - +/*-----------------------------------------------*/ .helpicon { display: inline-block; font-family: sans-serif; @@ -407,7 +419,7 @@ input[type="range"]::-ms-fill-upper { width: var(--flyout_menu_closed_width); box-shadow: 0 0px 8px 0 rgba(0, 0, 0, 0.2), 0px 0px 20px 0 rgba(0, 0, 0, 0.19); position: fixed; - z-index: 1; + z-index: 3; top: 0; left: 0; background-color: var(--flyout_background); @@ -458,6 +470,7 @@ input[type="range"]::-ms-fill-upper { .sample_order.selected { background-color: var(--sample_order_select_color); + color: var(--sample_order_select_color_text); } .presets option { @@ -465,6 +478,15 @@ input[type="range"]::-ms-fill-upper { background: var(--preset-item-background); } +.presets { + padding: 6px 0 9px 0; + border-radius: 5px; +} + +.settings_category_area .presets{ + margin: 5px; +} + .presets optgroup { color: var(--dropdown-select); background: var(--dropdown-background); @@ -499,6 +521,10 @@ input[type="range"]::-ms-fill-upper { transform: translate(0px, -6px) rotate(45deg); } +.material-icons-outlined .cursor{ + margin: auto; +} + /* -----------------------------------------Bias-------------------------------------- */ #biases_label { cursor: pointer; @@ -606,7 +632,7 @@ input[type="range"]::-ms-fill-upper { width: 0; position: fixed; box-shadow: 0 0px 8px 0 rgba(0, 0, 0, 0.2), -25px 0px 20px 0 rgba(0, 0, 0, 0.19); - z-index: 1; + z-index: 3; top: 0; right: 0; background-color: var(--flyout_background); @@ -637,12 +663,30 @@ input[type="range"]::-ms-fill-upper { height: calc(100vh - 150px); } +.Model_Info{ + position: relative; + margin: 25px 0 0 10px; +} + +#model_title{ + font-size: x-large; + text-align: center; +} + +#text_runningmodel{ + position: absolute; + font-size: small; + top: -15px; +} + + .story_title_area { + position: relative; } .story_title_area .var_sync_story_story_name { border-bottom: 1px solid; - padding-bottom: 5px; + padding-bottom: 3px; } .story_title_area .var_sync_story_story_name[contenteditable="true"]:active, @@ -651,11 +695,18 @@ input[type="range"]::-ms-fill-upper { outline:none; color: var(--text_edit); border-bottom: 1px solid var(--text); - padding-bottom: 5px; + padding-bottom: 3px; } .story_title { font-size: x-large; + text-align: center; +} +#text_storyname{ + font-size: small; + top: -10px; + position: absolute; + margin: 0 0 0 10px; } .story_title_icons { @@ -865,7 +916,7 @@ body { .sequence_area { margin-top: 10px; grid-area: options; - background-color: var(--gamescreen_background); + background-color: var(--sequence_background); overflow-y: scroll; } @@ -1055,22 +1106,45 @@ body { } /*---------------------------------- Popup -------------------------------------------------*/ -.popup { - position: absolute; - top: 10vh; - left: 10%; - z-index: 999; - width: 80%; - height: 80vh; - background-color: black; - display: flex; - flex-direction: column; - overflow-x: hidden; +@media only screen and (max-aspect-ratio: 7/5) { + .popup { + position: absolute; + top: 10vh; + left: 10%; + z-index: 999; + width: 80%; + height: 80vh; + border-radius: 15px; + box-shadow: 0 0 35px 20px#1b1b1f; + background-color: var(--popup_background_color); + display: flex; + flex-direction: column; + overflow-x: hidden; + } } +@media only screen and (min-aspect-ratio: 7/5) { + .popup { + position: absolute; + top: 10vh; + left: 25%; + z-index: 999; + width: 50%; + height: 80vh; + border-radius: 15px; + box-shadow: 0 0 35px 20px#1b1b1f; + background-color: var(--popup_background_color); + display: flex; + flex-direction: column; + overflow-x: hidden; + } +} + + .popup .title { width: 100%; background-color: var(--popup_title_bar_color); + color: var(--popup_title_bar_color_text); text-align: center; font-size: 1.3em; } @@ -1085,6 +1159,7 @@ body { .popup .item { width: 100%; background-color: var(--popup_item_color); + color: var(--popup_item_color_text); padding: 2px; display: grid; grid-template-areas: "folder_icon delete_icon edit_icon rename_icon file"; @@ -1115,11 +1190,13 @@ body { } .popup .item .file:hover { - background-color: #688f1f; + background-color: var(--popup_hover_color); + color: var(--popup_hover_color_text); } .popup .item .file.selected { - background: #688f1f; + background: var(--popup_selected_color); + color: var(--popup_selected_color_text); } .popup .popup_load_cancel { @@ -1160,11 +1237,13 @@ body { } .popup .item .model:hover { - background-color: #688f1f; + background-color: var(--popup_hover_color); + color: var(--popup_hover_color_text); } .popup .item .model.selected { - background-color: #688f1f; + background: var(--popup_selected_color); + color: var(--popup_selected_color_text); } .model_setting_container { diff --git a/static/koboldai.js b/static/koboldai.js index 7762aa85..75612288 100644 --- a/static/koboldai.js +++ b/static/koboldai.js @@ -1443,7 +1443,7 @@ function preserve_game_space(preserve) { document.getElementById('preserve_game_space_setting').checked = true; } else { setCookie("preserve_game_space", "false"); - r.style.setProperty('--setting_menu_closed_width_no_pins_width', '450px'); + r.style.setProperty('--setting_menu_closed_width_no_pins_width', '400px'); if (document.getElementById('preserve_game_space_setting').checked) { //not sure why the bootstrap-toggle won't respect a standard item.checked = true/false, so.... document.getElementById('preserve_game_space_setting').parentNode.click(); diff --git a/templates/popups.html b/templates/popups.html index 83a81261..e0020cbe 100644 --- a/templates/popups.html +++ b/templates/popups.html @@ -10,8 +10,8 @@
Drag file(s) above or click here to Upload File
@@ -46,8 +46,8 @@
Use GPU
- + @@ -63,8 +63,8 @@
- +
@@ -91,6 +91,6 @@
- +
\ No newline at end of file diff --git a/templates/settings flyout.html b/templates/settings flyout.html index 68e93bf3..cf840bab 100644 --- a/templates/settings flyout.html +++ b/templates/settings flyout.html @@ -35,9 +35,14 @@
-
-
- Running Model: ReadOnly +
+
+ + ReadOnly + +
+
+ Running Model:
@@ -47,10 +52,14 @@
- +
+ + + +
+
Story Name: - - +
description folder_open @@ -70,7 +79,9 @@
From a16c129950bc0c47fb1522ae5b459ea7063c1d8f Mon Sep 17 00:00:00 2001 From: GuiAworld Date: Tue, 16 Aug 2022 22:45:40 -0300 Subject: [PATCH 16/20] Merge branch 'UI2' of https://github.com/ebolam/KoboldAI into UI2 --- aiserver.py | 12 ++++++-- koboldai_settings.py | 9 +++--- static/koboldai.css | 51 ++++++++-------------------------- static/koboldai.js | 41 ++++++++++++++++----------- templates/settings flyout.html | 28 ++++--------------- templates/settings item.html | 8 +----- 6 files changed, 57 insertions(+), 92 deletions(-) diff --git a/aiserver.py b/aiserver.py index 84b92673..be0d5c0f 100644 --- a/aiserver.py +++ b/aiserver.py @@ -6285,7 +6285,12 @@ def UI_2_var_change(data): #Now let's save except for story changes if classname != "story_settings": - with open("settings/{}.v2_settings".format(classname), "w") as settings_file: + if classname == "model_settings": + filename = "settings/{}.v2_settings".format(koboldai_vars.model.replace("/", "_")) + else: + filename = "settings/{}.v2_settings".format(classname) + + with open(filename, "w") as settings_file: settings_file.write(getattr(koboldai_vars, "_{}".format(classname)).to_json()) return {'id': data['ID'], 'status': "Saved"} @@ -6295,7 +6300,7 @@ def UI_2_var_change(data): #==================================================================# @socketio.on('save_story') def UI_2_save_story(data): - + print("Saving Story") if data is None: #We need to check to see if there is a file already and if it's not the same story so we can ask the client if this is OK save_name = koboldai_vars.story_name if koboldai_vars.story_name != "" else "untitled" @@ -6599,11 +6604,14 @@ def UI_2_phrase_bias_update(biases): # Event triggered to rely a message #==================================================================# def socket_io_relay(queue, socketio): + print("started relay") while True: if not queue.empty(): + print("got relay message") data = queue.get() #socketio.emit(data[0], data[1], **data[2]) socketio.emit(data[0], data[1], broadcast=True, room="UI_2") + print("sent") time.sleep(0) diff --git a/koboldai_settings.py b/koboldai_settings.py index e418b2c9..f6a88442 100644 --- a/koboldai_settings.py +++ b/koboldai_settings.py @@ -298,7 +298,7 @@ class settings(object): pickle.dump(data, output) output.seek(0) return "base64:{}".format(base64.encodebytes(output.read()).decode()) - return json.dumps(json_data, default=to_base64) + return json.dumps(json_data, default=to_base64, indent="\t") def from_json(self, data): if isinstance(data, str): @@ -337,7 +337,8 @@ class settings(object): class model_settings(settings): local_only_variables = ['badwordsids', 'apikey', 'tqdm', 'socketio', 'default_preset'] - no_save_variables = ['tqdm', 'socketio'] + no_save_variables = ['tqdm', 'tqdm_progress', 'tqdm_rem_time', 'socketio', 'modelconfig', 'custmodpth', 'generated_tkns', + 'loaded_layers', 'total_layers', 'total_download_chunks', 'downloaded_chunks'] settings_name = "model" def __init__(self, socketio): self.socketio = socketio @@ -600,8 +601,8 @@ class story_settings(settings): self.actionmode = 0 class user_settings(settings): - local_only_variables = ['socketio'] - no_save_variables = ['socketio'] + local_only_variables = ['socketio', 'importjs'] + no_save_variables = ['socketio', 'importnum', 'importjs', 'loadselect', 'spselect', 'svowname', 'saveow', 'laststory', 'sid'] settings_name = "user" def __init__(self, socketio): self.socketio = socketio diff --git a/static/koboldai.css b/static/koboldai.css index f26ad12e..1369e75c 100644 --- a/static/koboldai.css +++ b/static/koboldai.css @@ -331,7 +331,7 @@ input[type="range"]::-ms-fill-upper { grid-template-columns: 135px 42px; row-gap: 0.2em; background-color: var(--setting_background); - color: var(--text); + color: var(--setting_text); border-radius: var(--radius_settings_background); padding: 3px; margin: 2px; @@ -376,6 +376,7 @@ input[type="range"]::-ms-fill-upper { } .setting_label { + display: flex; grid-area: label; overflow: hidden; padding: 5px; @@ -407,46 +408,12 @@ input[type="range"]::-ms-fill-upper { } /*-----------------------------------------------*/ .helpicon { - display: inline-block; - font-family: sans-serif; - font-weight: bold; - text-align: center; - width: 2ex; - height: 2ex; - font-size: 1.8ex; - line-height: 1.8ex; - border-radius: 1.2ex; - margin-right: 4px; - padding: 1px; - color: var(--help_icon_text); - background: var(--help_icon); - border: 1px solid var(--help_icon_text); - text-decoration: none; + color: var(--setting_text); cursor: help; -} - -.helpicon .helptext { - display: none; - font-family: sans-serif; - position: absolute; - z-index: 100; - text-shadow: none !important; -} - -.helpicon:hover .helptext { - display: inline-block; - position: fixed; - width: 250px; - background-color: var(--tooltip_background); - color: var(--tooltip_text); - font-size: 11pt; - z-index: 100; - font-weight: normal; - line-height: normal; - border-radius: 6px; - padding: 5px; - margin-left:10px; - border: 1px solid var(--tooltip_text); + font-size: 14px !important; + flex: auto; + width: 15px; + align-self: flex-end; } /*----------------LEFT FLYOUT MENU------------------*/ @@ -1643,3 +1610,7 @@ body.NotConnected { /* Support for IE. */ font-feature-settings: 'liga'; } + +h2 .material-icons-outlined { + font-size: 32px; +} \ No newline at end of file diff --git a/static/koboldai.js b/static/koboldai.js index bf8433cd..b83a06d9 100644 --- a/static/koboldai.js +++ b/static/koboldai.js @@ -1247,10 +1247,10 @@ function world_info_folder(data) { title.addEventListener('drop', drop); collapse_icon = document.createElement("span"); collapse_icon.id = "world_info_folder_collapse_"+folder_name; - collapse_icon.classList.add("oi"); collapse_icon.classList.add("wi_folder_collapser"); - collapse_icon.setAttribute("data-glyph", "chevron-bottom"); + collapse_icon.classList.add("material-icons-outlined"); collapse_icon.setAttribute("folder", folder_name); + collapse_icon.textContent = "expand_more"; collapse_icon.onclick = function () { hide_wi_folder(this.getAttribute("folder")); document.getElementById('world_info_folder_expand_'+this.getAttribute("folder")).classList.remove('hidden'); @@ -1259,10 +1259,10 @@ function world_info_folder(data) { title.append(collapse_icon); expand_icon = document.createElement("span"); expand_icon.id = "world_info_folder_expand_"+folder_name; - expand_icon.classList.add("oi"); expand_icon.classList.add("wi_folder_collapser"); - expand_icon.setAttribute("data-glyph", "chevron-right"); + expand_icon.classList.add("material-icons-outlined"); expand_icon.setAttribute("folder", folder_name); + expand_icon.textContent = "chevron_right"; expand_icon.onclick = function () { unhide_wi_folder(this.getAttribute("folder")); document.getElementById('world_info_folder_collapse_'+this.getAttribute("folder")).classList.remove('hidden'); @@ -1271,8 +1271,9 @@ function world_info_folder(data) { expand_icon.classList.add("hidden"); title.append(expand_icon); icon = document.createElement("span"); - icon.classList.add("oi"); - icon.setAttribute("data-glyph", "folder"); + icon.classList.add("material-icons-outlined"); + icon.setAttribute("folder", folder_name); + icon.textContent = "folder"; title.append(icon); title_text = document.createElement("span"); title_text.setAttribute("contenteditable", true); @@ -1287,16 +1288,20 @@ function world_info_folder(data) { title.append(title_text); folder.append(title); //create add button + new_icon = document.createElement("span"); + new_icon.classList.add("wi_add_button"); add_icon = document.createElement("span"); - add_icon.classList.add("oi"); - add_icon.classList.add("wi_add_button"); - add_icon.setAttribute("data-glyph", "plus"); - add_icon.textContent = "Add World Info Entry"; - add_icon.setAttribute("folder", folder_name); - add_icon.onclick = function() { + add_icon.classList.add("material-icons-outlined"); + add_icon.textContent = "post_add"; + new_icon.append(add_icon); + add_text = document.createElement("span"); + add_text.textContent = "Add World Info Entry"; + add_text.setAttribute("folder", folder_name); + add_text.onclick = function() { create_new_wi_entry(this.getAttribute("folder")); } - folder.append(add_icon); + new_icon.append(add_text); + folder.append(new_icon); //We want to insert this folder before the next folder if (i+1 < folders.length) { @@ -1350,12 +1355,16 @@ function world_info_folder(data) { add_folder.id = "new_world_info_button"; temp = document.createElement("h2"); add_icon = document.createElement("span"); - add_icon.classList.add("oi"); - add_icon.setAttribute("data-glyph", "plus"); - add_icon.textContent = "Add World Info Folder"; + icon = document.createElement("span"); + icon.classList.add("material-icons-outlined"); + icon.textContent = "create_new_folder"; + add_icon.append(icon); + text_span = document.createElement("span"); + text_span.textContent = "Add World Info Folder"; add_icon.onclick = function() { socket.emit("create_world_info_folder", {}); } + add_icon.append(text_span); temp.append(add_icon); add_folder.append(temp); document.getElementById("WI_Area").append(add_folder); diff --git a/templates/settings flyout.html b/templates/settings flyout.html index a835cd7a..87aab06c 100644 --- a/templates/settings flyout.html +++ b/templates/settings flyout.html @@ -63,7 +63,7 @@
description folder_open - save + save cloud_download file_download
@@ -99,18 +99,12 @@
- Sample Order: - - ? - - Sample Order Tooltip - - + Sample Order: help_icon
-
    +
    • Top-k Sampling
    • Top-a Sampling
    • Top-p Sampling
      • @@ -203,13 +197,7 @@ {% endwith %}
      - Maximize Game Text Space: - - ? - - When enabled and both menus are un-pinned, the game screen will take up all avaialable space. When disabled, the game screen will be centered. - - + Maximize Game Text Space:  help_icon @@ -220,13 +208,7 @@
      - Keep options on Right: - - ? - - When enabled and only the story menu is pinned, the generated story options will be shown on the right instead of the left of the game text. - - + Keep options on Right: help_icon diff --git a/templates/settings item.html b/templates/settings item.html index e34e0945..ba6934e1 100644 --- a/templates/settings item.html +++ b/templates/settings item.html @@ -3,13 +3,7 @@
      - {{ item['label'] }}: - - ? - - {{ item['tooltip'] }} - - + {{ item['label'] }}: help_icon {% if (item['unit'] != 'bool') and (item['unit'] != 'text') %} Date: Tue, 16 Aug 2022 22:51:53 -0300 Subject: [PATCH 17/20] help tooltip fix --- static/koboldai.css | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/static/koboldai.css b/static/koboldai.css index 1369e75c..a7b2c1c2 100644 --- a/static/koboldai.css +++ b/static/koboldai.css @@ -328,7 +328,7 @@ input[type="range"]::-ms-fill-upper { "item item" "minlabel maxlabel"; grid-template-rows: 20px 20px 20px; - grid-template-columns: 135px 42px; + grid-template-columns: 147px 30px; row-gap: 0.2em; background-color: var(--setting_background); color: var(--setting_text); @@ -352,7 +352,7 @@ input[type="range"]::-ms-fill-upper { } .setting_container_single .setting_item{ font-size: 0.93em; - margin-left: -10px; + margin-left: 10px; } @@ -380,13 +380,15 @@ input[type="range"]::-ms-fill-upper { grid-area: label; overflow: hidden; padding: 5px; + padding-right: 0px; padding-top: 0px; } .setting_value { text-align: right; grid-area: value; - padding: 5px; + font-size: 12px; + padding: 2px; padding-top: 0px; background-color: inherit; color: inherit; @@ -408,7 +410,7 @@ input[type="range"]::-ms-fill-upper { } /*-----------------------------------------------*/ .helpicon { - color: var(--setting_text); + color: var(--help_icon); cursor: help; font-size: 14px !important; flex: auto; From 732325b5c269941511ab9cb4f934fd61eca2af3c Mon Sep 17 00:00:00 2001 From: GuiAworld Date: Tue, 16 Aug 2022 22:58:21 -0300 Subject: [PATCH 18/20] tweak --- static/koboldai.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/koboldai.css b/static/koboldai.css index 0cc7d92c..a7b2c1c2 100644 --- a/static/koboldai.css +++ b/static/koboldai.css @@ -410,7 +410,7 @@ input[type="range"]::-ms-fill-upper { } /*-----------------------------------------------*/ .helpicon { - color: var(--setting_text); + color: var(--help_icon); cursor: help; font-size: 14px !important; flex: auto; From e5cf4e1fc69335f98fb43e4c88a1af5b70d0dccf Mon Sep 17 00:00:00 2001 From: GuiAworld Date: Thu, 18 Aug 2022 14:08:45 -0300 Subject: [PATCH 19/20] Palette v0.3 --- static/koboldai.css | 270 +++++++++++++++++++++++------------- templates/popups.html | 2 +- templates/story flyout.html | 6 +- 3 files changed, 178 insertions(+), 100 deletions(-) diff --git a/static/koboldai.css b/static/koboldai.css index 16a73c35..9b8c547b 100644 --- a/static/koboldai.css +++ b/static/koboldai.css @@ -16,31 +16,34 @@ --on_primary: #002d6c; --primary_container: #004397; --on_primary_container: #d9e2ff; + --secondary: #f7c5ee; --on_secondary: #5c0059; --secondary_container: #d663bd; --on_secondary_container: #4e0039; + --tertiary: #a8d473; --on_tertiary: #1f3700; --tertiary_container: #2f4f00; --on_tertiary_container: #c3f18c; + --error: #ffb4ab; --on_error: #690005; --error_container: #93000a; --on_error_container: #ffdad6; + --p_background: #1b1b1f; --on_background:#e3e2e6; - --outline: #8e9099; - --middle: #232328; - --on_middle: #86868e; - --surface: #28282e; - --on_surface: #e3e2e6; - --surface_variant: #2f2f36; - --on_surface_variant: #c5c6d0; --layer1: #212126; --layer2: #28282D; --layer3: #2F2F35; --layer4: #35353D; + --outline: #8e9099; + + --middle: #232328; + --on_middle: #86868e; + --surface: #2f2f36; + --on_surface: #e3e2e6; /*----------------Advanced Theme--------------------*/ /*General*/ @@ -51,6 +54,8 @@ --text: var(--on_background); --text_to_ai_color: var(--on_background); --text_edit: var(--on_background); + + --statusbar_color: #002d6ca1; --scrollbar-color: #9b9b9b80; /*Buttons*/ @@ -72,7 +77,7 @@ --flyout_background: var(--layer1); --flyout_background_pinned: var(--layer1); - --setting_background: var(--surface_variant); + --setting_background: var(--surface); --setting_text: var(--on_surface); --sample_order_select_color: var(--primary); @@ -81,6 +86,10 @@ --dropdown_text: var(--on_secondary); --dropdown_background: var(--secondary); + --rangeslider_background_color: var(--on_primary_container); + --rangeslider_color: var(--primary_container); + --rangeslider_circle_color: var(--on_primary); + --help_icon: var(--secondary); --help_icon_text: var(--on_secondary); --tooltip_text: var(--on_secondary); @@ -88,7 +97,7 @@ /*World Info*/ --wi_card_border_color: var(--on_primary); - --wi_card_border_color_to_ai: green; + --wi_card_border_color_to_ai: var(--on_secondary); --wi_card_bg_color: var(--primary); --wi_card_text_color: var(--on_primary); @@ -102,17 +111,42 @@ /*Popup*/ --popup_background_color: var(--layer4); - --popup_title_bar_color: var(--secondary_container); - --popup_title_bar_color_text: var(--on_secondary_container); - --popup_item_color: var(--surface_variant); - --popup_item_color_text: var(--on_surface_variant); + --popup_title_bar_color: var(--primary); + --popup_title_bar_color_text: var(--on_primary); + + --popup_item_color: var(--surface); + --popup_item_color_text: var(--on_surface); + --popup_hover_color: var(--secondary); --popup_hover_color_text: var(--on_secondary); --popup_selected_color: var(--secondary_container); --popup_selected_color_text: var(--on_secondary_container); - -/*----------------Parameters--------------------*/ + --popup_button_color: var(--primary_container); + --popup_button_color_text: var(--on_primary_container); + --popup_cancel_button_color: var(--primary); + --popup_cancel_button_color_text: var(--on_primary); + + /*Parameters*/ + --scrollbar-size: 6px; + --light_shadow_value: 0 0px 8px 0 rgba(0, 0, 0, 0.2), 0px 0px 20px 0 rgba(0, 0, 0, 0.19); + --left_menu_strong_shadow: 0 0px 8px 0 rgba(0, 0, 0, 0.2), 25px 0px 20px 0 rgba(0, 0, 0, 0.19); + --right_menu_light_shadow: 0 0px 8px 0 rgba(0, 0, 0, 0.2), 0px 0px 20px 0 rgba(0, 0, 0, 0.19); + --right_menu_strong_shadow: 0 0px 8px 0 rgba(0, 0, 0, 0.2), -25px 0px 20px 0 rgba(0, 0, 0, 0.19); + --radius_inputbox: 10px; + --radius_unpinned_menu: 20px; + --radius_sequence: 10px; + --radius_settings_background: 5px; + --radius_buttons: 5px; + --radius_item_popup: 2px; + --radius_wi_card: 5px; + + + + + + +/*----------------VARIABLES--------------------*/ --flyout_menu_closed_width: 0px; --setting_menu_closed_width_no_pins_width: 0px; --story_options_size: 30%; @@ -126,21 +160,9 @@ --story_pinned_area_widths_right: 30px auto var(--story_options_size) 30px; --story_pinned_areas: var(--story_pinned_areas_left); --story_pinned_area_widths: var(--story_pinned_area_widths_left); - --scrollbar-color: #9b9b9b80; - --scrollbar-size: 6px; - --light_shadow_value: 0 0px 8px 0 rgba(0, 0, 0, 0.2), 0px 0px 20px 0 rgba(0, 0, 0, 0.19); - --left_menu_strong_shadow: 0 0px 8px 0 rgba(0, 0, 0, 0.2), 25px 0px 20px 0 rgba(0, 0, 0, 0.19); - --right_menu_light_shadow: 0 0px 8px 0 rgba(0, 0, 0, 0.2), 0px 0px 20px 0 rgba(0, 0, 0, 0.19); - --right_menu_strong_shadow: 0 0px 8px 0 rgba(0, 0, 0, 0.2), -25px 0px 20px 0 rgba(0, 0, 0, 0.19); - --radius_inputbox: 10px; - --radius_unpinned_menu: 20px; - --radius_sequence: 10px; - --radius_settings_background: 5px; - --radius_buttons: 5px; - --radius_item_popup: 2px; - --radius_wi_card: 5px; } -/*----------------Custom Range SLiders--------------------*/ + +/*----------------Custom Range Sliders--------------------*/ /*Chrome*/ @media screen and (-webkit-min-device-pixel-ratio:0) { input[type='range'] { @@ -148,7 +170,7 @@ border-color: var(--setting_background); width: 100%; -webkit-appearance: none; - background-color: var(--on_primary_container); + background-color: var(--rangeslider_background_color); border-radius: 16px; } @@ -165,8 +187,8 @@ -webkit-appearance: none; height: 16px; cursor: ew-resize; - background: var(--on_primary); - box-shadow: -1928px 0 0 1920px var(--primary_container); + background: var(--rangeslider_circle_color); + box-shadow: -1928px 0 0 1920px var(--rangeslider_color); border-radius: 50%; } @@ -177,19 +199,19 @@ } /** FF*/ input[type="range"]::-moz-range-progress { - background-color: var(--primary_container); + background-color: var(--rangeslider_color); border-color: var(--setting_background); } input[type="range"]::-moz-range-track { - background-color: var(--on_primary_container); + background-color: var(--rangeslider_background_color); } /* IE*/ input[type="range"]::-ms-fill-lower { - background-color: var(--primary_container); + background-color: var(--rangeslider_color); border-color: var(--setting_background); } input[type="range"]::-ms-fill-upper { - background-color: var(--on_primary_container); + background-color: var(--rangeslider_background_color); } /*----------------Folder Tabs--------------------*/ .tabrow { @@ -506,6 +528,58 @@ input[type="range"]::-ms-fill-upper { height: calc(100vh - 40px); } +.Model_Info{ + position: relative; + margin: 25px 0 0 10px; +} + +#model_title{ + font-size: x-large; + text-align: center; +} + +#text_runningmodel{ + position: absolute; + font-size: small; + top: -15px; +} + + +.story_title_area { + position: relative; +} + +.story_title_area .var_sync_story_story_name { + border-bottom: 1px solid; + padding-bottom: 3px; +} + +.story_title_area .var_sync_story_story_name[contenteditable="true"]:active, +.story_title_area .var_sync_story_story_name[contenteditable="true"]:focus{ + border:none; + outline:none; + color: var(--text_edit); + border-bottom: 1px solid var(--text); + padding-bottom: 3px; +} + +.story_title { + font-size: x-large; + text-align: center; +} +#text_storyname{ + font-size: small; + top: -10px; + position: absolute; + margin: 0 0 0 10px; +} + +.story_title_icons { + font-size: 18px; + padding: 10px 0 0 0; + margin-left: 125px; +} + .settings_menu { padding-left: 30px; padding-top: 7px; @@ -580,7 +654,7 @@ input[type="range"]::-ms-fill-upper { bottom: 5px; } -/* -----------------------------------------Bias-------------------------------------- */ +/* Bias */ #biases_label { cursor: pointer; } @@ -720,57 +794,6 @@ input[type="range"]::-ms-fill-upper { height: calc(100vh - 150px); } -.Model_Info{ - position: relative; - margin: 25px 0 0 10px; -} - -#model_title{ - font-size: x-large; - text-align: center; -} - -#text_runningmodel{ - position: absolute; - font-size: small; - top: -15px; -} - - -.story_title_area { - position: relative; -} - -.story_title_area .var_sync_story_story_name { - border-bottom: 1px solid; - padding-bottom: 3px; -} - -.story_title_area .var_sync_story_story_name[contenteditable="true"]:active, -.story_title_area .var_sync_story_story_name[contenteditable="true"]:focus{ - border:none; - outline:none; - color: var(--text_edit); - border-bottom: 1px solid var(--text); - padding-bottom: 3px; -} - -.story_title { - font-size: x-large; - text-align: center; -} -#text_storyname{ - font-size: small; - top: -10px; - position: absolute; - margin: 0 0 0 10px; -} - -.story_title_icons { - font-size: 18px; - padding: 10px 0 0 0; - margin-left: 125px; -} .material-icons-outlined[story_gamesaved="true"] { filter: brightness(40%); @@ -814,6 +837,19 @@ td.server_vars { margin-top: 10px; } +#story_menu_notes{ + margin: 10px 10px 0 10px; +} + +#story_menu_memory{ + margin: 10px 10px 0 10px; +} + + +#story_menu_author{ + margin: 10px 10px 0 10px; +} + #world_info_folder_root.WI_Folder { margin-left: 10px; } @@ -1195,7 +1231,7 @@ body { } .statusbar_outer { - color: var(--primary_container); + color: var(--statusbar_color); background-color: transparent; grid-area: submit; z-index: 4; @@ -1207,7 +1243,7 @@ body { } .statusbar_inner { - background-color: #002d6ca1;/*var(--primary_container);*/ + background-color: var(--statusbar_color); border-radius: 5px; z-index: 0; height: 100%; @@ -1215,9 +1251,9 @@ body { font-size: 0.875em; } -#btnsend{ +/*#btnsend{ -} +}*/ #thinking{ z-index: 9999; @@ -1264,7 +1300,7 @@ body { } } -/*---------------------------------- Popup -------------------------------------------------*/ +/*---------------------------------- Popups -------------------------------------------------*/ @media only screen and (max-aspect-ratio: 7/5) { .popup { position: absolute; @@ -1299,6 +1335,12 @@ body { } } +.popup#error_message { + background-color: var(--error); + color: var(--on_error); + height: 30vh; + top: 35vh; +} .popup .title { width: 100%; @@ -1308,6 +1350,26 @@ body { font-size: 1.3em; } +#error_message .title { + width: 100%; + background-color: var(--error_container); + color: var(--on_error_container); + text-align: center; + font-size: 1.3em; +} + +.popup .action_button { + background-color: var(--popup_button_color); + color: var(--popup_button_color_text); +} + +.popup#error_message .btn-primary { + background-color: var(--error); + color: var(--on_error); + border-color: var(--on_error); +} + + .popup .popup_list_area { overflow-x: hidden; flex-grow: 1; @@ -1372,11 +1434,20 @@ body { .popup .popup_load_cancel { text-align: center; vertical-align: bottom; - color: var(--popup_item_color_text); + color: var(--popup_title_bar_color_text); background-color: var(--popup_title_bar_color); + padding: 0 10px 0 10px; +} + +#error_message .popup_load_cancel{ + background-color: var(--error_container); + color: var(--on_error_container); } .popup_load_cancel_button { + color: var(--popup_cancel_button_color_text); + border-color: var(--popup_cancel_button_color_text); + background-color: var(--popup_cancel_button_color); vertical-align: bottom; display: inline; } @@ -1412,7 +1483,7 @@ body { color: var(--popup_hover_color_text); } -.popup .model_item.selected { +.popup .model_item .selected { background: var(--popup_selected_color); color: var(--popup_selected_color_text); } @@ -1422,7 +1493,7 @@ body { grid-template-areas: "label label" "item item" "minlabel maxlabel"; - grid-template-rows: 20px 25px 10px; + grid-template-rows: 20px 16px 19px; grid-template-columns: auto 40px; row-gap: 0.2em; border: 1px; @@ -1431,12 +1502,16 @@ body { .model_setting_minlabel { grid-area: minlabel; + padding-top: 3px; + color: var(--popup_title_bar_color_text); overflow: hidden; text-align: left; font-size: 0.8em; } .model_setting_maxlabel { + color: var(--popup_title_bar_color_text); + padding-top: 3px; grid-area: maxlabel; overflow: hidden; text-align: right; @@ -1444,12 +1519,14 @@ body { } .model_setting_label { + color: var(--popup_title_bar_color_text); grid-area: label; overflow: hidden; text-align: left; } .model_setting_value { + color: var(--popup_title_bar_color_text); text-align: left; grid-area: label; background-color: inherit; @@ -1463,6 +1540,7 @@ body { } .model_setting_item { + grid-area: item; overflow: hidden; } diff --git a/templates/popups.html b/templates/popups.html index f5a01f94..2fb0ebcf 100644 --- a/templates/popups.html +++ b/templates/popups.html @@ -11,7 +11,7 @@
      Drag file(s) above or click here to Upload File
      diff --git a/templates/story flyout.html b/templates/story flyout.html index 5abe5c67..92203986 100644 --- a/templates/story flyout.html +++ b/templates/story flyout.html @@ -35,11 +35,11 @@