Merge pull request #253 from LightSaveUs/UI2

Welcome Logo Fixes + Tooltips

gensettings.py

@@ -69,7 +69,7 @@ gensettingstf = [
 	"max": 1.0,
 	"step": 0.01,
 	"default": 1.0,
-    "tooltip": "Alternative sampling method. It is recommended to disable top_p and top_k (set top_p to 1 and top_k to 0) if this setting is used. 0.95 is an optimal value for this setting. (Put this value on 1 to disable its effect)",
+    "tooltip": "Alternative sampling method. It is recommended to disable top_p and top_k (set top_p to 1 and top_k to 0) if this setting is used. 0.95 is a suggested value for this setting. (Put this value on 1 to disable its effect)",
     "menu_path": "Settings",
     "sub_path":  "Sampling",
     "classname": "model",
@@ -84,7 +84,7 @@ gensettingstf = [
 	"max": 1.0,
 	"step": 0.01,
 	"default": 1.0,
-    "tooltip": "Alternative sampling method. Described in the paper \"Typical Decoding for Natural Language Generation\" (10.48550/ARXIV.2202.00666). The paper suggests 0.2 as an optimal value for this setting. (Put this value on 1 to disable its effect)",
+    "tooltip": "Alternative sampling method. Described in the paper \"Typical Decoding for Natural Language Generation\" (10.48550/ARXIV.2202.00666). The paper suggests 0.2 as a suggested value for this setting. (Put this value on 1 to disable its effect)",
     "menu_path": "Settings",
     "sub_path":  "Sampling",
     "classname": "model",
@@ -174,7 +174,7 @@ gensettingstf = [
 	"max": 5,
 	"step": 1,
 	"default": 1,
-    "tooltip": "Number of outputs to generate per action. Increases VRAM/RAM usage.",
+    "tooltip": "Number of generated output choices. Increases VRAM/RAM usage.",
     "menu_path": "Settings",
     "sub_path":  "Generation",
     "classname": "model",
@@ -310,7 +310,7 @@ gensettingstf = [
 	"max": 1,
 	"step": 1,
 	"default": 0,
-  "tooltip": "Disables the effect of userscripts.",
+  "tooltip": "Disables the userscripts' ability to edit output.",
     "menu_path": "Settings",
     "sub_path": "Modifiers",
     "classname": "user",
@@ -379,7 +379,7 @@ gensettingstf = [
  	"max": 1,
  	"step": 1,
  	"default": 0,
-	"tooltip": "Adds context menu to output showing what other words were considered as it was generated.",
+	"tooltip": "Adds context menu to the output showing what other words were considered as it was generated.",
     "menu_path": "Interface",
     "sub_path": "UI",
     "classname": "user",
@@ -579,7 +579,7 @@ gensettingstf = [
  	"max": 1,
  	"step": 1,
  	"default": 0,
-	"tooltip": "If enabled, experimental functions will be displayed in the UI.",
+	"tooltip": "If enabled, experimental features will be displayed in the UI.",
     "menu_path": "Interface",
     "sub_path": "UI",
     "classname": "system",
@@ -641,7 +641,7 @@ gensettingsik =[{
 	"max": 1.0,
 	"step": 0.05,
 	"default": 0.0,
-    "tooltip": "Alternative sampling method. It is recommended to disable (set to 0) top_p and top_k if this setting is used. 0.95 is an optimal value for this setting. (Put this value on 1 to disable its effect)",
+    "tooltip": "Alternative sampling method. It is recommended to disable (set to 0) top_p and top_k if this setting is used. 0.95 is a suggested value for this setting. (Put this value on 1 to disable its effect)",
     "menu_path": "Model",
     "sub_path":  "Sampling",
     "classname": "model",

koboldai_settings.py

@@ -594,9 +594,9 @@ class model_settings(settings):
         self.oaiapikey   = ""     # API key to use for OpenAI API calls
         self.configname = None
         self.online_model = ''
-        self.welcome_default = """<img id='welcome-logo' src='static/Welcome_Logo.png' draggable='False'><br/>Please load a model from the left.<br/>
+        self.welcome_default = """<img id='welcome-logo' src='static/Welcome_Logo.png' draggable='False'><div id="welcome-text-content">Please load a model from the left.<br/>
                                   If you encounter any issues, please click the Download debug dump link in the Home tab on the left flyout and attach the downloaded file to your error report on <a href='https://github.com/ebolam/KoboldAI/issues'>Github</a>, <a href='https://www.reddit.com/r/KoboldAI/'>Reddit</a>, or <a href='https://discord.gg/XuQWadgU9k'>Discord</a>. 
-                                  A redacted version (without story text) is available.""" # Custom Welcome Text
+                                  A redacted version (without story text) is available.</div>""" # Custom Welcome Text
         self.welcome     = self.welcome_default
         self.koboldai_vars = koboldai_vars
         

static/koboldai.css

@@ -1633,7 +1633,6 @@ body {
 	margin: 5px 0 5px 1%;
 	border-radius: var(--radius_item_popup);
 	padding: 2px;
-
 }
 
 .popup .item:hover {
@@ -2372,13 +2371,19 @@ body {
 
 #welcome-logo {
 	width: 50%;
+	top: 295px;
 	display: block;
-    margin-top: 480px;
+	position: relative;
-    margin-left: auto;
 	margin-right: auto;
-    pointer-events: none;
+	margin-left: auto;
-    transform: translateY(-200px);
 	max-width: 720px;
+	filter: drop-shadow(5px 5px 5px #222);
+}
+
+#welcome-text-content {
+	position: relative;
+	top: 520px;
+	left: 10px;
 }
 
 /* Popups */

templates/settings flyout.html

@@ -213,7 +213,7 @@
 					<!---Top Row---->
 					<span class="setting_label">
 						<span style="white-space: pre-wrap;">Enabled Userscripts: </span>
-						<span class="helpicon material-icons-outlined" tooltip="Allows to activate userscripts that affect generation.">help_icon</span>
+						<span class="helpicon material-icons-outlined" tooltip="Allows to activate userscripts that modify the game's functionality.">help_icon</span>
 					</span>
 					<!---Bottom Row---->
 					<span class="setting_item">