rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge cda8b51fd3 into 75832c1ad6

This commit is contained in:
Kristian Schlikow 2024-05-05 00:59:04 +00:00 committed by GitHub
parent 75832c1ad6 cda8b51fd3
commit 33b9bfbdda
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/index.html
View File

@ -4286,8 +4286,8 @@
</div>
<div class="right_menu_button fa-solid fa-list-ul" id="rm_button_characters" title="Select/Create Characters" data-i18n="[title]Select/Create Characters"></div>
</div>
<div id="HotSwapWrapper" class="alignitemscenter flex-container margin0auto wide100p">
<div class="hotswap avatars_inline flex-container expander" data-i18n="[no_favs]Favorite characters to add them to HotSwaps" no_favs="Favorite characters to add them to HotSwaps"></div>
<div id="HotSwapWrapper" class="alignitemscenter flex-container margin0auto wide100p flexNoWrap">
<div class="hotswap avatars_inline flex-container expander flexNoWrap hotswap-scroll" data-i18n="[no_favs]Favorite characters to add them to HotSwaps" no_favs="Favorite characters to add them to HotSwaps"></div>
</div>
</div>
<hr>
@ -4607,7 +4607,6 @@
<div id="character_import_button" title="Import Character from File" data-i18n="[title]Import Character from File" class="menu_button fa-solid fa-file-import faSmallFontSquareFix"></div>
<div id="external_import_button" title="Import content from external URL" data-i18n="[title]Import content from external URL" class="menu_button fa-solid fa-cloud-arrow-down faSmallFontSquareFix"></div>
<div id="rm_button_group_chats" title="Create New Chat Group" data-i18n="[title]Create New Chat Group" class="menu_button fa-solid fa-users-gear "></div>
<input id="character_search_bar" class="text_pole width100p" type="search" data-i18n="[placeholder]Search..." placeholder="Search..." maxlength="100" />
<select id="character_sort_order" title="Characters sorting order" data-i18n="[title]Characters sorting order">
<option data-field="search" data-order="desc" data-i18n="Search" hidden>Search</option>
<option data-field="name" data-order="asc" data-i18n="A-Z">A-Z</option>
@ -4622,6 +4621,9 @@
<option data-field="data_size" data-order="asc" data-i18n="Least tokens">Least tokens</option>
<option data-field="name" data-order="random" data-i18n="Random">Random</option>
</select>
<div class="form_character_search_container">
<input id="character_search_bar" class="text_pole width100p" type="search" data-i18n="[placeholder]Search..." placeholder="Search..." maxlength="100" />
</div>
</form>
<div class="rm_tag_controls">
<div class="tags rm_tag_filter"></div>

15
public/style.css
View File

@ -923,8 +923,14 @@ body .panelControlBar {
justify-content: space-evenly;
}
.hotswap-scroll {
overflow-x: scroll !important;
max-height: max-content !important;
}
#HotSwapWrapper {
justify-content: space-evenly;
overflow-x: auto;
}
.avatar.selectable {
@ -1587,10 +1593,11 @@ select option:not(:checked) {
#form_character_search_form {
display: flex;
flex-wrap: wrap;
flex-direction: row;
align-items: stretch;
margin: 5px;
column-gap: 5px;
gap: 5px;
}
#form_character_search_form .menu_button,
@ -1603,6 +1610,12 @@ select option:not(:checked) {
aspect-ratio: 1 / 1;
}
.form_character_search_container {
flex-basis: 100%;
display: flex;
gap: 5px;
}
#character_sort_order {
margin: 0;
flex: 1;