Merge branch 'staging' into del-swipe-fix

5bebe6010b036678e6036c3236a14e4e04fe95c8

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: 4e95887803282a8f53b78468f623f721350b7ff4 558253e79aa2ceee5386fcc71ebd5d1da2a81837
1 files changed, +21 -11Ignore whitespace
public/index.html+21 -11
@@ -3226,8 +3226,9 @@
32263226 <select id="instruct_presets" data-preset-manager-for="instruct" class="flex1 text_pole"></select>
32273227 </div>
32283228 <label>
3229- <small data-i18n="Activation Regex">
3229+ <small>
3230- Activation Regex <span class="fa-solid fa-circle-question" title="When connecting to an API or choosing a model, automatically activate this Instruct Mode template if the model name matches the provided regular expression."></span>
3230+ <span data-i18n="Activation Regex">Activation Regex</span>
3231+ <span class="fa-solid fa-circle-question" title="When connecting to an API or choosing a model, automatically activate this Instruct Mode template if the model name matches the provided regular expression."></span>
32313232 </small>
32323233 </label>
32333234 <div>
@@ -4009,9 +4010,15 @@
40094010 <div class="flex-container alignItemsCenter">
40104011 <label id="movingUIModeCheckBlock" for="movingUImode" class="checkbox_label" title="Allow repositioning certain UI elements by dragging them. PC only, no effect on mobile." data-i18n="[title]Allow repositioning certain UI elements by dragging them. PC only, no effect on mobile">
40114012 <input id="movingUImode" type="checkbox" />
4012- <small data-i18n="Movable UI Panels">MovingUI&nbsp;<i class="fa-solid fa-desktop"></i></small>
4013+ <small>
4014+ <span data-i18n="Movable UI Panels">MovingUI</span>
4015+ <i class="fa-solid fa-desktop"></i>
4016+ </small>
40134017 </label>
40144018 <div id="movingUIreset" title="Reset MovingUI panel sizes/locations." class="menu_button margin0" data-i18n="[title]Reset MovingUI panel sizes/locations."><i class=" fa-solid fa-recycle margin-r5"></i> <span data-i18n="mui_reset">Reset</span></div>
4019+ <i class=" fa-solid fa-recycle margin-r5"></i>
4020+ <span data-i18n="mui_reset">Reset</span>
4021+ </div>
40154022 </div>
40164023 <div id="MovingUI-presets-block" class="flex-container alignitemscenter">
40174024 <div class="flex-container alignItemsFlexEnd">
@@ -4980,7 +4987,7 @@
49804987 <div class="popup-crop-wrap">
49814988 <img class="popup-crop-image" src="">
49824989 </div>
49834990 <textarea class="popup-input text_pole result-control auto-select" rows="1" data-result="1" data-result-event="submit"></textarea>
49844991 <div class="popup-inputs"></div>
49854992 <div class="popup-controls">
49864993 <div class="popup-button-ok menu_button result-control" data-result="1" data-i18n="Delete">Delete</div>
@@ -5291,10 +5298,11 @@
52915298 <div class="world_entry">
52925299 <form class="world_entry_form wi-card-entry">
52935300 <div class="inline-drawer wide100p">
52945301 <div class="inline-drawer-toggle inline-drawer-header gap5px padding0">
52955302 <span class="drag-handle">&#9776;</span>
52965303 <div class="gap5px world_entry_thin_controls wide100p alignitemscenter">
52975304 <div class="inline-drawer-toggle fa-fw fa-solid fa-circle-chevron-down inline-drawer-icon down"></div>
5305+ <div class="fa-solid fa-toggle-on killSwitch" name="entryKillSwitch" title="Toggle entry's active state."></div>
52985306 <div class="flex-container alignitemscenter wide100p">
52995307 <div class="WIEntryTitleAndStatus flex-container flex1 alignitemscenter">
53005308 <div class="flex-container flex1">
@@ -5305,7 +5313,6 @@
53055313 <option value="constant" title="Constant" data-i18n="[title]WI_Entry_Status_Constant">🔵</option>
53065314 <option value="normal" title="Normal" data-i18n="[title]WI_Entry_Status_Normal">🟢</option>
53075315 <option value="vectorized" title="Vectorized" data-i18n="[title]WI_Entry_Status_Vectorized">🔗</option>
5308- <option value="disabled" title="Disabled" data-i18n="[title]WI_Entry_Status_Disabled">❌</option>
53095316 </select>
53105317 </div>
53115318 <div class="WIEnteryHeaderControls flex-container">
@@ -5554,13 +5561,16 @@
55545561 <div class="flex-container wide100p flexGap10">
55555562 <div class="flex4 flex-container flexFlowColumn flexNoGap">
55565563 <div class="flex-container justifySpaceBetween">
55575564 <small for="characterFilter" data-i18n="Filter to Character(s)Characters or Tags">
55585565 Filter to Character(s)Characters or Tags
55595566 </small>
55605567 <label class="checkbox_label flexNoGap margin-r5" for="character_exclusion">
55615568 <input type="checkbox" name="character_exclusion" />
55625569 <span>
5563- <small data-i18n="Character Exclusion">Character Exclusion</small>
5570+ <small title="Switch the Character/Tags filter around to exclude the listed characters and tags from matching for this entry" data-i18n="[title]Switch the Character/Tags filter around to exclude the listed characters and tags from matching for this entry">
5571+ <span data-i18n="Exclude">Exclude</span>
5572+ <div class="fa-solid fa-circle-info opacity50p"></div>
5573+ </small>
55645574 </span>
55655575 </label>
55665576 </div>