From 26b55d47b451ebe0c07ff77d7ac9e9df18ef517c Mon Sep 17 00:00:00 2001 From: RossAscends <124905043+RossAscends@users.noreply.github.com> Date: Wed, 5 Jul 2023 20:55:39 +0900 Subject: [PATCH] WI Entry restyle; fix colorpicker loc for mobile --- public/index.html | 298 ++++++++++++++++++----------------- public/scripts/world-info.js | 18 ++- public/style.css | 12 +- 3 files changed, 171 insertions(+), 157 deletions(-) diff --git a/public/index.html b/public/index.html index 9c2a469ee..00c88569a 100644 --- a/public/index.html +++ b/public/index.html @@ -2002,17 +2002,17 @@ -
+
+
+
+

UI Colors

+
+ + Main Text +
+
+ + Italics Text +
+
+ + Quote Text +
+
+ + Text Shadow +
+ +
+ + UI Background +
+
+ + User Message +
+
+ + AI Message +
+
+
+
+ Font Scale +
+
+
+ +
+
+
+ select +
+
+
+
+
+
+ Blur Strength +
+
+
+ +
+
+
+ select +
+
+
+
+
+
+ Text Shadow Width +
+
+
+ +
+
+
+ select +
+
+
+
+
+
+

+ UI Theme Preset +

+
+ + +
+
+
+ +

UI Customization

@@ -2183,103 +2280,7 @@
-
-
-

UI Colors

-
- - Main Text -
-
- - Italics Text -
-
- - Quote Text -
-
- - Text Shadow -
- -
- - UI Background -
-
- - User Message -
-
- - AI Message -
-
-
-
- Font Scale -
-
-
- -
-
-
- select -
-
-
-
-
-
- Blur Strength -
-
-
- -
-
-
- select -
-
-
-
-
-
- Text Shadow Width -
-
-
- -
-
-
- select -
-
-
-
-
-
-

- UI Theme Preset -

-
- - -
-
-
-

Power User Options

@@ -3094,14 +3095,18 @@ Keywords + (UID:  + + ) + - - Separate with commas + + Comma separated (required) - +
- +
@@ -3129,6 +3134,10 @@ Content + (Tokens:  + 0 + ) + @@ -3164,6 +3173,10 @@ Constant +
-
- Placement -
- -
-
- -
-
- -
-
- -
+ + + +
+ + + +
-
+
- Insertion Order +
- Probability (%) + Probability
-
-
- UID: -   - -
-
- Tokens: -   - 0 -
+
+ +
- +
@@ -3556,4 +3560,4 @@ - + \ No newline at end of file diff --git a/public/scripts/world-info.js b/public/scripts/world-info.js index 16a702729..8467e0fa0 100644 --- a/public/scripts/world-info.js +++ b/public/scripts/world-info.js @@ -408,7 +408,8 @@ function appendWorldEntry(name, data, entry) { }); commentInput.val(entry.comment).trigger("input"); - commentToggle.prop("checked", entry.addMemo).trigger("input"); + commentToggle.prop("checked", true /* entry.addMemo */).trigger("input"); + commentToggle.parent().hide() // content const countTokensDebounced = debounce(function (that, value) { @@ -464,7 +465,8 @@ function appendWorldEntry(name, data, entry) { value ? keysecondary.show() : keysecondary.hide(); }); - selectiveInput.prop("checked", entry.selective).trigger("input"); + selectiveInput.prop("checked", true /* entry.selective */).trigger("input"); + selectiveInput.parent().hide(); // constant @@ -537,7 +539,7 @@ function appendWorldEntry(name, data, entry) { value ? probabilityContainer.show() : probabilityContainer.hide(); if (value && data.entries[uid].probability === null) { - data.entries[uid].probability = 50; + data.entries[uid].probability = 100; } if (!value) { @@ -546,14 +548,15 @@ function appendWorldEntry(name, data, entry) { probabilityInput.val(data.entries[uid].probability).trigger("input"); }); - probabilityToggle.prop("checked", entry.useProbability).trigger("input"); + probabilityToggle.prop("checked", true /* entry.useProbability */).trigger("input"); + probabilityToggle.parent().hide(); // position if (entry.position === undefined) { entry.position = 0; } - const positionInput = template.find('input[name="position"]'); + const positionInput = template.find('select[name="position"]'); positionInput.data("uid", entry.uid); positionInput.on("input", function () { const uid = $(this).data("uid"); @@ -565,9 +568,10 @@ function appendWorldEntry(name, data, entry) { setOriginalDataValue(data, uid, "extensions.position", data.entries[uid].position); saveWorldInfo(name, data); }); + template - .find(`input[name="position"][value=${entry.position}]`) - .prop("checked", true) + .find(`select[name="position"] option[value=${entry.position}]`) + .prop("selected", true) .trigger("input"); // display uid diff --git a/public/style.css b/public/style.css index 98081553e..ae87fefe2 100644 --- a/public/style.css +++ b/public/style.css @@ -2149,7 +2149,7 @@ grammarly-extension { } .delete_entry_button { - align-self: center; + height: min-content; } .world_entry_form_control.world_entry_form_horizontal { @@ -4659,9 +4659,15 @@ body.waifuMode .zoomed_avatar { align-items: start; align-content: start; overflow-y: auto; - overflow-x: hidden; + overflow-x: hidden } + .mes_buttons { + font-size: calc(var(--mainFontSize)*1.2) + } + + ; + .drag-grabber, .pull-tab { display: none !important; @@ -5052,4 +5058,4 @@ body.waifuMode .zoomed_avatar { background-color: var(--SmartThemeBlurTintColor); text-align: center; line-height: 14px; -} +} \ No newline at end of file