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 pull request #36 from 10sa/patch-1

Browse Source 
Fix Invalid CSS styles and comments
This commit is contained in:
Borov666
2023-02-08 21:50:21 +04:00
committed by GitHub
parent d23f6e541d e859011a98
commit 1f28dc26fb
3 changed files with 92 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/css/style.css
View File

@ -20,7 +20,7 @@ body {
body { body {
color: rgb(229, 224, 216); color: rgb(229, 224, 216);
font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
//font: 1em 'Open Sans', sans-serif; /* font: 1em 'Open Sans', sans-serif; */
background-color: #f1f1f1; background-color: #f1f1f1;
} }

13
public/index.html
View File

@ -32,7 +32,16 @@
var default_user_name = "You"; var default_user_name = "You";
var name1 = default_user_name; var name1 = default_user_name;
var name2 = "Chloe"; var name2 = "Chloe";
var chat = [{name: 'Chloe', is_user:false,is_name:true, create_date:0, mes:'\n*You went inside. The air smelled of fried meat, tobacco and a hint of wine. A dim light was cast by candles, and a fire crackled in the fireplace. It seems to be a very pleasant place. Behind the wooden bar is an elf waitress, she is smiling. Her ears are very pointy, and there is a twinkle in her eye. She wears glasses and a white apron. As soon as she noticed you, she immediately came right up close to you.*\n\n Hello there! How is your evening going?\n<img src="img/star_dust_city.png" width=80% style="opacity:0.3; disolay:block;border-radius:5px;margin-top:25px;margin-bottom:23px; margin-left: 45px;margin-right: auto;">\n<a id="verson" style="color:rgb(229, 224, 216,0.8);" href="https://github.com/TavernAI/TavernAI" target="_blank">@@@TavernAI v'+VERSION+'@@@</a><div id="characloud_url" style="margin-right:10px;margin-top:0px;float:right; height:25px;cursor: pointer;opacity: 0.99;display:inline-block;"><img src="img/cloud_logo.png" style="width: 25px;height: auto;display:inline-block; opacity:0.7;"><div style="vertical-align: top;display:inline-block;">Cloud</div></div><br><br><br><br>'}];//<div id="donation" style="margin-right:10px;margin-top:0px;float:right; height:25px;cursor: pointer;opacity: 0.99;display:inline-block;"><img src="img/coins.png" style="width: 25px;height: 25px;display:inline-block;"><div style="vertical-align: top;display:inline-block;">Give a Tip</div></div><br><br><br><br>'}]; var chat = [{
name: 'Chloe',
is_user: false,
is_name: true,
create_date: 0,
mes: '\n*You went inside. The air smelled of fried meat, tobacco and a hint of wine. A dim light was cast by candles, and a fire crackled in the fireplace. It seems to be a very pleasant place. Behind the wooden bar is an elf waitress, she is smiling. Her ears are very pointy, and there is a twinkle in her eye. She wears glasses and a white apron. As soon as she noticed you, she immediately came right up close to you.*\n\n' +
' Hello there! How is your evening going?\n' +
'<img src="img/star_dust_city.png" width=80% style="opacity:0.3; disolay:block;border-radius:5px;margin-top:25px;margin-bottom:23px; margin-left: 45px;margin-right: auto;">\n<a id="verson" style="color:rgb(229, 224, 216,0.8);" href="https://github.com/TavernAI/TavernAI" target="_blank">@@@TavernAI v'+VERSION+'@@@</a><div id="characloud_url" style="margin-right:10px;margin-top:0px;float:right; height:25px;cursor: pointer;opacity: 0.99;display:inline-block;"><img src="img/cloud_logo.png" style="width: 25px;height: auto;display:inline-block; opacity:0.7;"><div style="vertical-align: top;display:inline-block;">Cloud</div></div><br><br><br><br>'
}];
var chat_create_date = 0; var chat_create_date = 0;
var default_ch_mes = "Hello"; var default_ch_mes = "Hello";
var count_view_mes = 0; var count_view_mes = 0;
@ -3063,4 +3072,4 @@
</body> </body>
</html> </html>

167
public/style.css
View File

