diff --git a/public/index.html b/public/index.html index 0a7346777..d48a59288 100644 --- a/public/index.html +++ b/public/index.html @@ -2465,9 +2465,26 @@
-
@@ -3431,4 +3430,4 @@ - \ No newline at end of file + diff --git a/public/script.js b/public/script.js index 3778113c2..7dc07cad9 100644 --- a/public/script.js +++ b/public/script.js @@ -276,7 +276,7 @@ let is_mes_reload_avatar = false; let optionsPopper = Popper.createPopper(document.getElementById('options_button'), document.getElementById('options'), { placement: 'top-start' }); -let exportPopper = Popper.createPopper(document.getElementById('char-management-dropdown'), document.getElementById('export_format_popup'), { +let exportPopper = Popper.createPopper(document.getElementById('export_button'), document.getElementById('export_format_popup'), { placement: 'left' }); let rawPromptPopper = Popper.createPopper(document.getElementById('dialogue_popup'), document.getElementById('rawPromptPopup'), { @@ -6676,7 +6676,7 @@ $(document).ready(function () { $("#form_create").submit(createOrEditCharacter); - /* $("#delete_button").click(function () { + $("#delete_button").on('click', function () { popup_type = "del_ch"; callPopup(`

Delete the character?

@@ -6684,9 +6684,9 @@ $(document).ready(function () { THIS WILL ALSO DELETE ALL
OF THE CHARACTER'S CHAT FILES.

` ); - }); */ + }); - $("#rm_info_button").click(function () { + $("#rm_info_button").on('click', function () { $("#rm_info_avatar").html(""); select_rm_characters(); }); @@ -7462,10 +7462,10 @@ $(document).ready(function () { importCharacter(file); } }); - /* $("#export_button").click(function (e) { + $("#export_button").on('click', function (e) { $('#export_format_popup').toggle(); exportPopper.update(); - }); */ + }); $(document).on('click', '.export_format', async function () { const format = $(this).data('format'); @@ -7547,7 +7547,7 @@ $(document).ready(function () { select_rm_characters(); }); - /* $("#dupe_button").click(async function () { + $("#dupe_button").click(async function () { const body = { avatar_url: characters[this_chid].avatar }; const response = await fetch('/dupecharacter', { @@ -7559,7 +7559,7 @@ $(document).ready(function () { toastr.success("Character Duplicated"); getCharacters(); } - }); */ + }); $(document).on("click", ".select_chat_block, .bookmark_link, .mes_bookmark", async function () { let file_name = $(this).hasClass('mes_bookmark') @@ -7757,18 +7757,19 @@ $(document).ready(function () { case 'renameCharButton': renameCharacter(); break; - case 'dupe_button': + /*case 'dupe_button': DupeChar(); break; case 'export_button': $('#export_format_popup').toggle(); exportPopper.update(); break; + */ case 'import_character_info': await importEmbeddedWorldInfo(); saveCharacterDebounced(); break; - case 'delete_button': + /*case 'delete_button': popup_type = "del_ch"; callPopup(`

Delete the character?

@@ -7776,7 +7777,7 @@ $(document).ready(function () { THIS WILL ALSO DELETE ALL
OF THE CHARACTER'S CHAT FILES.

` ); - break; + break;*/ } $("#char-management-dropdown").prop('selectedIndex', 0); }); diff --git a/public/scripts/RossAscends-mods.js b/public/scripts/RossAscends-mods.js index cd9c3da49..c4e60b606 100644 --- a/public/scripts/RossAscends-mods.js +++ b/public/scripts/RossAscends-mods.js @@ -298,7 +298,7 @@ export function RA_CountCharTokens() {
${count_tokens}
 Tokens (
${perm_tokens}
 Permanent)
- +
`); } //warn if either are over 1024 } diff --git a/public/style.css b/public/style.css index 20ec26e22..ba6814b29 100644 --- a/public/style.css +++ b/public/style.css @@ -952,7 +952,6 @@ select { } #character_cross, -#world_cross, #select_chat_cross { position: absolute; right: 15px; @@ -1037,6 +1036,7 @@ input[type="file"] { align-items: center; flex-wrap: wrap; gap: 10px; + padding: 0 5px; } #right-nav-panel-tabs .right_menu_button, @@ -1147,6 +1147,7 @@ input[type="file"] { text-align: left; white-space: nowrap; margin: 0; + font-size: calc(var(--mainFontSize) * 1.25); } .selected-right-tab { @@ -1863,7 +1864,7 @@ grammarly-extension { font-weight: bold; padding: 5px; margin: 0; - height: 35px; + height: 32px; filter: grayscale(0.5); text-align: center; font-size: 20px; @@ -2141,22 +2142,6 @@ grammarly-extension { display: inline; } -#world_cross { - position: absolute; - right: 15px; - top: 15px; - width: 20px; - height: 20px; - cursor: pointer; - opacity: 0.6; -} - -#world_logo { - width: 35px; - height: 35px; - margin-right: 0.5rem; -} - #world_popup h5 { color: var(--grey70); } @@ -2225,13 +2210,6 @@ input[type='checkbox']:not(#nav-toggle):not(#rm_button_panel_pin):not(#lm_button transform: scale(1); } -.option_select_right_menu { - width: 284px; - margin-bottom: 35px; - color: var(--white70a); - background-color: var(--black30a); -} - #user_avatar_block { display: flex; grid-gap: 10px; @@ -2401,7 +2379,7 @@ input[type="range"]::-webkit-slider-thumb { #char-management-dropdown, #tagInput { - height: 35px; + height: 32px; margin-bottom: 0; } @@ -2796,12 +2774,6 @@ h5 { filter: drop-shadow(0 0 2px red); } -#advanced_book_logo { - width: 35px; - height: 35px; - display: inline-block; -} - #export_character_div { display: grid; grid-template-columns: 340px auto; @@ -4802,4 +4774,4 @@ body.waifuMode #avatar_zoom_popup { #horde_model { height: unset; } -} \ No newline at end of file +}