From afb0a350af237eb30968999108618159c0f65808 Mon Sep 17 00:00:00 2001 From: SillyLossy Date: Tue, 11 Apr 2023 18:11:25 +0300 Subject: [PATCH 1/3] Changes to world editor styles --- public/index.html | 12 ++++++---- public/style.css | 61 +++++++++++++++++++++++++++++++---------------- 2 files changed, 48 insertions(+), 25 deletions(-) diff --git a/public/index.html b/public/index.html index aef7a3b40..181acbf5e 100644 --- a/public/index.html +++ b/public/index.html @@ -1477,11 +1477,13 @@
- -

- World Info Editor - ? -

+
+ +

+ World Info Editor + ? +

+
 
diff --git a/public/style.css b/public/style.css index fe000ec72..4295364d4 100644 --- a/public/style.css +++ b/public/style.css @@ -1361,9 +1361,8 @@ input[type=search]:focus::-webkit-search-cancel-button { #world_popup { display: none; - background-color: rgba(0, 0, 0, 0.3); + background-color: var(--black30a); backdrop-filter: blur(50px); - -webkit-backdrop-filter: blur(50px); max-width: var(--sheldWidth); height: calc(100% - 40px); position: absolute; @@ -1371,6 +1370,7 @@ input[type=search]:focus::-webkit-search-cancel-button { margin-right: auto; left: 0; right: 0; + top: 40px; box-shadow: 0 0 2px rgba(0, 0, 0, 0.5); padding: 4px; /*border: 1px solid #333333;*/ @@ -1416,6 +1416,11 @@ input[type=search]:focus::-webkit-search-cancel-button { background-image: linear-gradient(270deg, rgba(0, 0, 0, 0), rgba(100, 100, 100, 0.75), rgba(0, 0, 0, 0)); } +.world_popup_logo_block { + display: flex; + align-items: center; +} + #world_popup_header { display: flex; flex-direction: row; @@ -1423,6 +1428,10 @@ input[type=search]:focus::-webkit-search-cancel-button { margin-left: 18px; } +#world_popup_header h3 { + margin: 0; +} + #form_rename_world { display: flex; align-items: center; @@ -1494,6 +1503,7 @@ input[type=search]:focus::-webkit-search-cancel-button { .world_entry_form_control label h4 { margin-bottom: 0px; + margin-top: 0.5rem; } .world_entry_form_control label h5 { @@ -1533,8 +1543,8 @@ input[type=search]:focus::-webkit-search-cancel-button { display: inline-block; } -.world_entry_form_radios { - margin-left: 1rem; +.world_entry_form_radios label { + margin-left: 0; } .world_entry_form_radios h4 { @@ -1557,20 +1567,8 @@ input[type=search]:focus::-webkit-search-cancel-button { margin-right: 0.5rem; } -#world_popup h4 a, -#world_popup h5 a, -#world_popup h3 a { - color: #936f4a; -} - -#world_popup h5 a:hover, -#world_popup h4 a:hover, -#world_popup h4 a:hover a { - color: #998e6b; -} - #world_popup h5 { - color: #757575; + color: var(--grey70); } /* STLYES FOR THE CHAT MESSAGE DELETION CHECKBOXES */ @@ -2683,7 +2681,7 @@ a { right: 0; left: auto; padding: 0; - padding-bottom: 5px; + margin-bottom: 5px; backdrop-filter: blur(10px); background-color: var(--black50a); -webkit-backdrop-filter: blur(10px); @@ -2711,7 +2709,7 @@ a { } #right-nav-panel>div:not(#right-nav-panel-tabs) { - height: calc(100% - 40px); + height: calc(100% - 50px); overflow-y: auto; } @@ -3097,6 +3095,29 @@ label[for="extensions_autoconnect"] { max-width: 100%; } + .world_entry_thin_controls { + flex-direction: column; + } + + .world_entry_form_control.world_entry_form_horizontal { + flex-direction: column; + align-items: flex-start; + row-gap: 0.5rem; + } + + .world_entry_form_control.world_entry_form_horizontal .world_popup_expander { + display: none; + } + + #world_popup_header { + flex-direction: column; + align-items: flex-start; + } + + #world_popup_header .world_popup_expander { + display: none; + } + body { position: fixed; touch-action: none; @@ -3164,7 +3185,7 @@ label[for="extensions_autoconnect"] { #right-nav-panel, #left-nav-panel { - height: calc(100svh - 45px); + height: calc(100svh - 40px); min-width: 100%; width: 100%; max-width: 100%; From 9070ef0b6a6c3468baacea8dff8ee65957203481 Mon Sep 17 00:00:00 2001 From: SillyLossy Date: Tue, 11 Apr 2023 18:17:03 +0300 Subject: [PATCH 2/3] (EXPERIMENTAL) Subtract amount_gen tokens from max content amount --- public/script.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/public/script.js b/public/script.js index 60c971ff4..149359d01 100644 --- a/public/script.js +++ b/public/script.js @@ -1331,7 +1331,9 @@ async function Generate(type, automatic_trigger, force_name2) { console.log('post replace chat.length = ' + chat.length); //chat2 = chat2.reverse(); var this_max_context = 1487; - if (main_api == 'kobold') this_max_context = max_context; + if (main_api == 'kobold' || main_api == 'textgenerationwebui') { + this_max_context = (max_context - amount_gen); + } if (main_api == 'novel') { if (novel_tier === 1) { this_max_context = 1024; @@ -1345,9 +1347,6 @@ async function Generate(type, automatic_trigger, force_name2) { if (main_api == 'openai') { this_max_context = oai_settings.openai_max_context; } - if (main_api == 'textgenerationwebui') { - this_max_context = (max_context - amount_gen); - } if (main_api == 'poe') { this_max_context = Math.min(Number(max_context), POE_MAX_CONTEXT); From 2577913ea219f044c4d8cc594922ad70b95e89a7 Mon Sep 17 00:00:00 2001 From: SillyLossy Date: Tue, 11 Apr 2023 18:18:06 +0300 Subject: [PATCH 3/3] 1px gap for right panel --- public/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/style.css b/public/style.css index 45f5c2ace..fcc02c740 100644 --- a/public/style.css +++ b/public/style.css @@ -2675,7 +2675,7 @@ a { #right-nav-panel { width: calc((100svw - var(--sheldWidth) - 2px) /2); - height: 100svh; + height: 99.9svh; position: fixed; top: 0; margin: 0;