rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-02-08 08:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into release

Browse Source
This commit is contained in:
Cohee 2024-04-06 20:15:20 +03:00
commit b18921de7f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/index.html
View File

@ -2758,15 +2758,17 @@
<div class="drawer-content"> <div class="drawer-content">
<h3 class="margin0" data-i18n="Advanced Formatting"> <h3 class="margin0" data-i18n="Advanced Formatting">
Advanced Formatting Advanced Formatting
<a href="https://docs.sillytavern.app/usage/core-concepts/advancedformatting/" class="notes-link" target="_blank">
<span class="fa-solid fa-circle-question note-link-span"></span>
</a>
</h3> </h3>
<div class="flex-container"> <div class="flex-container">
<div id="PygOverrides"> <div id="PygOverrides">
<div> <div>
<h4 class="standoutHeader title_restorable"> <h4 class="standoutHeader title_restorable">
<span data-i18n="Context Template">Context Template</span> <div>
<span data-i18n="Context Template">Context Template</span>
<a href="https://docs.sillytavern.app/usage/core-concepts/advancedformatting/#context-template" class="notes-link" target="_blank">
<span class="fa-solid fa-circle-question note-link-span"></span>
</a>
</div>
<div class="flex-container"> <div class="flex-container">
<i data-newbie-hidden data-preset-manager-import="context" class="margin0 menu_button fa-solid fa-file-import" title="Import preset" data-i18n="[title]Import preset"></i> <i data-newbie-hidden data-preset-manager-import="context" class="margin0 menu_button fa-solid fa-file-import" title="Import preset" data-i18n="[title]Import preset"></i>
<i data-newbie-hidden data-preset-manager-export="context" class="margin0 menu_button fa-solid fa-file-export" title="Export preset" data-i18n="[title]Export preset"></i> <i data-newbie-hidden data-preset-manager-export="context" class="margin0 menu_button fa-solid fa-file-export" title="Export preset" data-i18n="[title]Export preset"></i>

2
public/scripts/tags.js
View File

@ -783,7 +783,7 @@ function appendTagToList(listElement, tag, { removable = false, selectable = fal
if (clickableAction) { if (clickableAction) {
const filter = getFilterHelper($(listElement)); const filter = getFilterHelper($(listElement));
tagElement.on('click', (e) => clickableAction.bind(tagElement)(e, filter)); tagElement.on('click', (e) => clickableAction.bind(tagElement)(filter));
tagElement.addClass('clickable-action'); tagElement.addClass('clickable-action');
} }