rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/SillyLossy/TavernAI into dev

Browse Source
This commit is contained in:
RossAscends
2023-04-14 04:55:36 +09:00
parent 747e9d9990 e5c4aa1a1c
commit 54de50d1f0
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/index.html
View File

@@ -1753,28 +1753,28 @@
<div id="options" class="font-family-reset"> <div id="options" class="font-family-reset">
<div class="options-content"> <div class="options-content">
<a id="option_back_to_main"> <a id="option_back_to_main">
<div class="fa-solid fa-left-long "></div> <div class="fa-lg fa-solid fa-left-long"></div>
<span>Back to main chat</span> <span>Back to main chat</span>
</a> </a>
<a id="option_new_bookmark"> <a id="option_new_bookmark">
<div class="fa-solid fa-bookmark "></div> <div class="fa-lg fa-solid fa-bookmark"></div>
<span>Save bookmark</span> <span>Save bookmark</span>
</a> </a>
<a id="option_start_new_chat"> <a id="option_start_new_chat">
<div class="fa-solid fa-comment-dots "></div> <div class="fa-lg fa-solid fa-comment-dots"></div>
<span>Start new chat</span> <span>Start new chat</span>
</a> </a>
<a id="option_select_chat"> <a id="option_select_chat">
<div class="fa-solid fa-address-book "></div> <div class="fa-lg fa-solid fa-address-book"></div>
<span>View past chats</span> <span>View past chats</span>
</a> </a>
<hr> <hr>
<a id="option_delete_mes"> <a id="option_delete_mes">
<div class="fa-solid fa-trash-can "></div> <div class="fa-lg fa-solid fa-trash-can"></div>
<span>Delete messages</span> <span>Delete messages</span>
</a> </a>
<a id="option_regenerate"> <a id="option_regenerate">
<div class="fa-solid fa-repeat "></div> <div class="fa-lg fa-solid fa-repeat "></div>
<span>Regenerate</span> <span>Regenerate</span>
</a> </a>
</div> </div>
@@ -1783,7 +1783,7 @@
<textarea id="send_textarea" placeholder="Not connected to API!" name="text"></textarea> <textarea id="send_textarea" placeholder="Not connected to API!" name="text"></textarea>
<div id="send_but_sheld"> <div id="send_but_sheld">
<div id="loading_mes"> <div id="loading_mes">
<div alt="" class="fa-solid fa-spin fa-hourglass-half "></div> <div alt="" class="fa-solid fa-fade fa-hourglass-half"></div>
</div> </div>
<div id="send_but" class="fa-solid fa-feather-pointed"></div> <div id="send_but" class="fa-solid fa-feather-pointed"></div>
</div> </div>

2
public/scripts/RossAscends-mods.js
View File

@@ -220,7 +220,7 @@ function RA_checkOnlineStatus() {
RA_AC_retries = 1; RA_AC_retries = 1;
if (!is_send_press && !(selected_group && is_group_generating)) { if (!is_send_press && !(selected_group && is_group_generating)) {
$("#send_but").css("display", "inline"); //on connect, send button shows $("#send_but").css("display", "flex"); //on connect, send button shows
} }
} }
} }

4
public/scripts/extensions/caption/index.js
View File

@@ -17,7 +17,7 @@ async function setImageIcon() {
try { try {
const sendButton = document.getElementById('send_picture'); const sendButton = document.getElementById('send_picture');
sendButton.classList.add('fa-image'); sendButton.classList.add('fa-image');
sendButton.classList.remove('fa-hourglass-half', 'fa-spin'); sendButton.classList.remove('fa-hourglass-half', 'fa-fade');
} }
catch (error) { catch (error) {
console.log(error); console.log(error);
@@ -28,7 +28,7 @@ async function setSpinnerIcon() {
try { try {
const sendButton = document.getElementById('send_picture'); const sendButton = document.getElementById('send_picture');
sendButton.classList.remove('fa-image'); sendButton.classList.remove('fa-image');
sendButton.classList.add('fa-hourglass-half', 'fa-spin'); sendButton.classList.add('fa-hourglass-half', 'fa-fade');
} }
catch (error) { catch (error) {
console.log(error); console.log(error);

5
public/style.css
View File

@@ -278,7 +278,6 @@ code {
transition: 0.3s; transition: 0.3s;
filter: brightness(0.7); filter: brightness(0.7);
order: 99999; order: 99999;
display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
@@ -359,7 +358,9 @@ code {
color: var(--ivory, white); color: var(--ivory, white);
padding: 12px 16px; padding: 12px 16px;
text-decoration: none; text-decoration: none;
display: block; display: flex;
align-items: center;
column-gap: 10px;
} }
.options-content img { .options-content img {