From 442b510489a24a547f673d06649023ae10b31781 Mon Sep 17 00:00:00 2001 From: RossAscends <124905043+RossAscends@users.noreply.github.com> Date: Thu, 13 Apr 2023 22:59:11 +0900 Subject: [PATCH 1/9] Input bar now themed correctly --- public/scripts/RossAscends-mods.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/scripts/RossAscends-mods.js b/public/scripts/RossAscends-mods.js index 189b828c0..e2381fd70 100644 --- a/public/scripts/RossAscends-mods.js +++ b/public/scripts/RossAscends-mods.js @@ -208,7 +208,7 @@ function RA_checkOnlineStatus() { } else { if (online_status !== undefined && online_status !== "no_connection") { $("#send_textarea").attr("placeholder", "Type a message..."); //on connect, placeholder tells user to type message - const formColor = power_user.fast_ui_mode ? "var(--black90a)" : "var(--black60a)"; + const formColor = power_user.fast_ui_mode ? "var(--SmartThemeFastUIBGColor)" : "var(--SmartThemeBlurTintColor)"; /* console.log("RA-AC -- connected, coloring input as " + formColor); */ $('#send_form').removeClass("no-connection"); $("#send_form").css("background-color", formColor); //on connect, form BG changes to transprent black From 07dd8446f97eea76a53ce964a515b7133806904c Mon Sep 17 00:00:00 2001 From: RossAscends <124905043+RossAscends@users.noreply.github.com> Date: Thu, 13 Apr 2023 22:59:47 +0900 Subject: [PATCH 2/9] no color changing console spam --- public/scripts/power-user.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js index 9df34b78a..992ef7784 100644 --- a/public/scripts/power-user.js +++ b/public/scripts/power-user.js @@ -151,22 +151,22 @@ async function applyThemeColor(type) { if (type === 'main') { document.documentElement.style.setProperty('--SmartThemeBodyColor', power_user.main_text_color); - console.log($MainTextColorPicker.color); + } if (type === 'italics') { document.documentElement.style.setProperty('--SmartThemeEmColor', power_user.italics_text_color); - console.log($ItalicsTextColorPicker.color); + } if (type === 'fastUIBG') { document.documentElement.style.setProperty('--SmartThemeFastUIBGColor', power_user.fastui_bg_color); - console.log($FastUIBGColorPicker.color); + } if (type === 'blurTint') { document.documentElement.style.setProperty('--SmartThemeBlurTintColor', power_user.blur_tint_color); - console.log($BlurTintColorPicker.color); + } // a small delay to let the browser do the layout redraw From 80806d07dcb4b9edb131ec972511105be84f6516 Mon Sep 17 00:00:00 2001 From: RossAscends <124905043+RossAscends@users.noreply.github.com> Date: Thu, 13 Apr 2023 23:02:29 +0900 Subject: [PATCH 3/9] fastUI toggle now applies to send_form as well --- public/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/style.css b/public/style.css index 40f98e524..8a38e0786 100644 --- a/public/style.css +++ b/public/style.css @@ -3376,7 +3376,8 @@ body.no-blur #top-bar, body.no-blur #character_popup, body.no-blur #world_popup, body.no-blur #dialogue_popup, -body.no-blur #select_chat_popup { +body.no-blur #select_chat_popup, +body.no-blur #send_form { background-color: var(--SmartThemeFastUIBGColor) !important; } From d99951233716b0c41cbf03a8af0d8b46536e9d8d Mon Sep 17 00:00:00 2001 From: RossAscends <124905043+RossAscends@users.noreply.github.com> Date: Thu, 13 Apr 2023 23:17:23 +0900 Subject: [PATCH 4/9] note links (?) are always bold now --- public/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/style.css b/public/style.css index 8a38e0786..1b6298091 100644 --- a/public/style.css +++ b/public/style.css @@ -1778,6 +1778,7 @@ input[type="range"]::-webkit-slider-thumb { border-radius: 10px; line-height: var(--mainFontSize); font-size: var(--mainFontSize); + font-weight: 700; width: calc(var(--mainFontSize) + 0.2rem); height: calc(var(--mainFontSize) + 0.2rem); display: inline-block; From 33e056626d793572033f391d7a25de5834d3fd83 Mon Sep 17 00:00:00 2001 From: RossAscends <124905043+RossAscends@users.noreply.github.com> Date: Thu, 13 Apr 2023 23:35:53 +0900 Subject: [PATCH 5/9] larger textareas for AN/bias in extensions --- public/scripts/extensions/floating-prompt/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/scripts/extensions/floating-prompt/index.js b/public/scripts/extensions/floating-prompt/index.js index 62a19264a..a80603560 100644 --- a/public/scripts/extensions/floating-prompt/index.js +++ b/public/scripts/extensions/floating-prompt/index.js @@ -95,13 +95,13 @@ async function moduleWorker() { $('#extension_floating_counter').text(shouldAddPrompt ? 'This' : messagesTillInsertion); } -(function() { +(function () { function addExtensionsSettings() { const settingsHtml = `

Author's Note / Character Bias

- +
-
From e7a937eb0a865bfb88b564a4dca37636044b8611 Mon Sep 17 00:00:00 2001 From: RossAscends <124905043+RossAscends@users.noreply.github.com> Date: Fri, 14 Apr 2023 03:12:28 +0900 Subject: [PATCH 6/9] - converted UI img SVGs to webfonts - moved unused SVGs and PNGs into subfolders for deletion consideration --- public/img/{ => unused PNG}/book6.png | Bin public/img/{ => unused PNG}/cancel.png | Bin public/img/{ => unused PNG}/coins.png | Bin public/img/{ => unused PNG}/del_mes.png | Bin public/img/{ => unused PNG}/done.png | Bin public/img/{ => unused PNG}/love.png | Bin public/img/{ => unused PNG}/regenerate.png | Bin public/img/{ => unused PNG}/send3.png | Bin .../{ => unused SVG}/address-book-solid.svg | 0 .../img/{ => unused SVG}/book-atlas-solid.svg | 0 public/img/{ => unused SVG}/book-solid.svg | 0 .../img/{ => unused SVG}/bookmark-solid.svg | 0 public/img/{ => unused SVG}/check-solid.svg | 0 .../{ => unused SVG}/chevron-down-solid.svg | 0 .../img/{ => unused SVG}/chevron-up-solid.svg | 0 .../circle-chevron-down-solid.svg | 0 .../circle-chevron-up-solid.svg | 0 .../clock-rotate-left-solid.svg | 0 .../{ => unused SVG}/cloud-arrow-up-solid.svg | 0 .../{ => unused SVG}/comment-dots-solid.svg | 0 .../comment-medical-solid.svg | 0 public/img/{ => unused SVG}/copy-solid.svg | 0 public/img/{ => unused SVG}/cubes-solid.svg | 0 public/img/{ => unused SVG}/dice-solid.svg | 0 .../{ => unused SVG}/face-smile-regular.svg | 0 .../{ => unused SVG}/file-arrow-up-solid.svg | 0 .../{ => unused SVG}/file-export-solid.svg | 0 .../img/{ => unused SVG}/file-image-solid.svg | 0 public/img/{ => unused SVG}/font-solid.svg | 0 public/img/{ => unused SVG}/gear-solid.svg | 0 .../{ => unused SVG}/hourglass-half-solid.svg | 0 .../img/{ => unused SVG}/id-card-regular.svg | 0 public/img/{ => unused SVG}/image-solid.svg | 0 .../img/{ => unused SVG}/left-long-solid.svg | 0 public/img/{ => unused SVG}/list-ul-solid.svg | 0 public/img/{ => unused SVG}/load2.svg | 0 .../img/{ => unused SVG}/lock-open-solid.svg | 0 public/img/{ => unused SVG}/lock-solid.svg | 0 public/img/{ => unused SVG}/minus-solid.svg | 0 .../img/{ => unused SVG}/panorama-solid.svg | 0 public/img/{ => unused SVG}/pencil-solid.svg | 0 .../plug-circle-exclamation-solid.svg | 0 public/img/{ => unused SVG}/plug-solid.svg | 0 public/img/{ => unused SVG}/plus-solid.svg | 0 public/img/{ => unused SVG}/repeat-solid.svg | 0 .../img/{ => unused SVG}/scissors-solid.svg | 0 public/img/{ => unused SVG}/sliders-solid.svg | 0 public/img/{ => unused SVG}/spinner-solid.svg | 0 .../img/{ => unused SVG}/trash-can-solid.svg | 0 .../img/{ => unused SVG}/user-check-solid.svg | 0 .../img/{ => unused SVG}/user-group-solid.svg | 0 .../{ => unused SVG}/user-group-solidplus.svg | 0 .../img/{ => unused SVG}/user-pen-solid.svg | 0 .../img/{ => unused SVG}/user-plus-solid.svg | 0 .../img/{ => unused SVG}/user-slash-solid.svg | 0 public/img/{ => unused SVG}/user-solid.svg | 0 public/img/{ => unused SVG}/wifi-solid.svg | 0 public/img/{ => unused SVG}/xmark-solid.svg | 0 public/index.html | 146 ++++++--------- public/script.js | 13 +- public/scripts/RossAscends-mods.js | 6 +- public/scripts/extensions/dice/index.js | 6 +- public/scripts/extensions/dice/style.css | 5 +- .../scripts/extensions/expressions/index.js | 2 +- .../extensions/floating-prompt/index.js | 2 +- public/style.css | 176 ++++++------------ 66 files changed, 131 insertions(+), 225 deletions(-) rename public/img/{ => unused PNG}/book6.png (100%) rename public/img/{ => unused PNG}/cancel.png (100%) rename public/img/{ => unused PNG}/coins.png (100%) rename public/img/{ => unused PNG}/del_mes.png (100%) rename public/img/{ => unused PNG}/done.png (100%) rename public/img/{ => unused PNG}/love.png (100%) rename public/img/{ => unused PNG}/regenerate.png (100%) rename public/img/{ => unused PNG}/send3.png (100%) rename public/img/{ => unused SVG}/address-book-solid.svg (100%) rename public/img/{ => unused SVG}/book-atlas-solid.svg (100%) rename public/img/{ => unused SVG}/book-solid.svg (100%) rename public/img/{ => unused SVG}/bookmark-solid.svg (100%) rename public/img/{ => unused SVG}/check-solid.svg (100%) rename public/img/{ => unused SVG}/chevron-down-solid.svg (100%) rename public/img/{ => unused SVG}/chevron-up-solid.svg (100%) rename public/img/{ => unused SVG}/circle-chevron-down-solid.svg (100%) rename public/img/{ => unused SVG}/circle-chevron-up-solid.svg (100%) rename public/img/{ => unused SVG}/clock-rotate-left-solid.svg (100%) rename public/img/{ => unused SVG}/cloud-arrow-up-solid.svg (100%) rename public/img/{ => unused SVG}/comment-dots-solid.svg (100%) rename public/img/{ => unused SVG}/comment-medical-solid.svg (100%) rename public/img/{ => unused SVG}/copy-solid.svg (100%) rename public/img/{ => unused SVG}/cubes-solid.svg (100%) rename public/img/{ => unused SVG}/dice-solid.svg (100%) rename public/img/{ => unused SVG}/face-smile-regular.svg (100%) rename public/img/{ => unused SVG}/file-arrow-up-solid.svg (100%) rename public/img/{ => unused SVG}/file-export-solid.svg (100%) rename public/img/{ => unused SVG}/file-image-solid.svg (100%) rename public/img/{ => unused SVG}/font-solid.svg (100%) rename public/img/{ => unused SVG}/gear-solid.svg (100%) rename public/img/{ => unused SVG}/hourglass-half-solid.svg (100%) rename public/img/{ => unused SVG}/id-card-regular.svg (100%) rename public/img/{ => unused SVG}/image-solid.svg (100%) rename public/img/{ => unused SVG}/left-long-solid.svg (100%) rename public/img/{ => unused SVG}/list-ul-solid.svg (100%) rename public/img/{ => unused SVG}/load2.svg (100%) rename public/img/{ => unused SVG}/lock-open-solid.svg (100%) rename public/img/{ => unused SVG}/lock-solid.svg (100%) rename public/img/{ => unused SVG}/minus-solid.svg (100%) rename public/img/{ => unused SVG}/panorama-solid.svg (100%) rename public/img/{ => unused SVG}/pencil-solid.svg (100%) rename public/img/{ => unused SVG}/plug-circle-exclamation-solid.svg (100%) rename public/img/{ => unused SVG}/plug-solid.svg (100%) rename public/img/{ => unused SVG}/plus-solid.svg (100%) rename public/img/{ => unused SVG}/repeat-solid.svg (100%) rename public/img/{ => unused SVG}/scissors-solid.svg (100%) rename public/img/{ => unused SVG}/sliders-solid.svg (100%) rename public/img/{ => unused SVG}/spinner-solid.svg (100%) rename public/img/{ => unused SVG}/trash-can-solid.svg (100%) rename public/img/{ => unused SVG}/user-check-solid.svg (100%) rename public/img/{ => unused SVG}/user-group-solid.svg (100%) rename public/img/{ => unused SVG}/user-group-solidplus.svg (100%) rename public/img/{ => unused SVG}/user-pen-solid.svg (100%) rename public/img/{ => unused SVG}/user-plus-solid.svg (100%) rename public/img/{ => unused SVG}/user-slash-solid.svg (100%) rename public/img/{ => unused SVG}/user-solid.svg (100%) rename public/img/{ => unused SVG}/wifi-solid.svg (100%) rename public/img/{ => unused SVG}/xmark-solid.svg (100%) diff --git a/public/img/book6.png b/public/img/unused PNG/book6.png similarity index 100% rename from public/img/book6.png rename to public/img/unused PNG/book6.png diff --git a/public/img/cancel.png b/public/img/unused PNG/cancel.png similarity index 100% rename from public/img/cancel.png rename to public/img/unused PNG/cancel.png diff --git a/public/img/coins.png b/public/img/unused PNG/coins.png similarity index 100% rename from public/img/coins.png rename to public/img/unused PNG/coins.png diff --git a/public/img/del_mes.png b/public/img/unused PNG/del_mes.png similarity index 100% rename from public/img/del_mes.png rename to public/img/unused PNG/del_mes.png diff --git a/public/img/done.png b/public/img/unused PNG/done.png similarity index 100% rename from public/img/done.png rename to public/img/unused PNG/done.png diff --git a/public/img/love.png b/public/img/unused PNG/love.png similarity index 100% rename from public/img/love.png rename to public/img/unused PNG/love.png diff --git a/public/img/regenerate.png b/public/img/unused PNG/regenerate.png similarity index 100% rename from public/img/regenerate.png rename to public/img/unused PNG/regenerate.png diff --git a/public/img/send3.png b/public/img/unused PNG/send3.png similarity index 100% rename from public/img/send3.png rename to public/img/unused PNG/send3.png diff --git a/public/img/address-book-solid.svg b/public/img/unused SVG/address-book-solid.svg similarity index 100% rename from public/img/address-book-solid.svg rename to public/img/unused SVG/address-book-solid.svg diff --git a/public/img/book-atlas-solid.svg b/public/img/unused SVG/book-atlas-solid.svg similarity index 100% rename from public/img/book-atlas-solid.svg rename to public/img/unused SVG/book-atlas-solid.svg diff --git a/public/img/book-solid.svg b/public/img/unused SVG/book-solid.svg similarity index 100% rename from public/img/book-solid.svg rename to public/img/unused SVG/book-solid.svg diff --git a/public/img/bookmark-solid.svg b/public/img/unused SVG/bookmark-solid.svg similarity index 100% rename from public/img/bookmark-solid.svg rename to public/img/unused SVG/bookmark-solid.svg diff --git a/public/img/check-solid.svg b/public/img/unused SVG/check-solid.svg similarity index 100% rename from public/img/check-solid.svg rename to public/img/unused SVG/check-solid.svg diff --git a/public/img/chevron-down-solid.svg b/public/img/unused SVG/chevron-down-solid.svg similarity index 100% rename from public/img/chevron-down-solid.svg rename to public/img/unused SVG/chevron-down-solid.svg diff --git a/public/img/chevron-up-solid.svg b/public/img/unused SVG/chevron-up-solid.svg similarity index 100% rename from public/img/chevron-up-solid.svg rename to public/img/unused SVG/chevron-up-solid.svg diff --git a/public/img/circle-chevron-down-solid.svg b/public/img/unused SVG/circle-chevron-down-solid.svg similarity index 100% rename from public/img/circle-chevron-down-solid.svg rename to public/img/unused SVG/circle-chevron-down-solid.svg diff --git a/public/img/circle-chevron-up-solid.svg b/public/img/unused SVG/circle-chevron-up-solid.svg similarity index 100% rename from public/img/circle-chevron-up-solid.svg rename to public/img/unused SVG/circle-chevron-up-solid.svg diff --git a/public/img/clock-rotate-left-solid.svg b/public/img/unused SVG/clock-rotate-left-solid.svg similarity index 100% rename from public/img/clock-rotate-left-solid.svg rename to public/img/unused SVG/clock-rotate-left-solid.svg diff --git a/public/img/cloud-arrow-up-solid.svg b/public/img/unused SVG/cloud-arrow-up-solid.svg similarity index 100% rename from public/img/cloud-arrow-up-solid.svg rename to public/img/unused SVG/cloud-arrow-up-solid.svg diff --git a/public/img/comment-dots-solid.svg b/public/img/unused SVG/comment-dots-solid.svg similarity index 100% rename from public/img/comment-dots-solid.svg rename to public/img/unused SVG/comment-dots-solid.svg diff --git a/public/img/comment-medical-solid.svg b/public/img/unused SVG/comment-medical-solid.svg similarity index 100% rename from public/img/comment-medical-solid.svg rename to public/img/unused SVG/comment-medical-solid.svg diff --git a/public/img/copy-solid.svg b/public/img/unused SVG/copy-solid.svg similarity index 100% rename from public/img/copy-solid.svg rename to public/img/unused SVG/copy-solid.svg diff --git a/public/img/cubes-solid.svg b/public/img/unused SVG/cubes-solid.svg similarity index 100% rename from public/img/cubes-solid.svg rename to public/img/unused SVG/cubes-solid.svg diff --git a/public/img/dice-solid.svg b/public/img/unused SVG/dice-solid.svg similarity index 100% rename from public/img/dice-solid.svg rename to public/img/unused SVG/dice-solid.svg diff --git a/public/img/face-smile-regular.svg b/public/img/unused SVG/face-smile-regular.svg similarity index 100% rename from public/img/face-smile-regular.svg rename to public/img/unused SVG/face-smile-regular.svg diff --git a/public/img/file-arrow-up-solid.svg b/public/img/unused SVG/file-arrow-up-solid.svg similarity index 100% rename from public/img/file-arrow-up-solid.svg rename to public/img/unused SVG/file-arrow-up-solid.svg diff --git a/public/img/file-export-solid.svg b/public/img/unused SVG/file-export-solid.svg similarity index 100% rename from public/img/file-export-solid.svg rename to public/img/unused SVG/file-export-solid.svg diff --git a/public/img/file-image-solid.svg b/public/img/unused SVG/file-image-solid.svg similarity index 100% rename from public/img/file-image-solid.svg rename to public/img/unused SVG/file-image-solid.svg diff --git a/public/img/font-solid.svg b/public/img/unused SVG/font-solid.svg similarity index 100% rename from public/img/font-solid.svg rename to public/img/unused SVG/font-solid.svg diff --git a/public/img/gear-solid.svg b/public/img/unused SVG/gear-solid.svg similarity index 100% rename from public/img/gear-solid.svg rename to public/img/unused SVG/gear-solid.svg diff --git a/public/img/hourglass-half-solid.svg b/public/img/unused SVG/hourglass-half-solid.svg similarity index 100% rename from public/img/hourglass-half-solid.svg rename to public/img/unused SVG/hourglass-half-solid.svg diff --git a/public/img/id-card-regular.svg b/public/img/unused SVG/id-card-regular.svg similarity index 100% rename from public/img/id-card-regular.svg rename to public/img/unused SVG/id-card-regular.svg diff --git a/public/img/image-solid.svg b/public/img/unused SVG/image-solid.svg similarity index 100% rename from public/img/image-solid.svg rename to public/img/unused SVG/image-solid.svg diff --git a/public/img/left-long-solid.svg b/public/img/unused SVG/left-long-solid.svg similarity index 100% rename from public/img/left-long-solid.svg rename to public/img/unused SVG/left-long-solid.svg diff --git a/public/img/list-ul-solid.svg b/public/img/unused SVG/list-ul-solid.svg similarity index 100% rename from public/img/list-ul-solid.svg rename to public/img/unused SVG/list-ul-solid.svg diff --git a/public/img/load2.svg b/public/img/unused SVG/load2.svg similarity index 100% rename from public/img/load2.svg rename to public/img/unused SVG/load2.svg diff --git a/public/img/lock-open-solid.svg b/public/img/unused SVG/lock-open-solid.svg similarity index 100% rename from public/img/lock-open-solid.svg rename to public/img/unused SVG/lock-open-solid.svg diff --git a/public/img/lock-solid.svg b/public/img/unused SVG/lock-solid.svg similarity index 100% rename from public/img/lock-solid.svg rename to public/img/unused SVG/lock-solid.svg diff --git a/public/img/minus-solid.svg b/public/img/unused SVG/minus-solid.svg similarity index 100% rename from public/img/minus-solid.svg rename to public/img/unused SVG/minus-solid.svg diff --git a/public/img/panorama-solid.svg b/public/img/unused SVG/panorama-solid.svg similarity index 100% rename from public/img/panorama-solid.svg rename to public/img/unused SVG/panorama-solid.svg diff --git a/public/img/pencil-solid.svg b/public/img/unused SVG/pencil-solid.svg similarity index 100% rename from public/img/pencil-solid.svg rename to public/img/unused SVG/pencil-solid.svg diff --git a/public/img/plug-circle-exclamation-solid.svg b/public/img/unused SVG/plug-circle-exclamation-solid.svg similarity index 100% rename from public/img/plug-circle-exclamation-solid.svg rename to public/img/unused SVG/plug-circle-exclamation-solid.svg diff --git a/public/img/plug-solid.svg b/public/img/unused SVG/plug-solid.svg similarity index 100% rename from public/img/plug-solid.svg rename to public/img/unused SVG/plug-solid.svg diff --git a/public/img/plus-solid.svg b/public/img/unused SVG/plus-solid.svg similarity index 100% rename from public/img/plus-solid.svg rename to public/img/unused SVG/plus-solid.svg diff --git a/public/img/repeat-solid.svg b/public/img/unused SVG/repeat-solid.svg similarity index 100% rename from public/img/repeat-solid.svg rename to public/img/unused SVG/repeat-solid.svg diff --git a/public/img/scissors-solid.svg b/public/img/unused SVG/scissors-solid.svg similarity index 100% rename from public/img/scissors-solid.svg rename to public/img/unused SVG/scissors-solid.svg diff --git a/public/img/sliders-solid.svg b/public/img/unused SVG/sliders-solid.svg similarity index 100% rename from public/img/sliders-solid.svg rename to public/img/unused SVG/sliders-solid.svg diff --git a/public/img/spinner-solid.svg b/public/img/unused SVG/spinner-solid.svg similarity index 100% rename from public/img/spinner-solid.svg rename to public/img/unused SVG/spinner-solid.svg diff --git a/public/img/trash-can-solid.svg b/public/img/unused SVG/trash-can-solid.svg similarity index 100% rename from public/img/trash-can-solid.svg rename to public/img/unused SVG/trash-can-solid.svg diff --git a/public/img/user-check-solid.svg b/public/img/unused SVG/user-check-solid.svg similarity index 100% rename from public/img/user-check-solid.svg rename to public/img/unused SVG/user-check-solid.svg diff --git a/public/img/user-group-solid.svg b/public/img/unused SVG/user-group-solid.svg similarity index 100% rename from public/img/user-group-solid.svg rename to public/img/unused SVG/user-group-solid.svg diff --git a/public/img/user-group-solidplus.svg b/public/img/unused SVG/user-group-solidplus.svg similarity index 100% rename from public/img/user-group-solidplus.svg rename to public/img/unused SVG/user-group-solidplus.svg diff --git a/public/img/user-pen-solid.svg b/public/img/unused SVG/user-pen-solid.svg similarity index 100% rename from public/img/user-pen-solid.svg rename to public/img/unused SVG/user-pen-solid.svg diff --git a/public/img/user-plus-solid.svg b/public/img/unused SVG/user-plus-solid.svg similarity index 100% rename from public/img/user-plus-solid.svg rename to public/img/unused SVG/user-plus-solid.svg diff --git a/public/img/user-slash-solid.svg b/public/img/unused SVG/user-slash-solid.svg similarity index 100% rename from public/img/user-slash-solid.svg rename to public/img/unused SVG/user-slash-solid.svg diff --git a/public/img/user-solid.svg b/public/img/unused SVG/user-solid.svg similarity index 100% rename from public/img/user-solid.svg rename to public/img/unused SVG/user-solid.svg diff --git a/public/img/wifi-solid.svg b/public/img/unused SVG/wifi-solid.svg similarity index 100% rename from public/img/wifi-solid.svg rename to public/img/unused SVG/wifi-solid.svg diff --git a/public/img/xmark-solid.svg b/public/img/unused SVG/xmark-solid.svg similarity index 100% rename from public/img/xmark-solid.svg rename to public/img/unused SVG/xmark-solid.svg diff --git a/public/index.html b/public/index.html index 5f8113b4e..eaba9f7a0 100644 --- a/public/index.html +++ b/public/index.html @@ -5,13 +5,12 @@ - - + - + @@ -66,14 +65,14 @@
-
+
@@ -657,7 +656,7 @@
Main prompt
- +
@@ -671,7 +670,7 @@
NSFW prompt
- +
@@ -685,7 +684,7 @@
Jailbreak prompt
- +
@@ -742,7 +741,7 @@
-
+
@@ -767,7 +766,7 @@
Example: http://127.0.0.1:5000/api
- +
@@ -782,7 +781,7 @@

Model
- +

- +
@@ -829,7 +828,7 @@
Example: http://127.0.0.1:7860/
- +
@@ -846,7 +845,7 @@ - +
@@ -861,7 +860,7 @@
Instructions: -
+
    @@ -883,7 +882,7 @@
- +
@@ -908,7 +907,7 @@
-
+

Advanced Formatting @@ -988,7 +987,7 @@
-
+
@@ -1041,7 +1040,7 @@
-
+

User Settings

@@ -1214,7 +1213,7 @@
@@ -1232,7 +1231,7 @@
-
+
@@ -1268,22 +1267,20 @@
-
+
-
@@ -1370,7 +1357,7 @@
@@ -1418,8 +1405,8 @@
- Remove - Add +
+
@@ -1430,7 +1417,7 @@
- +
@@ -1445,15 +1432,9 @@
- - - + + +
@@ -1668,9 +1649,7 @@
- +

@@ -1690,7 +1669,7 @@
- +
@@ -1708,26 +1687,14 @@
-
+
- - - - - - + + + + + +
@@ -1779,27 +1746,28 @@
diff --git a/public/script.js b/public/script.js index 7fcb4f5c5..b1b8903ab 100644 --- a/public/script.js +++ b/public/script.js @@ -302,7 +302,7 @@ $(document).ajaxError(function myErrorHandler(_, xhr) { } }); -function getTokenCount(str, padding=0) { +function getTokenCount(str, padding = 0) { if (main_api == 'poe' || main_api == 'openai') { return gpt3.encode(str).bpe.length + padding; } @@ -1150,13 +1150,13 @@ function isStreamingEnabled() { class StreamingProcessor { showStopButton(messageId) { - $(`#chat .mes[mesid="${messageId}"] .mes_stop`).css({'display': 'block'}); - $(`#chat .mes[mesid="${messageId}"] .mes_edit`).css({'display': 'none'}); + $(`#chat .mes[mesid="${messageId}"] .mes_stop`).css({ 'display': 'block' }); + $(`#chat .mes[mesid="${messageId}"] .mes_edit`).css({ 'display': 'none' }); } hideStopButton(messageId) { - $(`#chat .mes[mesid="${messageId}"] .mes_stop`).css({'display': 'none'}); - $(`#chat .mes[mesid="${messageId}"] .mes_edit`).css({'display': 'block'}); + $(`#chat .mes[mesid="${messageId}"] .mes_stop`).css({ 'display': 'none' }); + $(`#chat .mes[mesid="${messageId}"] .mes_edit`).css({ 'display': 'block' }); } onStartStreaming(text) { @@ -1920,7 +1920,7 @@ async function Generate(type, automatic_trigger, force_name2) { return; } } - + if (streamingProcessor.isFinished) { streamingProcessor.onFinishStreaming(streamingProcessor.messageId, getMessage); streamingProcessor = null; @@ -4927,6 +4927,7 @@ $(document).ready(function () { $(document).on('click', '.inline-drawer-toggle', function () { var icon = $(this).find('.inline-drawer-icon'); icon.toggleClass('down up'); + icon.toggleClass('fa-circle-chevron-down fa-circle-chevron-up'); $(this).closest('.inline-drawer').find('.inline-drawer-content').slideToggle(); }); diff --git a/public/scripts/RossAscends-mods.js b/public/scripts/RossAscends-mods.js index e2381fd70..15856e2fa 100644 --- a/public/scripts/RossAscends-mods.js +++ b/public/scripts/RossAscends-mods.js @@ -203,7 +203,8 @@ function RA_checkOnlineStatus() { $("#send_textarea").attr("placeholder", "Not connected to API!"); //Input bar placeholder tells users they are not connected $("#send_form").addClass('no-connection'); //entire input form area is red when not connected $("#send_but").css("display", "none"); //send button is hidden when not connected; - $("#API-status-top").addClass("redOverlayGlow"); + $("#API-status-top").removeClass("fa-plug"); + $("#API-status-top").addClass("fa-plug-circle-exclamation redOverlayGlow"); connection_made = false; } else { if (online_status !== undefined && online_status !== "no_connection") { @@ -212,7 +213,8 @@ function RA_checkOnlineStatus() { /* console.log("RA-AC -- connected, coloring input as " + formColor); */ $('#send_form').removeClass("no-connection"); $("#send_form").css("background-color", formColor); //on connect, form BG changes to transprent black - $("#API-status-top").removeClass("redOverlayGlow"); + $("#API-status-top").removeClass("fa-plug-circle-exclamation redOverlayGlow"); + $("#API-status-top").addClass("fa-plug"); connection_made = true; retry_delay = 100; RA_AC_retries = 1; diff --git a/public/scripts/extensions/dice/index.js b/public/scripts/extensions/dice/index.js index 2b098fce5..81b1129ce 100644 --- a/public/scripts/extensions/dice/index.js +++ b/public/scripts/extensions/dice/index.js @@ -7,13 +7,13 @@ const UPDATE_INTERVAL = 1000; function setDiceIcon() { const sendButton = document.getElementById('roll_dice'); - sendButton.style.backgroundImage = `url(/img/dice-solid.svg)`; + /* sendButton.style.backgroundImage = `url(/img/dice-solid.svg)`; */ sendButton.classList.remove('spin'); } async function doDiceRoll() { let value = $(this).data('value'); - + if (value == 'custom') { value = await callPopup('Enter the dice formula:
(for example, 2d6)', 'input'); } @@ -29,7 +29,7 @@ async function doDiceRoll() { function addDiceRollButton() { const buttonHtml = ` - +
  • d4
  • diff --git a/public/scripts/extensions/dice/style.css b/public/scripts/extensions/dice/style.css index 268e363b8..18edafdd2 100644 --- a/public/scripts/extensions/dice/style.css +++ b/public/scripts/extensions/dice/style.css @@ -3,6 +3,7 @@ width: 40px; height: 40px; margin: 0; + margin-right: 5px; padding: 1px; background: no-repeat; background-size: 26px auto; @@ -11,10 +12,10 @@ border: none; cursor: pointer; transition: 0.3s; - filter: invert(1); + font-size: 30px; opacity: 0.5; } #roll_dice:hover { opacity: 1; -} +} \ No newline at end of file diff --git a/public/scripts/extensions/expressions/index.js b/public/scripts/extensions/expressions/index.js index 1f7eddee1..9a42b8706 100644 --- a/public/scripts/extensions/expressions/index.js +++ b/public/scripts/extensions/expressions/index.js @@ -237,7 +237,7 @@ function onClickExpressionImage() {
    View supported images -
    +

    You are in offline mode. Click on the image below to set the expression.

    diff --git a/public/scripts/extensions/floating-prompt/index.js b/public/scripts/extensions/floating-prompt/index.js index a80603560..4d00ebce3 100644 --- a/public/scripts/extensions/floating-prompt/index.js +++ b/public/scripts/extensions/floating-prompt/index.js @@ -119,7 +119,7 @@ async function moduleWorker() {
    Default note for new chats -
    +
    diff --git a/public/style.css b/public/style.css index 1b6298091..93223f7dd 100644 --- a/public/style.css +++ b/public/style.css @@ -103,6 +103,12 @@ body { background-clip: content-box; } +.fa-solid::before, +.fa-regular::before { + vertical-align: middle; + text-align: center; +} + .mes_text p { margin-top: 0; margin-bottom: 10px; @@ -263,12 +269,8 @@ code { height: 40px; margin: 0; display: none; - padding: 1px; - background: url('img/send3.png') no-repeat; - background-size: 26px auto; - background-position: center center; outline: none; - + font-size: 30px; border: none; cursor: pointer; transition: 0.3s; @@ -288,14 +290,10 @@ code { order: 99999; align-items: center; justify-content: center; + font-size: 24px; filter: brightness(0.7); } -#loading_mes .svg_icon { - width: 24px; - height: 24px; -} - #options_button { position: relative; display: inline; @@ -632,6 +630,23 @@ h3 { margin: 10px 0; } +.menu_button { + /* font-weight: bold; */ + color: var(--white70); + background-color: var(--black50a); + border: 1px solid var(--white30a); + border-radius: 10px; + padding: 10px; + width: min-content; + cursor: pointer; + margin: 10px 0; + transition: 0.3s; +} + +.menu_button:hover { + background-color: var(--white30a); +} + #top-bar h3 { margin: 0; padding: 10px 0; @@ -685,6 +700,15 @@ input[type="file"] { filter: brightness(150%) grayscale(1); } +#rm_button_characters, +#rm_button_panel_pin_div, +#lm_button_panel_pin_div { + font-size: 24px; +} + +#lm_button_panel_pin_div { + text-align: start; +} #rm_button_panel_pin, #lm_button_panel_pin { @@ -806,25 +830,15 @@ select option:not(:checked) { text-align: center; } -img[src*="user-slash-solid.svg"] { - filter: invert(1); -} +img[src*="user-slash-solid.svg"] {} + -.menu_button .svg_icon { - height: 22px; - vertical-align: middle; - margin: 5px; - filter: invert(1) brightness(75%); -} .menu_button.disabled { filter: brightness(50%); cursor: not-allowed; } -.svg_icon { - filter: invert(1); -} #api_url_text, #textgenerationwebui_api_url_text { @@ -843,9 +857,8 @@ img[src*="user-slash-solid.svg"] { background-color: green; } -img[src="img/load.svg"] { - width: 25px; - height: 25px; +.api-load-icon { + font-size: 24px; display: none; } @@ -905,7 +918,6 @@ input[type=search]::-webkit-search-cancel-button { background-size: contain; opacity: 0; pointer-events: none; - filter: invert(1); cursor: pointer; } @@ -1222,35 +1234,20 @@ input[type=search]:focus::-webkit-search-cancel-button { background-color: var(--black50a); border: 1px solid var(--white30a); border-radius: 10px; - padding: 3px; + padding: 5px; cursor: pointer; margin: 0; transition: 0.3s; - - min-width: 40px; min-height: 40px; filter: grayscale(0.5); text-align: center; + font-size: 25px; + aspect-ratio: 1; + /* vertical-align: middle; */ } -.menu_button { - /* font-weight: bold; */ - color: var(--white70); - background-color: var(--black50a); - border: 1px solid var(--white30a); - border-radius: 10px; - padding: 10px; - width: min-content; - cursor: pointer; - margin: 10px 0; - transition: 0.3s; -} - -.menu_button:hover { - background-color: var(--white30a); -} #dialogue_del_mes .menu_button { @@ -1342,9 +1339,6 @@ input[type=search]:focus::-webkit-search-cancel-button { column-gap: 20px; } -.horde_model_title .right_menu_button img.svg_icon { - height: 20px; -} #softprompt { margin-bottom: 10px; @@ -1839,16 +1833,11 @@ input[type="range"]::-webkit-slider-thumb { .mes_edit { float: right; - color: var(--white30a); cursor: pointer; transition: 0.3s ease-in-out; - background-image: url(/img/pencil-solid.svg); - background-repeat: no-repeat; - background-attachment: local; - background-position: center; height: 20px; width: 20px; - filter: invert(1) drop-shadow(0px 0px 2px black); + filter: drop-shadow(0px 0px 2px black); opacity: 0.2; } @@ -1876,14 +1865,6 @@ input[type="range"]::-webkit-slider-thumb { transition: 0.3s ease-in-out; } -.mes_edit_buttons .menu_button .svg_icon { - height: 18px; - width: 18px; - margin: 2px; - filter: invert(1); -} - - .mes_edit_buttons .menu_button { opacity: 0.5; padding: 5px; @@ -2869,64 +2850,20 @@ label[for="extensions_autoconnect"] { .drawer-icon { display: inline-block; cursor: pointer; - min-width: 40px; - height: 30px; - background-size: contain; - background-position: center; - background-repeat: no-repeat; -} - -.icon-api { - background-image: url('img/plug-solid.svg'); -} - -.icon-api.redOverlayGlow { - background-image: url('img/plug-circle-exclamation-solid.svg'); -} - -.icon-sliders { - background-image: url('img/sliders-solid.svg'); -} - -.icon-globe { - background-image: url('img/book-atlas-solid.svg'); -} - -.icon-user { - background-image: url('img/face-smile-regular.svg'); -} - -.icon-idcard { - background-image: url('img/id-card-regular.svg'); -} - -.icon-panorama { - background-image: url('img/panorama-solid.svg'); -} - -.icon-cubes { - background-image: url('img/cubes-solid.svg'); -} - -.icon-formatting { - background-image: url('img/font-solid.svg'); + /* min-width: 40px; + height: 30px; */ + font-size: 1.8rem; } .drawer-icon.openIcon { - /* background-image: url('img/circle-chevron-up-solid.svg'); */ - filter: invert(1) brightness(200%) drop-shadow(0px 0px 2px black); + + filter: brightness(200%) drop-shadow(0px 0px 2px black); ; transition: all 0.275s; } -.redOverlayGlow { - filter: invert(20%) sepia(100%) saturate(2518%) hue-rotate(353deg) brightness(93%) contrast(125%) drop-shadow(0px 0px 1px #c00) !important; -} - .drawer-icon.closedIcon { - /* background-image: url('img/circle-chevron-down-solid.svg'); */ - filter: invert(1) drop-shadow(0px 0px 2px black); - ; + filter: drop-shadow(0px 0px 2px black); opacity: 0.3; transition: all 0.275s; } @@ -2942,19 +2879,16 @@ label[for="extensions_autoconnect"] { .inline-drawer-icon { display: block; cursor: pointer; - width: 26px; - height: 26px; + font-size: calc(var(--mainFontSize)*1.5); background-size: cover; background-repeat: no-repeat; - filter: invert(1) brightness(75%); + filter: brightness(75%); } -.inline-drawer-icon.up { - background-image: url('img/circle-chevron-up-solid.svg'); -} - -.inline-drawer-icon.down { - background-image: url('img/circle-chevron-down-solid.svg'); +.redOverlayGlow { + color: #ad0000; + opacity: 0.8 !important; + filter: drop-shadow(0px 0px 2px red) !important; } .inline-drawer-header { From 5ff4d347534480543f3a6ec0324c45a647af748a Mon Sep 17 00:00:00 2001 From: RossAscends <124905043+RossAscends@users.noreply.github.com> Date: Fri, 14 Apr 2023 03:27:49 +0900 Subject: [PATCH 7/9] updated missing avatars to be a webfont display --- public/index.html | 4 +--- public/script.js | 4 +++- public/style.css | 6 +++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/public/index.html b/public/index.html index eaba9f7a0..613b4ca3c 100644 --- a/public/index.html +++ b/public/index.html @@ -1356,9 +1356,7 @@
    - +
    diff --git a/public/script.js b/public/script.js index b1b8903ab..235f9210a 100644 --- a/public/script.js +++ b/public/script.js @@ -961,7 +961,9 @@ function addOneMessage(mes, type = "normal", insertAfter = null) { } newMessage.find('.avatar img').on('error', function () { - $(this).attr("src", "/img/user-slash-solid.svg"); + /* $(this).attr("src", "/img/user-slash-solid.svg"); */ + $(this).hide(); + $(this).parent().html(`
    `); }); if (type === 'swipe') { diff --git a/public/style.css b/public/style.css index 93223f7dd..edb435630 100644 --- a/public/style.css +++ b/public/style.css @@ -2377,7 +2377,7 @@ h5 { } #rm_button_back_from_group { - padding: 0; + padding: 5px; } #typing_indicator_template { @@ -2392,6 +2392,10 @@ h5 { text-shadow: 2px 2px 2px var(--black60a); } +.missing-avatar { + font-size: 36px; +} + .typing_indicator:after { display: inline-block; vertical-align: bottom; From b5006b62881e46cbe1d3c9af9f874ece3c192e50 Mon Sep 17 00:00:00 2001 From: RossAscends <124905043+RossAscends@users.noreply.github.com> Date: Fri, 14 Apr 2023 03:33:05 +0900 Subject: [PATCH 8/9] fixed poe loading orbit --- public/scripts/poe.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/scripts/poe.js b/public/scripts/poe.js index 55af6e6fb..26a5a667f 100644 --- a/public/scripts/poe.js +++ b/public/scripts/poe.js @@ -84,11 +84,11 @@ function onBotChange() { async function generatePoe(finalPrompt) { if (poe_settings.auto_purge) { let count_to_delete = -1; - + if (auto_jailbroken && got_reply) { count_to_delete = 2; } - + await purgeConversation(count_to_delete); } @@ -196,7 +196,7 @@ async function onConnectClick() { setButtonState(true); is_get_status_poe = true; - + try { await checkStatusPoe(); } @@ -208,7 +208,7 @@ async function onConnectClick() { function setButtonState(value) { is_poe_button_press = value; - $("#api_loading_poe").css("display", value ? 'block' : 'none'); + $("#api_loading_poe").css("display", value ? 'inline-block' : 'none'); $("#poe_connect").css("display", value ? 'none' : 'block'); } From 9a847420ca0c8acf073671fd6909083a50caffba Mon Sep 17 00:00:00 2001 From: RossAscends <124905043+RossAscends@users.noreply.github.com> Date: Fri, 14 Apr 2023 03:49:18 +0900 Subject: [PATCH 9/9] - swipe icons changed to webfont - better alignment for char list names - moved load.svg to unused folder --- public/img/{ => unused SVG}/load.svg | 0 public/index.html | 6 +++--- public/style.css | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-) rename public/img/{ => unused SVG}/load.svg (100%) diff --git a/public/img/load.svg b/public/img/unused SVG/load.svg similarity index 100% rename from public/img/load.svg rename to public/img/unused SVG/load.svg diff --git a/public/index.html b/public/index.html index 613b4ca3c..e08dd8f45 100644 --- a/public/index.html +++ b/public/index.html @@ -1677,7 +1677,7 @@
    -
    +
    ${characterName} @@ -1700,8 +1700,8 @@
    -
    - +
    +
    diff --git a/public/style.css b/public/style.css index edb435630..56a5775a8 100644 --- a/public/style.css +++ b/public/style.css @@ -416,6 +416,7 @@ code { grid-row-start: 2; grid-column-start: 4; flex-flow: column; + font-size: 30px; } .swipe_right img, @@ -428,6 +429,8 @@ code { color: white; font-size: 12px; padding: 0; + font-family: "Noto Sans", "Noto Color Emoji", sans-serif; + font-weight: 400; } @@ -436,6 +439,7 @@ code { right: auto; grid-column-start: 2; align-items: flex-end; + padding-bottom: 17px; } .ui-settings { @@ -937,9 +941,10 @@ input[type=search]:focus::-webkit-search-cancel-button { .character_select .ch_name { margin-left: 10px; margin-top: 5px; - transform: translateY(25%); + /* transform: translateY(25%); */ overflow: hidden; text-overflow: ellipsis; + align-self: center; } .character_select:hover {