rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/SillyLossy/TavernAI into dev

Browse Source
This commit is contained in:
Cohee
2023-06-28 18:26:26 +03:00
parent d0ab763d2e 2f8b624578
commit 674a15b842
3 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
public/index.html
View File

@@ -2742,23 +2742,24 @@
<div class="inline-drawer"> <div class="inline-drawer">
<div class="inline-drawer-toggle inline-drawer-header"> <div class="inline-drawer-toggle inline-drawer-header">
<h4> <h4>Prompt Overrides <small>(For OpenAI/Claude APIs, and Instruct mode)</small></h4>
AI Prompt Overrides
<small>(Affects the generation)</small>
</h4>
<div class="inline-drawer-icon fa-solid fa-circle-chevron-down down"></div> <div class="inline-drawer-icon fa-solid fa-circle-chevron-down down"></div>
</div> </div>
<div class="inline-drawer-content"> <div class="inline-drawer-content">
<small>Insert {{original}} into either box to include the respective default prompt from system settings.</small>
<div> <div>
<h4>System Prompt</h4> <h4>Main Prompt</h4>
<textarea id="system_prompt_textarea" name="system_prompt" placeholder="(Overrides the main prompt for Chat Completion and/or system prompt for Instruct Mode if not empty. Use {{original}} macro to insert the original prompt.)" form="form_create" class="text_pole" autocomplete="off" rows="3" maxlength="20000"></textarea> <textarea id="system_prompt_textarea" name="system_prompt" placeholder="Any contents here will replace the default Main Prompt used for this character.&#10;(v2 spec: system_prompt)" form="form_create" class="text_pole" autocomplete="off" rows="3" maxlength="20000"></textarea>
</div> </div>
<div> <div>
<h4>Post History Instructions</h4> <h4>Jailbreak</h4>
<textarea id="post_history_instructions_textarea" name="post_history_instructions" placeholder="(Overrides the default jailbreak for Chat Completion if not empty. Use {{original}} macro to insert the original jailbreak.)" form="form_create" class="text_pole" autocomplete="off" rows="3" maxlength="20000"></textarea> <textarea id="post_history_instructions_textarea" name="post_history_instructions" placeholder="Any contents here will replace the default Jailbreak Prompt used for this character.&#10;(v2 spec: post_history_instructions)" form="form_create" class="text_pole" autocomplete="off" rows="3" maxlength="20000"></textarea>
</div> </div>
</div> </div>
</div> </div>
<hr>
<div class="inline-drawer"> <div class="inline-drawer">
<div class="inline-drawer-toggle inline-drawer-header"> <div class="inline-drawer-toggle inline-drawer-header">
<h4> <h4>
@@ -2768,25 +2769,30 @@
<div class="inline-drawer-icon fa-solid fa-circle-chevron-down down"></div> <div class="inline-drawer-icon fa-solid fa-circle-chevron-down down"></div>
</div> </div>
<div class="inline-drawer-content"> <div class="inline-drawer-content">
<div> <small>Everything here is optional</small>
<h4>Creator's Name</h4> <div class="flex-container flexnowrap">
<textarea id="creator_textarea" name="creator" placeholder="(Botmaker's name / Contact info)" form="form_create" class="text_pole" autocomplete="off" rows="1" maxlength="2000"></textarea> <div class="flex1">
<h4>Created by</h4>
<textarea id="creator_textarea" name="creator" placeholder="(Botmaker's name / Contact info)" form="form_create" class="text_pole" autocomplete="off" rows="2" maxlength="2000"></textarea>
</div> </div>
<div> <div class="flex1">
<h4>Creator's Notes</h4>
<textarea id="creator_notes_textarea" name="creator_notes" placeholder="(Displays in the characters list. Describe the bot to the user, list the chat models it has been tested on, and any other useful tips)" form="form_create" class="text_pole" autocomplete="off" rows="2" maxlength="20000"></textarea>
</div>
<div>
<h4>Creator's Tags</h4>
<textarea id="tags_textarea" name="tags" placeholder="(List of freeform comma-separated tags)" form="form_create" class="text_pole" autocomplete="off" rows="1" maxlength="2000"></textarea>
</div>
<div>
<h4>Character Version</h4> <h4>Character Version</h4>
<textarea id="character_version_textarea" name="character_version" placeholder="(Optional string to track character versions)" form="form_create" class="text_pole" autocomplete="off" rows="1" maxlength="2000"></textarea> <textarea id="character_version_textarea" name="character_version" placeholder="(If you want to track character versions)" form="form_create" class="text_pole" autocomplete="off" rows="2" maxlength="200"></textarea>
</div>
</div>
<div class="flex-container flexnowrap">
<div class="flex1">
<h4>Creator's Notes</h4>
<textarea id="creator_notes_textarea" name="creator_notes" placeholder="(Describe the bot, give use tips, or list the chat models it has been tested on. This will be displayed in the character list.)" form="form_create" class="text_pole" autocomplete="off" rows="4" maxlength="20000"></textarea>
</div>
<div class="flex1">
<h4>Tags to Embed</h4>
<textarea id="tags_textarea" name="tags" placeholder="(Write a comma-separated list of tags)" form="form_create" class="text_pole" autocomplete="off" rows="4" maxlength="2000"></textarea>
</div> </div>
</div> </div>
</div> </div>
</div>
<hr>
<div id="personality_div"> <div id="personality_div">
<h4> <h4>
<span data-i18n="Personality summary">Personality summary</span> <span data-i18n="Personality summary">Personality summary</span>

4
public/scripts/RossAscends-mods.js
View File

@@ -561,8 +561,8 @@ B: ${oldBottom}>> ${bottom}
---`) ---`)
power_user.movingUIState[elmntName].margin = 'unset'; power_user.movingUIState[elmntName].margin = 'unset';
} else { } else {
console.log('skipped unsetting margins') console.debug('skipped unsetting margins')
console.log(oldTop, top, oldLeft, left) //console.debug(oldTop, top, oldLeft, left)
} }
saveSettingsDebounced(); saveSettingsDebounced();

5
public/style.css
View File

@@ -2546,7 +2546,7 @@ input[type="range"]::-webkit-slider-thumb {
#character_popup { #character_popup {
display: none; display: none;
background-color: var(--black30a); background-color: var(--SmartThemeBlurTintColor);
backdrop-filter: blur(calc(var(--SmartThemeBlurStrength)*2)); backdrop-filter: blur(calc(var(--SmartThemeBlurStrength)*2));
-webkit-backdrop-filter: blur(calc(var(--SmartThemeBlurStrength)*2)); -webkit-backdrop-filter: blur(calc(var(--SmartThemeBlurStrength)*2));
@@ -4457,7 +4457,8 @@ body.waifuMode .zoomed_avatar {
} }
.world_entry_thin_controls, .world_entry_thin_controls,
#persona-management-block { #persona-management-block,
#character_popup .flex-container {
flex-direction: column; flex-direction: column;
} }