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 @@
3226 <select id="instruct_presets" data-preset-manager-for="instruct" class="flex1 text_pole"></select>3226 <select id="instruct_presets" data-preset-manager-for="instruct" class="flex1 text_pole"></select>
3227 </div>3227 </div>
3228 <label>3228 <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>
3231 </small>3232 </small>
3232 </label>3233 </label>
3233 <div>3234 <div>
@@ -4009,9 +4010,15 @@
4009 <div class="flex-container alignItemsCenter">4010 <div class="flex-container alignItemsCenter">
4010 <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">4011 <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">
4011 <input id="movingUImode" type="checkbox" />4012 <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>
4013 </label>4017 </label>
4014 <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>4018 <div id="movingUIreset" title="Reset MovingUI panel sizes/locations." class="menu_button margin0" data-i18n="[title]Reset MovingUI panel sizes/locations.">
4019 <i class=" fa-solid fa-recycle margin-r5"></i>
4020 <span data-i18n="mui_reset">Reset</span>
4021 </div>
4015 </div>4022 </div>
4016 <div id="MovingUI-presets-block" class="flex-container alignitemscenter">4023 <div id="MovingUI-presets-block" class="flex-container alignitemscenter">
4017 <div class="flex-container alignItemsFlexEnd">4024 <div class="flex-container alignItemsFlexEnd">
@@ -4980,7 +4987,7 @@
4980 <div class="popup-crop-wrap">4987 <div class="popup-crop-wrap">
4981 <img class="popup-crop-image" src="">4988 <img class="popup-crop-image" src="">
4982 </div>4989 </div>
4983 <textarea class="popup-input text_pole result-control" rows="1" data-result="1" data-result-event="submit"></textarea>4990 <textarea class="popup-input text_pole result-control auto-select" rows="1" data-result="1" data-result-event="submit"></textarea>
4984 <div class="popup-inputs"></div>4991 <div class="popup-inputs"></div>
4985 <div class="popup-controls">4992 <div class="popup-controls">
4986 <div class="popup-button-ok menu_button result-control" data-result="1" data-i18n="Delete">Delete</div>4993 <div class="popup-button-ok menu_button result-control" data-result="1" data-i18n="Delete">Delete</div>
@@ -5291,10 +5298,11 @@
5291 <div class="world_entry">5298 <div class="world_entry">
5292 <form class="world_entry_form wi-card-entry">5299 <form class="world_entry_form wi-card-entry">
5293 <div class="inline-drawer wide100p">5300 <div class="inline-drawer wide100p">
5294 <div class="inline-drawer-toggle inline-drawer-header gap5px padding0">5301 <div class="inline-drawer-header gap5px padding0">
5295 <span class="drag-handle">&#9776;</span>5302 <span class="drag-handle">&#9776;</span>
5296 <div class="gap5px world_entry_thin_controls wide100p alignitemscenter">5303 <div class="gap5px world_entry_thin_controls wide100p alignitemscenter">
5297 <div class="fa-fw fa-solid fa-circle-chevron-down inline-drawer-icon down"></div>5304 <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>
5298 <div class="flex-container alignitemscenter wide100p">5306 <div class="flex-container alignitemscenter wide100p">
5299 <div class="WIEntryTitleAndStatus flex-container flex1 alignitemscenter">5307 <div class="WIEntryTitleAndStatus flex-container flex1 alignitemscenter">
5300 <div class="flex-container flex1">5308 <div class="flex-container flex1">
@@ -5305,7 +5313,6 @@
5305 <option value="constant" title="Constant" data-i18n="[title]WI_Entry_Status_Constant">🔵</option>5313 <option value="constant" title="Constant" data-i18n="[title]WI_Entry_Status_Constant">🔵</option>
5306 <option value="normal" title="Normal" data-i18n="[title]WI_Entry_Status_Normal">🟢</option>5314 <option value="normal" title="Normal" data-i18n="[title]WI_Entry_Status_Normal">🟢</option>
5307 <option value="vectorized" title="Vectorized" data-i18n="[title]WI_Entry_Status_Vectorized">🔗</option>5315 <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>
5309 </select>5316 </select>
5310 </div>5317 </div>
5311 <div class="WIEnteryHeaderControls flex-container">5318 <div class="WIEnteryHeaderControls flex-container">
@@ -5554,13 +5561,16 @@
5554 <div class="flex-container wide100p flexGap10">5561 <div class="flex-container wide100p flexGap10">
5555 <div class="flex4 flex-container flexFlowColumn flexNoGap">5562 <div class="flex4 flex-container flexFlowColumn flexNoGap">
5556 <div class="flex-container justifySpaceBetween">5563 <div class="flex-container justifySpaceBetween">
5557 <small for="characterFilter" data-i18n="Filter to Character(s)">5564 <small for="characterFilter" data-i18n="Filter to Characters or Tags">
5558 Filter to Character(s)5565 Filter to Characters or Tags
5559 </small>5566 </small>
5560 <label class="checkbox_label flexNoGap margin-r5" for="character_exclusion">5567 <label class="checkbox_label flexNoGap margin-r5" for="character_exclusion">
5561 <input type="checkbox" name="character_exclusion" />5568 <input type="checkbox" name="character_exclusion" />
5562 <span>5569 <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>
5564 </span>5574 </span>
5565 </label>5575 </label>
5566 </div>5576 </div>