rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-03-03 03:17:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging

Browse Source
This commit is contained in:
Cohee 2023-08-24 20:20:03 +03:00
commit 14d94d9108
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/index.html
View File

@ -2592,7 +2592,7 @@
</div> </div>
<div class="range-block-range-and-counter"> <div class="range-block-range-and-counter">
<div class="range-block-range"> <div class="range-block-range">
<input type="range" id="font_scale" name="font_scale" min="0.8" max="1.2" step="0.05"> <input type="range" id="font_scale" name="font_scale" min="0.75" max="1.25" step="0.01">
</div> </div>
<div class="range-block-counter"> <div class="range-block-counter">
<div contenteditable="true" data-for="font_scale" id="font_scale_counter"> <div contenteditable="true" data-for="font_scale" id="font_scale_counter">

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

@ -843,7 +843,7 @@ jQuery(async function () {
//this makes the chat input text area resize vertically to match the text size (limited by CSS at 50% window height) //this makes the chat input text area resize vertically to match the text size (limited by CSS at 50% window height)
$('#send_textarea').on('input', function () { $('#send_textarea').on('input', function () {
this.style.height = '30px'; this.style.height = window.getComputedStyle(this).getPropertyValue('min-height');
this.style.height = (this.scrollHeight) + 'px'; this.style.height = (this.scrollHeight) + 'px';
}); });

22
public/style.css
View File

@ -67,6 +67,10 @@
color-scheme: only light; color-scheme: only light;
/* Send form variables */
--bottomFormBlockPadding: calc(var(--mainFontSize) / 3);
--bottomFormIconSize: calc(var(--mainFontSize) * 2);
--bottomFormBlockSize: calc(var(--bottomFormIconSize) + var(--bottomFormBlockPadding));
/*styles for the color picker*/ /*styles for the color picker*/
--tool-cool-color-picker-btn-bg: transparent; --tool-cool-color-picker-btn-bg: transparent;
@ -513,19 +517,19 @@ hr {
#send_but_sheld { #send_but_sheld {
padding: 0; padding: 0;
border: 0; border: 0;
height: 30px; height: var(--bottomFormBlockSize);
position: relative; position: relative;
background-position: center; background-position: center;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
column-gap: 5px; column-gap: 5px;
font-size: 25px; font-size: var(--bottomFormIconSize);
overflow: hidden; overflow: hidden;
} }
#send_but_sheld>div { #send_but_sheld>div {
width: 30px; width: var(--bottomFormBlockSize);
height: 30px; height: var(--bottomFormBlockSize);
margin: 0; margin: 0;
outline: none; outline: none;
border: none; border: none;
@ -556,8 +560,9 @@ hr {
} }
#options_button { #options_button {
width: 30px; width: var(--bottomFormBlockSize);
height: 30px; height: var(--bottomFormBlockSize);
font-size: var(--bottomFormIconSize);
margin: 0; margin: 0;
outline: none; outline: none;
border: none; border: none;
@ -568,7 +573,6 @@ hr {
margin-left: 10px; margin-left: 10px;
padding: 0; padding: 0;
transition: 0.3s; transition: 0.3s;
font-size: 25px;
display: flex; display: flex;
align-items: center; align-items: center;
} }
@ -879,11 +883,11 @@ select {
} }
#send_textarea { #send_textarea {
min-height: 30px; min-height: var(--bottomFormBlockSize);
height: var(--bottomFormBlockSize);
max-height: 50vh; max-height: 50vh;
max-height: 50svh; max-height: 50svh;
word-wrap: break-word; word-wrap: break-word;
height: 30px;
resize: vertical; resize: vertical;
display: block; display: block;
background-color: rgba(255, 0, 0, 0); background-color: rgba(255, 0, 0, 0);