Merge branch 'SillyTavern:staging' into staging

This commit is contained in:
Shima Rin 2023-08-05 17:40:32 +08:00 committed by GitHub
commit 3aa8229401
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 11 deletions

View File

@ -1337,7 +1337,7 @@
</div>
<div class="range-block" data-source="claude">
<span data-i18n="Assistant Prefill">Assistant Prefill</span>
<input type="text" id="claude_assistant_prefill" class="text_pole" placeholder="Start Claude's answer with...">
<textarea id="claude_assistant_prefill" class="text_pole textarea_compact" name="assistant_prefill" rows="3" maxlength="5000" placeholder="Start Claude's answer with..."></textarea>
</div>
<div class="inline-drawer wide100p">

View File

@ -1252,8 +1252,8 @@ function messageFormatting(mes, ch_name, isSystem, isUser) {
mes = fixMarkdown(mes);
}
if (this_chid != undefined && !isSystem)
mes = mes.replaceAll("<", "&lt;").replaceAll(">", "&gt;"); //for welcome message
//if (this_chid != undefined && !isSystem)
// mes = mes.replaceAll("<", "&lt;").replaceAll(">", "&gt;"); //for welcome message
if ((this_chid === undefined || this_chid === "invalid-safety-id") && !selected_group) {
mes = mes
.replace(/\*\*(.+?)\*\*/g, "<b>$1</b>")

View File

@ -221,6 +221,9 @@ table.responsiveTable {
.mes_text blockquote {
color: var(--SmartThemeQuoteColor);
font-weight: 500;
border-left: 3px solid var(--SmartThemeQuoteColor);
padding-left: 10px;
background-color: var(--black30a);
}
.mes_text strong em,
@ -1293,7 +1296,8 @@ body.charListGrid #rm_print_characters_block .tags_inline {
}
.floating_prompt_radio_group, .radio_group {
.floating_prompt_radio_group,
.radio_group {
display: flex;
flex-direction: column;
}
@ -3050,12 +3054,13 @@ h5 {
/* HEINOUS */
@keyframes infinite-spinning {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}
#export_character_div {
@ -5461,4 +5466,4 @@ body.waifuMode .zoomed_avatar {
background-color: var(--SmartThemeBlurTintColor);
text-align: center;
line-height: 14px;
}
}