mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Merge branch 'dev' of https://github.com/SillyLossy/TavernAI into dev
This commit is contained in:
@@ -848,10 +848,12 @@
|
||||
<div class=mes_text></div>
|
||||
</div>
|
||||
<div class="mes_bias">${bias}</div>
|
||||
<div class="swipe_right"> <img src="img/swipe_right.png"></div>
|
||||
<div class="swipe_right">
|
||||
<img src="img/swipe_right.png">
|
||||
<div class="swipes-counter"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="group_avatars_template">
|
||||
<div class="avatar avatar_collage collage_1">
|
||||
|
@@ -2687,6 +2687,7 @@ function showSwipeButtons() {
|
||||
) { return; }
|
||||
const currentMessage = $("#chat").children().filter(`[mesid="${count_view_mes - 1}"]`);
|
||||
const swipeId = chat[chat.length - 1].swipe_id;
|
||||
var swipesCounterHTML = (`${(swipeId + 1)}/${(chat[chat.length - 1].swipes.length)}`);
|
||||
|
||||
if (swipeId !== undefined && swipeId != 0) {
|
||||
currentMessage.children('.swipe_left').css('display', 'flex');
|
||||
@@ -2710,8 +2711,6 @@ function showSwipeButtons() {
|
||||
console.log('highlighting R swipe');
|
||||
currentMessage.children('.swipe_right').css('opacity', '0.7');
|
||||
}
|
||||
|
||||
var swipesCounterHTML = (`${(swipeId + 1)}/${(chat[chat.length - 1].swipes.length)}`);
|
||||
console.log(swipesCounterHTML);
|
||||
|
||||
$(".swipes-counter").html(swipesCounterHTML);
|
||||
|
@@ -181,7 +181,7 @@ code {
|
||||
padding-bottom: 0;
|
||||
overflow-y: scroll;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
|
||||
margin-top: 40px;
|
||||
bottom: 10px;
|
||||
border-bottom: 1px solid var(--black30a);
|
||||
@@ -193,7 +193,7 @@ code {
|
||||
text-shadow: #000 0 0 3px;
|
||||
scrollbar-width: thin;
|
||||
transition: all 1s ease-in-out;
|
||||
align-content: end;
|
||||
flex-direction: column;
|
||||
|
||||
/*old style top to bottom flow*/
|
||||
/* overflow-x: hidden;
|
||||
@@ -375,7 +375,6 @@ code {
|
||||
margin-top: 0;
|
||||
width: 100%;
|
||||
color: var(--ivory, white);
|
||||
align-self: flex-end;
|
||||
|
||||
/* display: grid;
|
||||
grid-template-columns: min-content min-content auto min-content min-content;
|
||||
|
Reference in New Issue
Block a user