diff --git a/public/index.html b/public/index.html index 616e26a7a..1cc38fd23 100644 --- a/public/index.html +++ b/public/index.html @@ -2698,12 +2698,15 @@ ${characterName}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -2886,4 +2889,4 @@ - + \ No newline at end of file diff --git a/public/script.js b/public/script.js index 88501b85c..2cdc49faa 100644 --- a/public/script.js +++ b/public/script.js @@ -5429,7 +5429,6 @@ $(document).ready(function () { easing: animation_easing, }); setTimeout(function () { $("#character_popup").css("display", "none"); }, 200); - //$("#character_popup").css("display", "none"); }); $("#character_popup_ok").click(function () { is_advanced_char_open = false; @@ -6371,6 +6370,25 @@ $(document).ready(function () { } }) + $(document).on("click", ".extraMesButtonsHint", function (e) { + const elmnt = e.target; + $(elmnt).transition({ + opacity: 0, + duration: 150, + easing: 'ease-in-out', + }); + setTimeout(function () { + $(elmnt).hide(); + $(elmnt).siblings(".extraMesButtons").css('opcacity', '0'); + $(elmnt).siblings(".extraMesButtons").css('display', 'flex'); + $(elmnt).siblings(".extraMesButtons").transition({ + opacity: 1, + duration: 150, + easing: 'ease-in-out', + }); + }, 150); + }) + $(document).on("click", ".mes_edit_cancel", function () { let text = chat[this_edit_mes_id]["mes"]; diff --git a/public/scripts/extensions/floating-prompt/index.js b/public/scripts/extensions/floating-prompt/index.js index ad2a491d8..6eae5d1b4 100644 --- a/public/scripts/extensions/floating-prompt/index.js +++ b/public/scripts/extensions/floating-prompt/index.js @@ -143,12 +143,16 @@ async function moduleWorker() { function addExtensionsSettings() { const settingsHtml = `
-
+
+
+
+
Author's Note
+
@@ -202,6 +206,14 @@ async function moduleWorker() { $('#extension_floating_depth').on('input', onExtensionFloatingDepthInput); $('#extension_floating_default').on('input', onExtensionFloatingDefaultInput); $('input[name="extension_floating_position"]').on('change', onExtensionFloatingPositionInput); + $('#ANClose').on('click', function () { + $("#floatingPrompt").transition({ + opacity: 0, + duration: 200, + easing: 'ease-in-out', + }); + setTimeout(function () { $('#floatingPrompt').hide() }, 200); + }) } addExtensionsSettings(); diff --git a/public/scripts/extensions/floating-prompt/style.css b/public/scripts/extensions/floating-prompt/style.css index 6844684fa..8474ba1bf 100644 --- a/public/scripts/extensions/floating-prompt/style.css +++ b/public/scripts/extensions/floating-prompt/style.css @@ -8,6 +8,7 @@ border: 1px solid var(--white30a); position: fixed; padding: 10px; + padding-top: 25px; display: none; flex-direction: column; box-shadow: 0 0 10px var(--black70a); @@ -33,4 +34,28 @@ .floating_prompt_settings textarea { font-size: calc(var(--mainFontSize) * 0.9); line-height: 1.2; +} + +#ANClose { + height: 15px; + aspect-ratio: 1 / 1; + font-size: 20px; + opacity: 0.5; + transition: all 250ms; +} + +#ANClose:hover { + cursor: pointer; + opacity: 1; +} + +.panelControlBar { + position: absolute; + right: 5px; + top: 5px; + margin-right: 5px; +} + +#floatingPrompt .drag-grabber { + position: unset; } \ No newline at end of file diff --git a/public/style.css b/public/style.css index db8da3ed9..8b486b60b 100644 --- a/public/style.css +++ b/public/style.css @@ -364,6 +364,11 @@ code { cursor: -webkit-grab; display: none; filter: drop-shadow(0px 0px 0px black); + transition: all 250ms; +} + +.drag-grabber:hover { + opacity: 1; } #sheldheader:active { @@ -2279,14 +2284,21 @@ input[type="range"]::-webkit-slider-thumb { backdrop-filter: blur(var(--SmartThemeBlurStrength)); } -.mes_buttons { - height: 20px; - grid-row-start: 1; + +.mes_buttons, +.extraMesButtons { + /* height: 20px; */ position: relative; display: flex; gap: 10px; flex-wrap: nowrap; justify-content: flex-end; + transition: all 200ms; + overflow-x: hidden; +} + +.extraMesButtons { + display: none; } .last_mes .mes_buttons { @@ -2297,14 +2309,18 @@ input[type="range"]::-webkit-slider-thumb { margin-right: 30px; } -.mes_buttons>div { +.mes_buttons .mes_edit, +.extraMesButtonsHint, +.extraMesButtons div { cursor: pointer; transition: 0.3s ease-in-out; filter: drop-shadow(0px 0px 2px black); opacity: 0.2; } -.mes_buttons>div:hover { +.mes_buttons .mes_edit:hover, +.extraMesButtonsHint:hover, +.extraMesButtons div:hover { opacity: 1; }