Merge branch 'dev' of https://github.com/SillyLossy/TavernAI into dev

public/index.html

@@ -1491,11 +1491,13 @@
             <img id="world_cross" src="img/cross.png">
             <div id="world_popup_header">
                 <!-- Consider changing logo to something else -->
-                <img src="img/book2.png" id="world_logo">
-                <h3>
-                    World Info Editor
-                    <a href="/notes/13_3" class="notes-link" target="_blank"><span class="note-link-span">?</span></a>
-                </h3>
+                <div class="world_popup_logo_block">
+                    <img src="img/book2.png" id="world_logo">
+                    <h3>
+                        World Info Editor
+                        <a href="/notes/13_3" class="notes-link" target="_blank"><span class="note-link-span">?</span></a>
+                    </h3>
+                </div>
                 <div class="world_popup_expander">&nbsp;</div>
                 <form id="form_rename_world" action="javascript:void(null);" method="post" enctype="multipart/form-data">
                     <input id="world_popup_name" name="world_popup_name" class="text_pole" maxlength="99" size="32" value="" autocomplete="off">

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);

public/style.css

@@ -1363,9 +1363,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;
@@ -1373,6 +1372,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;*/
@@ -1418,6 +1418,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;
@@ -1425,6 +1430,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;
@@ -1496,6 +1505,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 {
@@ -1535,8 +1545,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 {
@@ -1559,20 +1569,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 */
@@ -2679,14 +2677,14 @@ a {
 
 #right-nav-panel {
     width: calc((100svw - var(--sheldWidth) - 2px) /2);
-    height: 100svh;
+    height: 99.9svh;
     position: fixed;
     top: 0;
     margin: 0;
     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);
@@ -2714,7 +2712,7 @@ a {
 }
 
 #right-nav-panel>div:not(#right-nav-panel-tabs) {
-    height: calc(100% - 40px);
+    height: calc(100% - 50px);
     overflow-y: auto;
 }
 
@@ -3105,6 +3103,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;
@@ -3172,7 +3193,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%;