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:
SillyLossy
2023-03-18 15:31:50 +02:00
parent ca1bed3b47 c2006a60ea
commit 6bbee41565
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/index.html
View File

@@ -848,8 +848,10 @@
<div class=mes_text></div> <div class=mes_text></div>
</div> </div>
<div class="mes_bias">${bias}</div> <div class="mes_bias">${bias}</div>
<div class="swipe_right"> <img src="img/swipe_right.png"></div> <div class="swipe_right">
<div class="swipes-counter"></div> <img src="img/swipe_right.png">
<div class="swipes-counter"></div>
</div>
</div> </div>
</div> </div>

3
public/script.js
View File

@@ -2687,6 +2687,7 @@ function showSwipeButtons() {
) { return; } ) { return; }
const currentMessage = $("#chat").children().filter(`[mesid="${count_view_mes - 1}"]`); const currentMessage = $("#chat").children().filter(`[mesid="${count_view_mes - 1}"]`);
const swipeId = chat[chat.length - 1].swipe_id; const swipeId = chat[chat.length - 1].swipe_id;
var swipesCounterHTML = (`${(swipeId + 1)}/${(chat[chat.length - 1].swipes.length)}`);
if (swipeId !== undefined && swipeId != 0) { if (swipeId !== undefined && swipeId != 0) {
currentMessage.children('.swipe_left').css('display', 'flex'); currentMessage.children('.swipe_left').css('display', 'flex');
@@ -2710,8 +2711,6 @@ function showSwipeButtons() {
console.log('highlighting R swipe'); console.log('highlighting R swipe');
currentMessage.children('.swipe_right').css('opacity', '0.7'); currentMessage.children('.swipe_right').css('opacity', '0.7');
} }
var swipesCounterHTML = (`${(swipeId + 1)}/${(chat[chat.length - 1].swipes.length)}`);
console.log(swipesCounterHTML); console.log(swipesCounterHTML);
$(".swipes-counter").html(swipesCounterHTML); $(".swipes-counter").html(swipesCounterHTML);

5
public/style.css
View File

@@ -181,7 +181,7 @@ code {
padding-bottom: 0; padding-bottom: 0;
overflow-y: scroll; overflow-y: scroll;
display: flex; display: flex;
flex-wrap: wrap;
margin-top: 40px; margin-top: 40px;
bottom: 10px; bottom: 10px;
border-bottom: 1px solid var(--black30a); border-bottom: 1px solid var(--black30a);
@@ -193,7 +193,7 @@ code {
text-shadow: #000 0 0 3px; text-shadow: #000 0 0 3px;
scrollbar-width: thin; scrollbar-width: thin;
transition: all 1s ease-in-out; transition: all 1s ease-in-out;
align-content: end; flex-direction: column;
/*old style top to bottom flow*/ /*old style top to bottom flow*/
/* overflow-x: hidden; /* overflow-x: hidden;
@@ -375,7 +375,6 @@ code {
margin-top: 0; margin-top: 0;
width: 100%; width: 100%;
color: var(--ivory, white); color: var(--ivory, white);
align-self: flex-end;
/* display: grid; /* display: grid;
grid-template-columns: min-content min-content auto min-content min-content; grid-template-columns: min-content min-content auto min-content min-content;