Merge pull request #3448 from SillyTavern/compact-reasoning-settings Update layout of Reasoning settings block

b2bd73fa780154c675eafe40879547397d8dcfa8

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

Signed
Parents: a2cfcd4ca64c2a4213cc892a9b39a9b069c6c5b0 6e4a51b37f630df9964f073f487f016a4e682c86
17 files changed, +62 -51Ignore whitespace
public/index.html+45 -36
@@ -3749,8 +3749,8 @@
37493749 </div>
37503750 <label class="checkbox_label" for="custom_stopping_strings_macro">
37513751 <input id="custom_stopping_strings_macro" type="checkbox" checked>
37523752 <small data-i18n="Replace Macro in Custom StoppingStop Strings">
37533753 Replace Macro in Custom StoppingStop Strings
37543754 </small>
37553755 </label>
37563756 </div>
@@ -3797,44 +3797,53 @@
37973797 <span data-i18n="Reasoning">Reasoning</span>
37983798 </h4>
37993799 <div>
3800- <label class="checkbox_label" for="reasoning_auto_parse" title="Automatically parse reasoning blocks from main content between the reasoning prefix/suffix. Both fields must be defined and non-empty." data-i18n="[title]reasoning_auto_parse">
3800+ <div class="flex-container alignItemsBaseline">
3801- <input id="reasoning_auto_parse" type="checkbox" />
3801+ <label class="checkbox_label flex1" for="reasoning_auto_parse" title="Automatically parse reasoning blocks from main content between the reasoning prefix/suffix. Both fields must be defined and non-empty." data-i18n="[title]reasoning_auto_parse">
3802- <small data-i18n="Auto-Parse Reasoning">
3802+ <input id="reasoning_auto_parse" type="checkbox" />
3803- Auto-Parse Reasoning
3803+ <small data-i18n="Auto-Parse">
3804- </small>
3804+ Auto-Parse
38053805 </labelsmall>
3806- <label class="checkbox_label" for="reasoning_auto_expand" title="Automatically expand reasoning blocks." data-i18n="[title]reasoning_auto_expand">
3806+ </label>
3807- <input id="reasoning_auto_expand" type="checkbox" />
3807+ <label class="checkbox_label flex1" for="reasoning_auto_expand" title="Automatically expand reasoning blocks." data-i18n="[title]reasoning_auto_expand">
3808- <small data-i18n="Auto-Expand Reasoning">
3808+ <input id="reasoning_auto_expand" type="checkbox" />
3809- Auto-Expand Reasoning
3809+ <small data-i18n="Auto-Expand">
3810- </small>
3810+ Auto-Expand
38113811 </labelsmall>
3812- <label class="checkbox_label" for="reasoning_add_to_prompts" title="Add existing reasoning blocks to prompts. To add a new reasoning block, use the message edit menu." data-i18n="[title]reasoning_add_to_prompts">
3812+ </label>
3813- <input id="reasoning_add_to_prompts" type="checkbox" />
3813+ </div>
3814- <small data-i18n="Add Reasoning to Prompts">
3814+ <div class="flex-container alignItemsBaseline">
3815- Add Reasoning to Prompts
3815+ <label class="checkbox_label flex1" for="reasoning_add_to_prompts" title="Add existing reasoning blocks to prompts. To add a new reasoning block, use the message edit menu." data-i18n="[title]reasoning_add_to_prompts">
3816- </small>
3816+ <input id="reasoning_add_to_prompts" type="checkbox" />
3817- </label>
3817+ <small data-i18n="Add to Prompts">
3818- <div class="flex-container">
3818+ Add to Prompts
3819- <div class="flex1" title="Inserted before the reasoning content." data-i18n="[title]reasoning_prefix">
3819+ </small>
3820- <small data-i18n="Prefix">Prefix</small>
3820+ </label>
3821- <textarea id="reasoning_prefix" class="text_pole textarea_compact autoSetHeight"></textarea>
3821+ <div class="flex1 flex-container alignItemsBaseline" title="Maximum number of reasoning blocks to be added per prompt, counting from the last message." data-i18n="[title]reasoning_max_additions">
3822- </div>
3822+ <input id="reasoning_max_additions" class="text_pole textarea_compact widthUnset" type="number" min="0" max="999"></textarea>
3823- <div class="flex1" title="Inserted after the reasoning content." data-i18n="[title]reasoning_suffix">
3823+ <small data-i18n="Max">Max</small>
3824- <small data-i18n="Suffix">Suffix</small>
3825- <textarea id="reasoning_suffix" class="text_pole textarea_compact autoSetHeight"></textarea>
38263824 </div>
38273825 </div>
3828- <div class="flex-container">
3826+ <details>
3829- <div class="flex1" title="Inserted between the reasoning and the message content." data-i18n="[title]reasoning_separator">
3827+ <summary data-i18n="Reasoning Formatting">
3830- <small data-i18n="Separator">Separator</small>
3828+ Reasoning Formatting
3831- <textarea id="reasoning_separator" class="text_pole textarea_compact autoSetHeight"></textarea>
3829+ </summary>
3830+ <div class="flex-container">
3831+ <div class="flex1" title="Inserted before the reasoning content." data-i18n="[title]reasoning_prefix">
3832+ <small data-i18n="Prefix">Prefix</small>
3833+ <textarea id="reasoning_prefix" class="text_pole textarea_compact autoSetHeight"></textarea>
3834+ </div>
3835+ <div class="flex1" title="Inserted after the reasoning content." data-i18n="[title]reasoning_suffix">
3836+ <small data-i18n="Suffix">Suffix</small>
3837+ <textarea id="reasoning_suffix" class="text_pole textarea_compact autoSetHeight"></textarea>
3838+ </div>
38323839 </div>
3833- <div class="flex1" title="Maximum number of reasoning blocks to be added per prompt, counting from the last message." data-i18n="[title]reasoning_max_additions">
3840+ <div class="flex-container">
3834- <small data-i18n="Max Additions">Max Additions</small>
3841+ <div class="flex1" title="Inserted between the reasoning and the message content." data-i18n="[title]reasoning_separator">
3835- <input id="reasoning_max_additions" class="text_pole textarea_compact" type="number" min="0" max="999"></textarea>
3842+ <small data-i18n="Separator">Separator</small>
3843+ <textarea id="reasoning_separator" class="text_pole textarea_compact autoSetHeight"></textarea>
3844+ </div>
38363845 </div>
38373846 </divdetails>
38383847 </div>
38393848 </div>
38403849 <div>
public/locales/ar-sa.json+1 -1
@@ -482,7 +482,7 @@
482482 "separate with commas w/o space between": "فصل بفواصل دون مسافة بينها",
483483 "Custom Stopping Strings": "سلاسل توقف مخصصة",
484484 "JSON serialized array of strings": "مصفوفة سلسلة JSON متسلسلة",
485485 "Replace Macro in Custom StoppingStop Strings": "استبدال الماكرو في سلاسل التوقف المخصصة",
486486 "Auto-Continue": "المتابعة التلقائية",
487487 "Allow for Chat Completion APIs": "السماح بواجهات برمجة التطبيقات لإكمال الدردشة",
488488 "Target length (tokens)": "الطول المستهدف (رموز)",
public/locales/de-de.json+1 -1
@@ -482,7 +482,7 @@
482482 "separate with commas w/o space between": "getrennt durch Kommas ohne Leerzeichen dazwischen",
483483 "Custom Stopping Strings": "Benutzerdefinierte Stoppzeichenfolgen",
484484 "JSON serialized array of strings": "JSON serialisierte Reihe von Zeichenfolgen",
485485 "Replace Macro in Custom StoppingStop Strings": "Makro in benutzerdefinierten Stoppzeichenfolgen ersetzen",
486486 "Auto-Continue": "Automatisch fortsetzen",
487487 "Allow for Chat Completion APIs": "Erlaube Chat-Vervollständigungs-APIs",
488488 "Target length (tokens)": "Ziel-Länge (Tokens)",
public/locales/es-es.json+1 -1
@@ -482,7 +482,7 @@
482482 "separate with commas w/o space between": "separe con comas sin espacio entre ellas",
483483 "Custom Stopping Strings": "Cadenas de Detención Personalizadas",
484484 "JSON serialized array of strings": "Arreglo de cadenas serializado en JSON",
485485 "Replace Macro in Custom StoppingStop Strings": "Reemplazar macro en Cadenas de Detención Personalizadas",
486486 "Auto-Continue": "Autocontinuar",
487487 "Allow for Chat Completion APIs": "Permitir para APIs de Completado de Chat",
488488 "Target length (tokens)": "Longitud objetivo (tokens)",
public/locales/fr-fr.json+1 -1
@@ -434,7 +434,7 @@
434434 "Non-markdown strings": "Chaînes non Markdown",
435435 "Custom Stopping Strings": "Chaînes d'arrêt personnalisées",
436436 "JSON serialized array of strings": "Tableau de chaînes sérialisé JSON",
437437 "Replace Macro in Custom StoppingStop Strings": "Remplacer les macro dans les chaînes d'arrêt personnalisées",
438438 "Auto-Continue": "Auto-Continue",
439439 "Allow for Chat Completion APIs": "Autoriser les APIs de complétion de chat",
440440 "Target length (tokens)": "Longueur cible (tokens)",
public/locales/is-is.json+1 -1
@@ -482,7 +482,7 @@
482482 "separate with commas w/o space between": "aðskilið með kommum án bila milli",
483483 "Custom Stopping Strings": "Eigin stopp-strengir",
484484 "JSON serialized array of strings": "JSON raðað fylki af strengjum",
485485 "Replace Macro in Custom StoppingStop Strings": "Skiptu út í macro í sérsniðnum stoppa strengjum",
486486 "Auto-Continue": "Sjálfvirk Forná",
487487 "Allow for Chat Completion APIs": "Leyfa fyrir spjall Loka APIs",
488488 "Target length (tokens)": "Markaðarlengd (texti)",
public/locales/it-it.json+1 -1
@@ -482,7 +482,7 @@
482482 "separate with commas w/o space between": "separati con virgole senza spazio tra loro",
483483 "Custom Stopping Strings": "Stringhe di Stop Personalizzate",
484484 "JSON serialized array of strings": "Matrice serializzata JSON di stringhe",
485485 "Replace Macro in Custom StoppingStop Strings": "Sostituisci Macro in Stringhe di Arresto Personalizzate",
486486 "Auto-Continue": "Auto-continua",
487487 "Allow for Chat Completion APIs": "Consenti per API di completamento chat",
488488 "Target length (tokens)": "Lunghezza obiettivo (token)",
public/locales/ja-jp.json+1 -1
@@ -482,7 +482,7 @@
482482 "separate with commas w/o space between": "間にスペースのないカンマで区切ります",
483483 "Custom Stopping Strings": "カスタム停止文字列",
484484 "JSON serialized array of strings": "文字列のJSONシリアル化配列",
485485 "Replace Macro in Custom StoppingStop Strings": "カスタム停止文字列内のマクロを置換する",
486486 "Auto-Continue": "自動継続",
487487 "Allow for Chat Completion APIs": "チャット補完APIを許可",
488488 "Target length (tokens)": "ターゲット長さ（トークン）",
public/locales/ko-kr.json+1 -1
@@ -492,7 +492,7 @@
492492 "separate with commas w/o space between": "쉼표로 구분 (공백 없이)",
493493 "Custom Stopping Strings": "사용자 정의 중지 문자열",
494494 "JSON serialized array of strings": "문자열의 JSON 직렬화된 배열",
495495 "Replace Macro in Custom StoppingStop Strings": "사용자 정의 중단 문자열에서 매크로 교체",
496496 "Auto-Continue": "자동 계속하기",
497497 "Allow for Chat Completion APIs": "채팅 완성 API 허용",
498498 "Target length (tokens)": "대상 길이 (토큰)",
public/locales/nl-nl.json+1 -1
@@ -482,7 +482,7 @@
482482 "separate with commas w/o space between": "gescheiden met komma's zonder spatie ertussen",
483483 "Custom Stopping Strings": "Aangepaste Stopreeksen",
484484 "JSON serialized array of strings": "JSON geserialiseerde reeks van strings",
485485 "Replace Macro in Custom StoppingStop Strings": "Macro vervangen in aangepaste stopreeksen",
486486 "Auto-Continue": "Automatisch doorgaan",
487487 "Allow for Chat Completion APIs": "Chatvervolledigings-API's toestaan",
488488 "Target length (tokens)": "Doellengte (tokens)",
public/locales/pt-pt.json+1 -1
@@ -482,7 +482,7 @@
482482 "separate with commas w/o space between": "separe com vírgulas sem espaço entre",
483483 "Custom Stopping Strings": "Cadeias de parada personalizadas",
484484 "JSON serialized array of strings": "Matriz de strings serializada em JSON",
485485 "Replace Macro in Custom StoppingStop Strings": "Substituir Macro em Strings de Parada Personalizadas",
486486 "Auto-Continue": "Auto-Continuar",
487487 "Allow for Chat Completion APIs": "Permitir APIs de Completar Chat",
488488 "Target length (tokens)": "Comprimento alvo (tokens)",
public/locales/ru-ru.json+1 -1
@@ -161,7 +161,7 @@
161161 "View hidden API keys": "Посмотреть скрытые API-ключи",
162162 "Advanced Formatting": "Расширенное форматирование",
163163 "Context Template": "Шаблон контекста",
164164 "Replace Macro in Custom StoppingStop Strings": "Заменять макросы в пользовательских стоп-строках",
165165 "Story String": "Строка истории",
166166 "Example Separator": "Разделитель примеров сообщений",
167167 "Chat Start": "Начало чата",
public/locales/uk-ua.json+1 -1
@@ -482,7 +482,7 @@
482482 "separate with commas w/o space between": "розділяйте комами без пропусків між ними",
483483 "Custom Stopping Strings": "Власні рядки зупинки",
484484 "JSON serialized array of strings": "JSON-серіалізований масив рядків",
485485 "Replace Macro in Custom StoppingStop Strings": "Замінювати макроси у власних рядках зупинки",
486486 "Auto-Continue": "Автоматичне продовження",
487487 "Allow for Chat Completion APIs": "Дозволити для Chat Completion API",
488488 "Target length (tokens)": "Цільова довжина (токени)",
public/locales/vi-vn.json+1 -1
@@ -482,7 +482,7 @@
482482 "separate with commas w/o space between": "phân tách bằng dấu phẩy không có khoảng trắng giữa",
483483 "Custom Stopping Strings": "Chuỗi dừng tùy chỉnh",
484484 "JSON serialized array of strings": "Mảng chuỗi được tuần tự hóa JSON",
485485 "Replace Macro in Custom StoppingStop Strings": "Thay thế Macro trong Chuỗi Dừng Tùy chỉnh",
486486 "Auto-Continue": "Tự động Tiếp tục",
487487 "Allow for Chat Completion APIs": "Cho phép các API hoàn thành Trò chuyện",
488488 "Target length (tokens)": "Độ dài mục tiêu (token)",
public/locales/zh-cn.json+1 -1
@@ -559,7 +559,7 @@
559559 "Prompt Content": "提示词内容",
560560 "Custom Stopping Strings": "自定义停止字符串",
561561 "JSON serialized array of strings": "JSON序列化的字符串数组",
562562 "Replace Macro in Custom StoppingStop Strings": "替换自定义停止字符串中的宏",
563563 "Token Padding": "词符填充",
564564 "Miscellaneous": "杂项",
565565 "Non-markdown strings": "非 Markdown 字符串",
public/locales/zh-tw.json+1 -1
@@ -483,7 +483,7 @@
483483 "separate with commas w/o space between": "用逗號分隔，之間無空格",
484484 "Custom Stopping Strings": "自訂停止字串",
485485 "JSON serialized array of strings": "JSON 序列化字串數組",
486486 "Replace Macro in Custom StoppingStop Strings": "取代自訂停止字串中的巨集",
487487 "Auto-Continue": "自動繼續",
488488 "Allow for Chat Completion APIs": "允許聊天補全 API",
489489 "Target length (tokens)": "目標長度（符元）",
public/style.css+2 -0
@@ -5746,11 +5746,13 @@ body:not(.movingUI) .drawer-content.maximized {
57465746 overflow-wrap: anywhere;
57475747}
57485748
5749+#SystemPromptColumn summary,
57495750#InstructSequencesColumn summary {
57505751 font-size: 0.95em;
57515752 cursor: pointer;
57525753}
57535754
5755+#SystemPromptColumn details,
57545756#InstructSequencesColumn details:not(:last-of-type) {
57555757 margin-bottom: 5px;
57565758}