Added/removed vars in themes

static/koboldai.css

@@ -694,7 +694,7 @@ td.server_vars {
 	margin: 0 0 0 10px;
 	padding: 4px 4px 4px 4px;
 	border-radius: var(--radius_wi_card);
-	background-color: #004397;
+	background-color: var(--wi_tag_color);
 }
 
 .wi_folder_collapser, .wi_add_button, #new_world_info_button {
@@ -1170,14 +1170,6 @@ body {
 	}
 }
 
-.popup#error_message {
-	background-color: var(--error_palette);
-	color: var(--on_error_palette);
-	height: 30vh;
-	top: 35vh;
-	overflow: hidden;
-}
-
 .popup .title {
 	width: 100%;
 	background-color: var(--popup_title_bar_color);
@@ -1186,26 +1178,11 @@ body {
 	font-size: 1.3em;
 }
 
-#error_message .title {
-	width: 100%;
-	background-color: var(--error_container_palette);
-	color: var(--on_error_container_palette);
-	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_palette);
-	color: var(--on_error_palette);
-	border-color: var(--on_error_palette);
-}
-
-
 .popup .popup_list_area {
 	overflow-x: hidden;
 	overflow-y: scroll;
@@ -1276,10 +1253,6 @@ body {
 	padding: 0 10px 0 10px;
 }
 
-#error_message .popup_load_cancel{
-	background-color: var(--error_container_palette);
-	color: var(--on_error_container_palette);
-}
 
 .popup_load_cancel_button {
 	color: var(--popup_cancel_button_color_text);
@@ -1289,6 +1262,45 @@ body {
 	display: inline;
 }
 
+#error_message.popup {
+	background-color: var(--error_palette);
+	color: var(--on_error_palette);
+	height: 30vh;
+	top: 35vh;
+	overflow: hidden;
+}
+
+#error_message .title {
+	width: 100%;
+	background-color: var(--error_container_palette);
+	color: var(--on_error_container_palette);
+	text-align: center;
+	font-size: 1.3em;
+}
+
+#error_message.popup .btn-primary {
+	background-color: var(--error_palette);
+	color: var(--on_error_palette);
+	border-color: var(--on_error_palette);
+}
+
+
+#error_message .popup_load_cancel{
+	background-color: var(--error_container_palette);
+	color: var(--on_error_container_palette);
+}
+
+
+#error_message.popup .popup_list_area {
+	overflow-x: hidden;
+	overflow-y: scroll;
+	flex-grow: 1;
+	flex-shrink: 1;
+	flex-basis: auto;
+	background-color: var(--error_container_palette);
+	color: var(--on_error_container_palette);
+}
+
 .breadcrumbitem {
 	padding: 5px 10px 5px 10px;
 	color: #ffffff;
@@ -1560,4 +1572,5 @@ h2 .material-icons-outlined {
 	opacity: 0.7;
 	font-size: 0.9em;
 	display: block;
+	color: var(--setting_category_help_text_color);
 }

static/koboldai.js

@@ -438,11 +438,12 @@ function do_ai_busy(data) {
 		favicon.start_swap()
 	} else {
 		runtime = Date.now() - ai_busy_start;
-		if (document.getElementById("Execution Time")) {
-			document.getElementById("Execution Time").textContent = Math.round(runtime/1000).toString().toHHMMSS();
-		}
+		//if (document.getElementById("Execution Time")) {
+		//	document.getElementById("Execution Time").textContent = Math.round(runtime/1000).toString().toHHMMSS();
+		//}
+		document.getElementById("btnsubmit").title = "Execution Time: "+Math.round(runtime/1000).toString().toHHMMSS();
 		favicon.stop_swap()
-		document.getElementById('btnsend').textContent = "Submit";
+		document.getElementById('btnsubmit').textContent = "Submit";
 		for (item of document.getElementsByClassName('statusbar_outer')) {
 			item.classList.add("hidden");
 		}
@@ -536,11 +537,12 @@ function var_changed(data) {
 			item.setAttribute(data.classname.replace(" ", "_")+"_"+data.name.replace(" ", "_"), fix_text(data.value));
 		}
 		
-		//alternative syncing method to tooltip
-		var elements_to_change = document.getElementsByClassName("var_sync_tooltip_"+data.classname.replace(" ", "_")+"_"+data.name.replace(" ", "_"));
-		for (item of elements_to_change) {
-			item.title = fix_text(data.value);
+		//add execution time and remaining time
+		if ((data.classname == 'model') && (data.name == 'tqdm_rem_time')) {
+			document.getElementById('status_bar').title = "Remainging Time: " + data.value;
 		}
+		
+		
 	}
 	
 	//if we changed the gen amount, make sure our option area is set/not set

templates/index_new.html

@@ -75,13 +75,13 @@
 			<textarea autocomplete="off" row=5 id="input_text" placeholder="Enter Prompt Here" oninput='if (this.value != "") {
 																											document.getElementById("themetext").value = "";
 																										}'></textarea>
-			<div class="statusbar_outer hidden" onclick="socket.emit('abort','');">
+			<div class="statusbar_outer hidden" id="status_bar" onclick="socket.emit('abort','');">
 				<div class="statusbar_inner" style="width:0%">0%</div>
 			</div><br>
-			<button type="button" class="btn action_button submit var_sync_alt_system_aibusy" system_aibusy=False id="btnsend" 
+			<button type="button" class="btn action_button submit var_sync_alt_system_aibusy" system_aibusy=False id="btnsubmit" 
 				onclick="socket.emit('submit', {'data': document.getElementById('input_text').value, 'theme': document.getElementById('themetext').value});document.getElementById('input_text').value = '';document.getElementById('themetext').value = '';"
 				>Submit</button>
-			<button type="button" class="btn action_button submited var_sync_alt_system_aibusy"  system_aibusy=False id="btnsend"><img id="thinking" src="static/thinking.gif" class="force_center" onclick="socket.emit('abort','');"></button>
+			<button type="button" class="btn action_button submited var_sync_alt_system_aibusy"  system_aibusy=False id="btnsent"><img id="thinking" src="static/thinking.gif" class="force_center" onclick="socket.emit('abort','');"></button>
 			<button type="button" class="btn action_button back" onclick="socket.emit('back', {});"><span class="oi" data-glyph="action-undo"></span></button>
 			<button type="button" class="btn action_button redo" onclick="socket.emit('redo', {});"><span class="oi" data-glyph="action-redo"></span></button>
 			<button type="button" class="btn action_button retry" onclick="socket.emit('retry', {});"><span class="oi" data-glyph="loop-circular"></span></button>

templates/settings flyout.html

@@ -169,7 +169,7 @@
 					<!---Bottom Row---->
 					<span class="setting_item">
 						<!---<span class="material-icons-outlined cursor" onclick="socket.emit('load_softprompt_list', '');">folder_open</span> <span class="var_sync_system_spname"></span>--->
-						<select autocomplete="off" id="sp" class="var_sync_system_splist var_sync_system_spfilename" style="width: 140px;color:black;" onclick="socket.emit('load_softprompt', this.value);">
+						<select autocomplete="off" id="sp" class="var_sync_system_splist var_sync_system_spfilename settings_select" style="width: 140px;" onclick="socket.emit('load_softprompt', this.value);">
 						</select>
 						<span class="material-icons-outlined cursor" style="font-size: 18px;" title="Refresh List" onclick="socket.emit('sp_list_refresh', '');">autorenew</span>
 					</span>

templates/story flyout.html

@@ -16,8 +16,6 @@
 		}
 	}
 </script>
