diff --git a/public/index.html b/public/index.html index fae3b9bd6..3d50999d7 100644 --- a/public/index.html +++ b/public/index.html @@ -2032,33 +2032,34 @@
-
-

Extensions API: - - SillyTavern-extras - -

- - -
- - - -
@@ -2890,4 +2883,4 @@ - + \ No newline at end of file diff --git a/public/scripts/extensions/infinity-context/index.js b/public/scripts/extensions/infinity-context/index.js index c5a7fb995..e72af6f94 100644 --- a/public/scripts/extensions/infinity-context/index.js +++ b/public/scripts/extensions/infinity-context/index.js @@ -461,19 +461,20 @@ jQuery(async () => {
-

This extension rearranges the messages in the current chat to keep more relevant information in the context. Adjust the sliders below based on average amount of messages in your prompt (refer to the chat cut-off line).

- Memory Injection Strategy + This extension rearranges the messages in the current chat to keep more relevant information in the context. Adjust the sliders below based on average amount of messages in your prompt (refer to the chat cut-off line). + Memory Injection Strategy +
- + - + - + - +
`; - $('#extensions_settings').append(settingsHtml); + $('#extensions_settings2').append(settingsHtml); $('#chromadb_strategy').on('change', onStrategyChange); $('#chromadb_keep_context').on('input', onKeepContextInput); $('#chromadb_n_results').on('input', onNResultsInput); diff --git a/public/scripts/extensions/memory/index.js b/public/scripts/extensions/memory/index.js index 99ed18742..e0b8ffebd 100644 --- a/public/scripts/extensions/memory/index.js +++ b/public/scripts/extensions/memory/index.js @@ -321,24 +321,24 @@ $(document).ready(function () {
- Chat memory + Summarize
- +
- +
-
+ @@ -353,7 +353,7 @@ $(document).ready(function () {
`; - $('#extensions_settings').append(settingsHtml); + $('#extensions_settings2').append(settingsHtml); $('#memory_restore').on('click', onMemoryRestoreClick); $('#memory_contents').on('input', onMemoryContentInput); $('#memory_long_length').on('input', onMemoryLongInput); diff --git a/public/scripts/extensions/objective/index.js b/public/scripts/extensions/objective/index.js index 74ab41719..052f40416 100644 --- a/public/scripts/extensions/objective/index.js +++ b/public/scripts/extensions/objective/index.js @@ -61,7 +61,7 @@ async function generateQuietPrompt(quiet_prompt) { // Accepts optional position. Defaults to adding to end of list. function addTask(description, position = null) { - position = position != null ? position: position = globalTasks.length + position = position != null ? position : position = globalTasks.length globalTasks.splice(position, 0, { "description": description, "completed": false @@ -78,13 +78,13 @@ function getTask(index = null, taskDescription = null) { task = globalObjective[index] } else if (taskDescription != null) { task = globalTasks.find(task => { - return task.description == description ? true: false + return task.description == description ? true : false }) } return task } -function deleteTask(index){ +function deleteTask(index) { globalTasks.splice(index, 1) setCurrentTask() updateUiTaskList() @@ -229,9 +229,9 @@ function addUiTask(taskIndex, taskComplete, taskDescription) { ${taskDescription}
-

+ `; - + // Add the filled out template $('#objective-tasks').append(template); @@ -248,7 +248,7 @@ function addUiTask(taskIndex, taskComplete, taskDescription) { }); $(`#objective-task-delete-${taskIndex}`).on('click', event => { const index = Number(event.target.id.split('-').pop()); - deleteTask(index) + deleteTask(index) }); $(`#objective-task-add-${taskIndex}`).on('click', event => { const index = Number(event.target.id.split('-').pop()) + 1; @@ -262,7 +262,7 @@ function addUiTask(taskIndex, taskComplete, taskDescription) { function updateUiTaskList() { $('#objective-tasks').empty() // Show tasks if there are any - if (globalTasks.length > 0){ + if (globalTasks.length > 0) { for (const index in globalTasks) { addUiTask( index, @@ -271,7 +271,7 @@ function updateUiTaskList() { ) } } else { - // Show button to add tasks if there are none + // Show button to add tasks if there are none $('#objective-tasks').append(` `) @@ -307,7 +307,7 @@ function onChatDepthInput() { // Update how often we check for task completion function onCheckFrequencyInput() { - checkCounter = $("#objective-check-frequency").val() + checkCounter = $("#objective-check-frequency").val() $('#objective-counter').text(checkCounter) saveState() } @@ -363,19 +363,19 @@ jQuery(() => {
-
- - Automatically generate tasks for Objective. Takes a moment. +
+ +
-
-
+
-
-
- +
+
+ + Depth
-
+
(0 = disabled) diff --git a/public/scripts/extensions/objective/style.css b/public/scripts/extensions/objective/style.css index 90613f467..6d3a132e1 100644 --- a/public/scripts/extensions/objective/style.css +++ b/public/scripts/extensions/objective/style.css @@ -5,9 +5,10 @@ .objective_block { display: flex; - flex-direction: row; + /* flex-direction: row; */ align-items: center; - column-gap: 10px; + column-gap: 5px; + flex-wrap: wrap; } .objective_block_control small, @@ -24,7 +25,7 @@ opacity: 0.7; align-items: center; justify-content: center; - + } .objective-task-button:hover { @@ -33,4 +34,9 @@ [id^=objective-task-delete-] { color: #da3f3f; +} + +#objective-tasks span { + margin: unset; + margin-bottom: 5px !important; } \ No newline at end of file diff --git a/public/scripts/extensions/quick-reply/index.js b/public/scripts/extensions/quick-reply/index.js index c37f4b635..351f5ee76 100644 --- a/public/scripts/extensions/quick-reply/index.js +++ b/public/scripts/extensions/quick-reply/index.js @@ -144,7 +144,7 @@ jQuery(async () => {
`; - $('#extensions_settings').append(settingsHtml); + $('#extensions_settings2').append(settingsHtml); $('#quickReply1Mes').on('input', function () { onQuickReplyInput(1); }); $('#quickReply2Mes').on('input', function () { onQuickReplyInput(2); }); diff --git a/public/scripts/extensions/translate/index.js b/public/scripts/extensions/translate/index.js index 3c828ff60..4868c3154 100644 --- a/public/scripts/extensions/translate/index.js +++ b/public/scripts/extensions/translate/index.js @@ -350,7 +350,7 @@ jQuery(() => { Translate Chat
`; $('#extensionsMenu').append(buttonHtml); - $('#extensions_settings').append(html); + $('#extensions_settings2').append(html); $('#translate_chat').on('click', onTranslateChatClick); $('#translation_clear').on('click', onTranslationsClearClick); diff --git a/public/style.css b/public/style.css index 5a7f85363..ee1557613 100644 --- a/public/style.css +++ b/public/style.css @@ -902,6 +902,10 @@ select { margin-top: 10px; } +.marginTopBot5 { + margin: 5px 0; +} + #description_textarea, #firstmessage_textarea { height: -webkit-fill-available; @@ -1316,7 +1320,7 @@ input[type=search]:focus::-webkit-search-cancel-button { } .alignitemsflexstart { - align-items: flex-start; + align-items: flex-start !important; } .gap5px { @@ -3497,7 +3501,7 @@ a { } #extensions_status { - margin-bottom: 10px; + /* margin-bottom: 10px; */ font-weight: 700; } @@ -3558,6 +3562,16 @@ label[for="extensions_autoconnect"] { color: lightgray; } +#extensions_settings .inline-drawer-toggle.inline-drawer-header, +#extensions_settings2 .inline-drawer-toggle.inline-drawer-header { + /* background-color: var(--SmartThemeBlurTintColor); */ + background-image: linear-gradient(350deg, var(--white30a)2%, var(--grey30a)10%, var(--black70a)90%, var(--SmartThemeQuoteColor)100%); + margin-bottom: 5px; + border-radius: 10px; + padding: 5px; + border: 1px solid var(--grey30); +} + .success { color: green; } @@ -4183,6 +4197,12 @@ body.waifuMode #avatar_zoom_popup { @media screen and (max-width: 1000px) { + #extensions_settings, + #extensions_settings2 { + width: 100% !important; + min-width: 100% !important; + } + #avatar_zoom_popup { min-width: 100px; min-height: 100px; @@ -4500,4 +4520,4 @@ body.waifuMode #avatar_zoom_popup { overflow-y: auto; overflow-x: hidden; } -} +} \ No newline at end of file