diff --git a/public/index.html b/public/index.html index 8fdbf2550..2a1071b5b 100644 --- a/public/index.html +++ b/public/index.html @@ -967,51 +967,51 @@ ? - -
-
-

AutoFormat Overrides

- - - + +
+
+

AutoFormat Overrides

+ + + +
+

+ Custom Chat Separator +

-

- Custom Chat Separator -

-
- -
-
-
-

- Anchors Order - - ? - -

- -
- - -
+
+
+

+ Anchors Order + + ? + +

+ +
+ + +
+
+

Context Formatting

- Multigen + Multigen ? @@ -1814,41 +1814,7 @@

- +
@@ -1859,6 +1825,40 @@
+ + \ No newline at end of file diff --git a/public/script.js b/public/script.js index 0ef66a903..02daba93e 100644 --- a/public/script.js +++ b/public/script.js @@ -509,7 +509,7 @@ async function getStatus() { online_status = "no_connection"; } if ((online_status.toLowerCase().indexOf("pygmalion") != -1 && power_user.pygmalion_formatting == pygmalion_options.AUTO) - || (online_status !== "no_connection" && power_user.pygmalion_formatting == pygmalion_options.ENABLED)) { + || (online_status !== "no_connection" && power_user.pygmalion_formatting == pygmalion_options.ENABLED)) { is_pygmalion = true; online_status += " (Pyg. formatting on)"; } else { @@ -1192,7 +1192,7 @@ class StreamingProcessor { messageId = count_view_mes - 1; this.showStopButton(messageId); } - + hideSwipeButtons(); scrollChatToBottom(); return messageId; @@ -1722,7 +1722,7 @@ async function Generate(type, automatic_trigger, force_name2) { for (let j = 0; j < mesSend.length; j++) { mesSendString += mesSend[j]; - if (isImpersonate && j === mesSend.length -1 && tokens_already_generated === 0) { + if (isImpersonate && j === mesSend.length - 1 && tokens_already_generated === 0) { const name = is_pygmalion ? 'You' : name1; if (!mesSendString.endsWith('\n')) { mesSendString += '\n'; @@ -1811,28 +1811,28 @@ async function Generate(type, automatic_trigger, force_name2) { let this_settings = koboldai_settings[koboldai_setting_names[preset_settings]]; if (isMultigenEnabled()) { - // if nothing has been generated yet.. + // if nothing has been generated yet.. if (tokens_already_generated === 0) { - // if the max gen setting is > 50...( + // if the max gen setting is > 50...( if (parseInt(amount_gen) >= power_user.multigen_first_chunk) { - // then only try to make 50 this cycle.. + // then only try to make 50 this cycle.. this_amount_gen = power_user.multigen_first_chunk; } else { - // otherwise, make as much as the max amount request. + // otherwise, make as much as the max amount request. this_amount_gen = parseInt(amount_gen); } } // if we already received some generated text... else { // if the remaining tokens to be made is less than next potential cycle count - if (parseInt(amount_gen) - tokens_already_generated < power_user.multigen_next_chunks) { + if (parseInt(amount_gen) - tokens_already_generated < power_user.multigen_next_chunks) { // subtract already generated amount from the desired max gen amount - this_amount_gen = parseInt(amount_gen) - tokens_already_generated; + this_amount_gen = parseInt(amount_gen) - tokens_already_generated; } else { // otherwise make the standard cycle amount (first 50, and 30 after that) - this_amount_gen = power_user.multigen_next_chunks; + this_amount_gen = power_user.multigen_next_chunks; } } } @@ -2039,7 +2039,7 @@ async function Generate(type, automatic_trigger, force_name2) { setTimeout(() => { let newType = type == "swipe" ? "swipe" : "force_name2"; newType = isImpersonate ? type : newType; - + Generate(newType, automatic_trigger = false, force_name2 = true); }, generate_loop_counter * 1000); } @@ -4319,7 +4319,7 @@ $(document).ready(function () { ///////////// OPTIMIZED LISTENERS FOR LEFT SIDE OPTIONS POPUP MENU ////////////////////// - $("#options_button [id]").on("click", function () { + $("#options [id]").on("click", function () { var id = $(this).attr("id"); if (id == "option_select_chat") { @@ -4818,13 +4818,13 @@ $(document).ready(function () { ) { continue; } - + var format = ext[1].toLowerCase(); $("#character_import_file_type").val(format); var formData = new FormData(); formData.append('avatar', file); formData.append('file_type', format); - + jQuery.ajax({ type: "POST", url: "/importcharacter", @@ -4843,12 +4843,12 @@ $(document).ready(function () { .children("img") .attr("src", "characters/" + data.file_name + ".png"); $("#rm_info_avatar").append($prev_img); - + let oldSelectedChar = null; if (this_chid != undefined && this_chid != "invalid-safety-id") { oldSelectedChar = characters[this_chid].name; } - + names.push(data.file_name); let nameString = DOMPurify.sanitize(names.join(', ')); await getCharacters(); diff --git a/public/scripts/extensions/dice/style.css b/public/scripts/extensions/dice/style.css index c51482d0d..e59b17073 100644 --- a/public/scripts/extensions/dice/style.css +++ b/public/scripts/extensions/dice/style.css @@ -12,6 +12,7 @@ display: flex; align-items: center; justify-content: center; + } #roll_dice:hover { @@ -20,4 +21,5 @@ #dice_dropdown { z-index: 100; + backdrop-filter: blur(--SmartThemeBlurStrength); } \ No newline at end of file diff --git a/public/style.css b/public/style.css index ed5aa59ce..945f7cb91 100644 --- a/public/style.css +++ b/public/style.css @@ -335,11 +335,12 @@ code { .options-content { overflow: hidden; display: block; - background-color: var(--SmartThemeFastUIBGColor); + background-color: var(--SmartThemeBlurTintColor); border: 1px solid var(--white30a); border-radius: 15px; box-shadow: 0 0 5px black; text-shadow: 0 0 3px black; + backdrop-filter: blur(calc(var(--SmartThemeBlurStrength)*2)); /* min-width: 200px; */ z-index: 2000; margin-bottom: 3px; @@ -383,7 +384,7 @@ code { } .options-content a:hover { - background-color: var(--SmartThemeBlurTintColor); + background-color: var(--SmartThemeEmColor); } @@ -1117,8 +1118,7 @@ input[type=search]:focus::-webkit-search-cancel-button { flex-wrap: wrap; } -.form_create_bottom_buttons_block .menu_button -{ +.form_create_bottom_buttons_block .menu_button { display: flex; justify-content: center; align-items: center; @@ -1289,6 +1289,7 @@ input[type=search]:focus::-webkit-search-cancel-button { #shadow_popup { backdrop-filter: blur(calc(var(--SmartThemeBlurStrength) * 2)); -webkit-backdrop-filter: blur(calc(var(--SmartThemeBlurStrength) * 2)); + background-color: var(--black70a); display: none; opacity: 0.0; position: absolute; @@ -1302,6 +1303,7 @@ input[type=search]:focus::-webkit-search-cancel-button { backdrop-filter: blur(var(--SmartThemeBlurStrength)); -webkit-backdrop-filter: blur(var(--SmartThemeBlurStrength)); + background-color: var(--black30a); display: none; opacity: 1.0; position: absolute; @@ -1841,6 +1843,8 @@ input[type="range"]::-webkit-slider-thumb { height: 100svh; z-index: 2055; background-color: var(--black70a); + -webkit-backdrop-filter: blur(var(--SmartThemeBlurStrength)); + backdrop-filter: blur(var(--SmartThemeBlurStrength)); } .mes_stop { @@ -1966,8 +1970,8 @@ input[type="range"]::-webkit-slider-thumb { #character_popup { display: none; background-color: var(--black30a); - backdrop-filter: blur(var(--SmartThemeBlurStrength)); - -webkit-backdrop-filter: blur(var(--SmartThemeBlurStrength)); + backdrop-filter: blur(calc(var(--SmartThemeBlurStrength)*2)); + -webkit-backdrop-filter: blur(calc(var(--SmartThemeBlurStrength)*2)); grid-template-rows: 50px 1fr 1fr 1fr 5fr; grid-gap: 10px; max-width: var(--sheldWidth); @@ -2058,6 +2062,7 @@ h5 { height: 100svh; z-index: 3001; top: 0; + background-color: var(--black70a); backdrop-filter: blur(var(--SmartThemeBlurStrength)); -webkit-backdrop-filter: blur(var(--SmartThemeBlurStrength)); } @@ -2690,7 +2695,8 @@ a { margin-top: 0; margin-bottom: 3px; overflow: hidden; - background-color: var(--SmartThemeFastUIBGColor); + background-color: var(--SmartThemeBlurTintColor); + backdrop-filter: blur(calc(var(--SmartThemeBlurStrength)*2)); border: 1px solid var(--white30a); border-radius: 15px; box-shadow: 0 0 5px black; @@ -2698,7 +2704,7 @@ a { } .list-group-item:hover { - background-color: var(--SmartThemeBlurTintColor); + background-color: var(--SmartThemeEmColor); } .list-group-item { @@ -3381,6 +3387,7 @@ body.no-blur #send_form.no-connection { body.no-blur #bg1, body.no-blur #bg2 { filter: unset; + } body.no-blur .drawer-content, @@ -3393,7 +3400,9 @@ body.no-blur #character_popup, body.no-blur #world_popup, body.no-blur #dialogue_popup, body.no-blur #select_chat_popup, -body.no-blur #send_form { +body.no-blur .options-content, +body.no-blur #send_form, +body.no-blur .list-group { background-color: var(--SmartThemeFastUIBGColor) !important; }