-<div>Execution Time: <span id="Execution Time"></span></div>
-<div>Remaining Time: <span class="var_sync_model_tqdm_rem_time"></span></div>
 <div class="used_token_length"></div>
 <hr/>
 <div class="tabrow nomenu_icon">

templates/templates.html

@@ -17,7 +17,7 @@
 	</div>
 	<div class="world_info_tag_area hidden" id="world_info_wpp_area_">
 		<!--this part is very sensitive to location. Javascript uses parents to find the above tag for each of the inputs, so don't add stuff without messing with JS-->
-		<select id="wpp_format_" style="color:black;">
+		<select id="wpp_format_" class="settings_select">
 			<option>W++</option>
 			<option>Square Bracket Format (SBF)</option>
 		</select>

themes/Darkness.css

@@ -1,5 +1,6 @@
 :root {
-/*----------------Palette Theme--------------------*/--primary_palette: #afc6ff;
+/*----------------Palette Theme--------------------*/
+	--primary_palette: #afc6ff;
 	--on_primary_palette: #002d6c;
 	--primary_containter_palette: #004397;
 	--on_primary_containter_palette: #d9e2ff;
@@ -79,9 +80,9 @@
 	--rangeslider_circle_color: #385262;
 
 	--help_icon: #c07ec5;
-	--help_icon_text: #1b1b1b;
     --tooltip_text:var(--on_secondary_palette);
     --tooltip_background:var(--secondary_palette);
+	--setting_category_help_text_color: #E0E0E0;
 
 	/*World Info*/
 	--wi_card_border_color: #002d6c00;
@@ -95,7 +96,6 @@
 	
     --wi_tag_color: #004397;
 	--wi_tag_text_color: #e0e0e0;
-	--wi_folder_background: #232328;
 	
 	/*Popup*/
 	--popup_background_color: #151717;

themes/Material You.css

@@ -80,9 +80,9 @@
 	--rangeslider_circle_color: var(--on_primary_palette);
 
 	--help_icon: var(--secondary_palette);
-	--help_icon_text: var(--on_secondary_palette);
     --tooltip_text: var(--on_secondary_palette);
     --tooltip_background: var(--secondary_palette);
+	--setting_category_help_text_color: #E0E0E0;
 
 	/*World Info*/
 	--wi_card_border_color: var(--on_primary_palette);
@@ -96,7 +96,6 @@
 	
     --wi_tag_color: var(--primary_containter_palette);
 	--wi_tag_text_color: var(--on_primary_containter_palette);
-	--wi_folder_background: var(--middle_palette);
 	
 	/*Popup*/
 	--popup_background_color: var(--layer4_palette);

themes/Monochrome.css

@@ -80,9 +80,9 @@
 	--rangeslider_circle_color: #1b354d;
 
 	--help_icon: #cfd7a2;
-	--help_icon_text: #121b21;
     --tooltip_text:var(--on_secondary_palette);
     --tooltip_background:var(--secondary_palette);
+	--setting_category_help_text_color: #E0E0E0;
 
 	/*World Info*/
 	--wi_card_border_color: #eeeeeead;
@@ -96,7 +96,6 @@
 	
     --wi_tag_color: #004397;
 	--wi_tag_text_color: #e0e0e0;
-	--wi_folder_background: #232328;
 	
 	/*Popup*/
 	--popup_background_color: #18222a;