@ -85,27 +85,27 @@ code {
max-width:800px; max-width:800px;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
//border-right: 0.1px solid gray; /* border-right: 0.1px solid gray; */
//border-left: 0.1px solid gray; /* border-left: 0.1px solid gray; */
//box-shadow: 0 0 2px rgba(200,200,200,0.1); /* box-shadow: 0 0 2px rgba(200,200,200,0.1); */
} }
#chat { #chat {
scrollbar-width: thin; scrollbar-width: thin;
//width: 900px; /* width: 900px; */
//height: 80%; /* height: 80%; */
overflow: hidden; overflow: hidden;
overflow-y: scroll; overflow-y: scroll;
background: #191b3100; background: #191b3100;
//white-space:nowrap; /* white-space:nowrap; */
//margin-left: 30%; /* Отступ слева */ /* margin-left: 30%; /* Отступ слева */ */
//width: 40%; /* Ширина слоя */ /* width: 40%; /* Ширина слоя */ */
//padding: 10px; /* Поля вокруг текста */ /* padding: 10px; /* Поля вокруг текста */ */
} }
::-webkit-scrollbar { ::-webkit-scrollbar {
width: .60em; width: .60em;
//background-color: blue; /* background-color: blue; */
} }
::-webkit-scrollbar-track { ::-webkit-scrollbar-track {
@ -118,28 +118,28 @@ code {
box-shadow: inset 0.05em 0.05em 0 rgba(0, 0, 0, 0.1), inset 0 -0.05em 0 rgba(0, 0, 0, 0.07); box-shadow: inset 0.05em 0.05em 0 rgba(0, 0, 0, 0.1), inset 0 -0.05em 0 rgba(0, 0, 0, 0.07);
} }
#form_sheld { #form_sheld {
//box-shadow: 0 0 2px rgba(200,200,200,0.5); /* box-shadow: 0 0 2px rgba(200,200,200,0.5); */
box-shadow: 0 0 2px rgba(200,200,200,0.1); box-shadow: 0 0 2px rgba(200,200,200,0.1);
white-space:nowrap; white-space:nowrap;
background: #191b31A0; background: #191b31A0;
//height: 10%; /* height: 10%; */
//margin-left: 30%; /* Отступ слева */ /* margin-left: 30%; /* Отступ слева */ */
//width: 95%; /* Ширина слоя */ /* width: 95%; /* Ширина слоя */ */
//padding: 10px; /* Поля вокруг текста */ /* padding: 10px; /* Поля вокруг текста */ */
//background: red; /* background: red; */
//margin-left: auto; /* margin-left: auto; */
//margin-right: auto; /* margin-right: auto; */
} }
#send_form { #send_form {
display: grid; display: grid;
grid-template-columns: 35px auto 60px; grid-template-columns: 35px auto 60px;
//background: green; /* background: green; */
width: 100%; width: 100%;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
} }
#send_textarea{ #send_textarea{
//width:100%; /* width:100%; */
font-size: 11pt; font-size: 11pt;
height: 89px; height: 89px;
resize: none; resize: none;
@ -156,14 +156,14 @@ code {
margin-top: 10px; margin-top: 10px;
} }
#send_but_sheld{ #send_but_sheld{
//display:inline-block; /* display:inline-block; */
//height: 100%; /* height: 100%; */
//margin-left: 17px; /* margin-left: 17px; */
//background: blue; /* background: blue; */
} }
#send_but{ #send_but{
//visibility: visible; /* visibility: visible; */
width: 100%; width: 100%;
margin: 0 auto; margin: 0 auto;
margin-left: 4px; margin-left: 4px;
@ -182,7 +182,7 @@ code {
height: 100%; height: 100%;
margin: 0 auto; margin: 0 auto;
margin-left: 2px; margin-left: 2px;
//visibility: collapse; /* visibility: collapse; */
background: url('img/load.svg') no-repeat top left; background: url('img/load.svg') no-repeat top left;
background-size: 45px 45px; background-size: 45px 45px;
background-position: center center; background-position: center center;
@ -190,7 +190,7 @@ code {
#options_button{ #options_button{
margin-top: 0px; margin-top: 0px;
cursor: pointer; cursor: pointer;
//opacity: 0.5; /* opacity: 0.5; */
position: block; position: block;
width:40px; width:40px;
height: 40px; height: 40px;
@ -198,7 +198,7 @@ code {
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
//background-size: 20px; /* background-size: 20px; */
} }
#options{ #options{
@ -209,7 +209,7 @@ code {
height: 100px; height: 100px;
bottom: 196px; bottom: 196px;
position: relative; position: relative;
//background-color: blue; /* background-color: blue; */
z-index:1990; z-index:1990;
} }
@ -220,7 +220,7 @@ code {
background-color: #191b31F3; background-color: #191b31F3;
min-width: 205px; min-width: 205px;
z-index: 1; z-index: 1;
//bottom: 1px; /* bottom: 1px; */
} }
/* Ссылки внутри выпадающего блока */ /* Ссылки внутри выпадающего блока */
@ -254,24 +254,24 @@ code {
box-shadow: 0 0 2px rgba(200,200,200,0.1); box-shadow: 0 0 2px rgba(200,200,200,0.1);
padding: 4px; padding: 4px;
background: #191b31CC; background: #191b31CC;
//box-shadow: 0 0 2px rgba(200,200,200,0.5); /* box-shadow: 0 0 2px rgba(200,200,200,0.5); */
//display: inline-block; /* display: inline-block; */
vertical-align: top; vertical-align: top;
width: 100%; width: 100%;
//height:60px; /* height:60px; */
//background: red; /* background: red; */
//font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif; /* font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif; */
font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
color: rgb(229, 224, 216); color: rgb(229, 224, 216);
font-size: 18px; font-size: 18px;
//background: blue; /* background: blue; */
margin-bottom: 26px; margin-bottom: 26px;
} }
.avatar { .avatar {
//box-shadow: 0 0 2px rgba(200,200,200,0.5); /* box-shadow: 0 0 2px rgba(200,200,200,0.5); */
//background: #13152c; /* background: #13152c; */
width: 67px; width: 67px;
height: 103px; height: 103px;
border-style: none; border-style: none;
@ -292,11 +292,11 @@ code {
padding-left: 35px; padding-left: 35px;
} }
.ch_name{ .ch_name{
//background: green; /* background: green; */
font-weight:bolder; font-weight:bolder;
} }
.mes_text{ .mes_text{
//background: olive; /* background: olive; */
font-weight:lighter; font-weight:lighter;
padding-top: 3px; padding-top: 3px;
@ -321,7 +321,7 @@ code {
} }
} }
.mes_text i{ .mes_text i{
//color: rgb(229, 224, 216, 0.5); /* color: rgb(229, 224, 216, 0.5); */
} }
br { br {
display: block; display: block;
@ -370,7 +370,7 @@ textarea{
border:0px solid grey; border:0px solid grey;
box-shadow: 0 0 2px rgba(200,200,200,0.5); box-shadow: 0 0 2px rgba(200,200,200,0.5);
background-color: #13152c; background-color: #13152c;
//padding: 10px; /* padding: 10px; */
margin-left: 10px; margin-left: 10px;
@ -385,7 +385,7 @@ textarea{
.right_menu{ .right_menu{
//padding: 15px 20px; /* padding: 15px 20px; */
max-height: 86%; max-height: 86%;
overflow: hidden; overflow: hidden;
overflow-y: auto; overflow-y: auto;
@ -443,7 +443,7 @@ input[type=button] {
} }
.right_menu_button{ .right_menu_button{
display:inline-block; display:inline-block;
//box-shadow: 0 0 5px -1px rgba(0,0,0,0.2); /* box-shadow: 0 0 5px -1px rgba(0,0,0,0.2); */
cursor:pointer; cursor:pointer;
vertical-align:middle; vertical-align:middle;
text-align: center; text-align: center;
@ -456,8 +456,8 @@ input[type=button] {
#character_import_button{ #character_import_button{
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
margin-left: 15px;//274px; margin-left: 15px;/* 274px; */
margin-top: 6px;//10px; margin-top: 6px;/* 10px; */
} }
#character_import_button h2{ #character_import_button h2{
@ -478,7 +478,7 @@ input[type=button] {
#rm_api_block{ #rm_api_block{
display: none; display: none;
padding-bottom: 5px; padding-bottom: 5px;
//visibility: hidden; /* visibility: hidden; */
} }
#api_url_text{ #api_url_text{
margin-right: 4px; margin-right: 4px;
@ -505,7 +505,7 @@ input[type=button] {
} }
#rm_characters_block{ #rm_characters_block{
display: block; display: block;
//visibility: hidden; /* visibility: hidden; */
} }
.character_select{ .character_select{
padding: 0px; padding: 0px;
@ -565,10 +565,10 @@ input[type=button] {
#bg_menu_button{ #bg_menu_button{
display: inline-block; display: inline-block;
opacity: 0.4; opacity: 0.4;
//transition: 0.5s /* transition: 0.5s */
cursor: pointer; cursor: pointer;
width: 20px; width: 20px;
//background: #191b3188; /* background: #191b3188; */
text-align: center; text-align: center;
height: 20px; height: 20px;
color: #ffffff88; color: #ffffff88;
@ -583,10 +583,10 @@ input[type=button] {
margin-top: 0px; margin-top: 0px;
margin-left: 6px; margin-left: 6px;
opacity: 0.0; opacity: 0.0;
//padding-top: 10px; /* padding-top: 10px; */
cursor:auto; cursor:auto;
display: block; display: block;
width: 122px;//114px; width: 122px;/* 114px; */
height: 0px; height: 0px;
background: #191b3100; background: #191b3100;
overflow: hidden; overflow: hidden;
@ -605,8 +605,8 @@ input[type=button] {
box-shadow: inset 0.05em 0.05em 0 rgba(0, 0, 0, 0.1), inset 0 -0.05em 0 rgba(0, 0, 0, 0.07); box-shadow: inset 0.05em 0.05em 0 rgba(0, 0, 0, 0.1), inset 0 -0.05em 0 rgba(0, 0, 0, 0.07);
} }
.bg_example { .bg_example {
//box-shadow: 0 0 2px rgba(200,200,200,0.5); /* box-shadow: 0 0 2px rgba(200,200,200,0.5); */
//background: #13152c; /* background: #13152c; */
width: 103px; width: 103px;
height: 83px; height: 83px;
border-style: none; border-style: none;
@ -636,8 +636,8 @@ input[type=button] {
} }
.bg_example_but_load { .bg_example_but_load {
margin-left: 3px; margin-left: 3px;
//box-shadow: 0 0 2px rgba(200,200,200,0.5); /* box-shadow: 0 0 2px rgba(200,200,200,0.5); */
//background: #13152c; /* background: #13152c; */
width: 103px; width: 103px;
height: 83px; height: 83px;
border-style: none; border-style: none;
@ -723,13 +723,13 @@ input[type=button] {
margin-right: auto; margin-right: auto;
} }
#delete_button{ #delete_button{
opacity: 0.51;//0.5 opacity: 0.51;/* 0.5 */
cursor: pointer; cursor: pointer;
display: block; display: block;
float:right; float:right;
margin-top: 25px; margin-top: 25px;
margin-right: 10px; margin-right: 10px;
color: #ffffff68;//66 color: #ffffff68;/* 66 */
} }
#export_button{ #export_button{
opacity: 0.51; opacity: 0.51;
@ -773,7 +773,7 @@ input[type=button] {
} }
.input-file input[type=file] { .input-file input[type=file] {
//position: absolute; /* position: absolute; */
z-index: -1; z-index: -1;
opacity: 0; opacity: 0;
display: block; display: block;
@ -900,7 +900,7 @@ input[type=button] {
#online_status{ #online_status{
opacity: 0.3; opacity: 0.3;
position: absolute; position: absolute;
//left: 4px; /* left: 4px; */
bottom: 0px; bottom: 0px;
margin-left: 9px; margin-left: 9px;
margin-bottom: 15px; margin-bottom: 15px;
@ -954,7 +954,7 @@ input[type=button] {
display: none; display: none;
opacity: 0.5; opacity: 0.5;
accent-color: #ffffff; accent-color: #ffffff;
//background-color: green; /* background-color: green; */
width: 20px; width: 20px;
height: 20px; height: 20px;
} }
@ -965,8 +965,8 @@ input[type=button] {
display: block; display: block;
} }
select { select {
//font-size: .9rem; /* font-size: .9rem; */
//border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1); /* border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1); */
color: #ffffff66; color: #ffffff66;
padding: 5px 10px; padding: 5px 10px;
width:95%; width:95%;
@ -1051,7 +1051,7 @@ input[type="range"] {
height: 7px; height: 7px;
background: rgba(255, 255, 255, 0.6); background: rgba(255, 255, 255, 0.6);
border-radius: 15px; border-radius: 15px;
//background-image: linear-gradient(#ff4500, #ff4500); /* background-image: linear-gradient(#ff4500, #ff4500); */
background-size: 70% 100%; background-size: 70% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
@ -1102,7 +1102,7 @@ input[type="range"] {
.mes_edit{ .mes_edit{
display: inline-block; display: inline-block;
float:right; float:right;
//right:8px; /* right:8px; */
cursor:pointer; cursor:pointer;
margin-right: 4px; margin-right: 4px;
opacity:0.07; opacity:0.07;
@ -1122,7 +1122,7 @@ input[type="range"] {
.mes_edit_cancel{ .mes_edit_cancel{
display: none; display: none;
float:right; float:right;
//right:8px; /* right:8px; */
margin-right: 4px; margin-right: 4px;
cursor:pointer; cursor:pointer;
opacity:0.5; opacity:0.5;
@ -1142,7 +1142,7 @@ input[type="range"] {
} }
#your_name{ #your_name{
outline: none; outline: none;
//box-shadow: 0 2px 0px rgba(255, 255, 255, 0.1); /* box-shadow: 0 2px 0px rgba(255, 255, 255, 0.1); */
box-shadow: 0 0px 0px rgba(255, 255, 255, 0.0); box-shadow: 0 0px 0px rgba(255, 255, 255, 0.0);
border: none; border: none;
background: transparent; background: transparent;
@ -1226,7 +1226,7 @@ label.checkbox :checked + span:after {
margin-right: auto; margin-right: auto;
left: 0; left: 0;
right: 0; right: 0;
//text-align: center; /* text-align: center; */
margin-top: 0px; margin-top: 0px;
box-shadow: 0 0 2px rgba(200,200,200,0.1); box-shadow: 0 0 2px rgba(200,200,200,0.1);
padding: 4px; padding: 4px;
@ -1247,7 +1247,7 @@ label.checkbox :checked + span:after {
} }
#character_popup h3{ #character_popup h3{
//margin-top: 0px; /* margin-top: 0px; */
margin-bottom: 0px; margin-bottom: 0px;
margin-left: 0px; margin-left: 0px;
} }
@ -1274,7 +1274,7 @@ label.checkbox :checked + span:after {
} }
#personality_textarea{ #personality_textarea{
width: 92%; width: 92%;
//height: 65px; /* height: 65px; */
margin-top: 0px; margin-top: 0px;
margin-left: 0px; margin-left: 0px;
} }
@ -1298,23 +1298,16 @@ label.checkbox :checked + span:after {
} }
#character_popup_ok{ #character_popup_ok{
cursor: pointer; cursor: pointer;
display: none;//grid; display: none;/* grid; */
place-items: center; place-items: center;
height: 40px; height: 40px;
margin-top: 15px; margin-top: 15px;
margin-left: 36px;//36px;329px;/ margin-left: 36px;/* 36px;329px;/ */
//margin-right: auto; /* margin-right: auto; */
width: 110px;//80px width: 110px;/* 80px */
text-align: center; text-align: center;
} }
#shadow_select_chat_popup{ #shadow_select_chat_popup{
display: none; display: none;
opacity: 1.0; opacity: 1.0;
@ -1336,7 +1329,7 @@ label.checkbox :checked + span:after {
margin-right: auto; margin-right: auto;
left: 0; left: 0;
right: 0; right: 0;
//text-align: center; /* text-align: center; */
margin-top: 21vh; margin-top: 21vh;
box-shadow: 0 0 2px rgba(200,200,200,0.1); box-shadow: 0 0 2px rgba(200,200,200,0.1);
padding: 4px; padding: 4px;
@ -1372,8 +1365,8 @@ label.checkbox :checked + span:after {
margin-left: 5px; margin-left: 5px;
margin-top: 30px; margin-top: 30px;
scrollbar-width: thin; scrollbar-width: thin;
//width: 900px; /* width: 900px; */
//height: 80%; /* height: 80%; */
overflow: hidden; overflow: hidden;
overflow-y: scroll; overflow-y: scroll;
max-width:430px; max-width:430px;
@ -1400,7 +1393,7 @@ label.checkbox :checked + span:after {
background-color: #ffffff07; background-color: #ffffff07;
} }
.select_chat_block[highlight]{ .select_chat_block[highlight]{
background-color: #ffffff09;//#c2b07a12; background-color: #ffffff09;/* #c2b07a12; */
} }
.select_chat_block .avatar{ .select_chat_block .avatar{
@ -1419,7 +1412,7 @@ label.checkbox :checked + span:after {
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 28px; background-size: 28px;
background-position: 92px 5px; background-position: 92px 5px;
//background-image: url('img/book5.png'); /* background-image: url('img/book5.png'); */
width: 92%; width: 92%;
height: 40px; height: 40px;
margin-left: 10px; margin-left: 10px;
@ -1447,4 +1440,4 @@ label.checkbox :checked + span:after {
#export_character_div{ #export_character_div{
display: grid; display: grid;
grid-template-columns: 340px auto; grid-template-columns: 340px auto;
} }