Merge branch 'dev-settings-on-top' into dev

This commit is contained in:
SillyLossy
2023-03-21 12:53:47 +02:00
79 changed files with 535 additions and 473 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 162 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 226 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 161 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 240 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 374 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 451 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 187 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 181 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 422 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 366 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 330 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 98 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 198 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 142 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 217 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 350 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 279 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 252 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 247 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 391 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 207 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 276 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 346 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 226 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 130 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 122 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 428 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 244 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 194 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 135 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 402 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 328 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 193 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 205 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 269 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 296 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 584 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 358 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 314 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 256 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 145 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 243 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 295 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 219 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 331 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 174 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 79 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 463 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 549 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 252 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 495 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 491 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 558 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 354 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 432 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 676 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 182 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 86 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 233 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 140 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 227 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 592 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 148 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 250 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 324 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 735 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 176 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 166 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 208 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 328 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 621 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 394 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 454 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 414 KiB

File diff suppressed because it is too large Load Diff

View File

@ -18,6 +18,8 @@
--grey50: rgb(125, 125, 125);
--grey70: rgb(175, 175, 175);
--grey30a: rgba(50,50,50,0.3); // dark grey transparent for #chat and #send_form so their borders stand out on dark BGs
--fullred: rgba(255, 0, 0, 1);
--crimson70a: rgba(100, 0, 0, 0.7);
--cobalt30a: rgba(100, 100, 255, 0.3);
@ -133,7 +135,7 @@ code {
position: absolute;
width: 100%;
height: 100%;
z-index: -2;
z-index: 0;
}
#bg2 {
@ -146,7 +148,7 @@ code {
position: absolute;
width: 100%;
height: 100%;
z-index: -1;
z-index: 1;
}
/*TOPPER margin*/
@ -172,13 +174,14 @@ code {
display: grid;
grid-template-rows: auto min-content;
height: calc(100svh - 40px);
/*overflow: auto;*/
overflow-x: hidden;
/*overflow-y: hidden;*/
max-width: 800px;
margin-left: auto;
margin-right: auto;
position: absolute;
left: 0;
right: 0;
top: 35px;
margin: 0 auto;
z-index: 2;
}
@ -189,16 +192,17 @@ margin-top:5px;
overflow-y: scroll;
display: flex;
bottom: 10px;
border-bottom: 1px solid var(--black30a);
border-left: 1px solid var(--black30a);
border-right: 1px solid var(--black30a);
border-bottom: 1px solid var(--grey50a);
border-left: 1px solid var(--grey50a);
border-right: 1px solid var(--grey50a);
backdrop-filter: blur(20px);
background-color: var(--black70a);
-webkit-backdrop-filter: blur(20px);
-webkit-backdrop-filter: blur(10px);
text-shadow: #000 0 0 3px;
scrollbar-width: thin;
transition: all 1s ease-in-out;
flex-direction: column;
z-index: 3;
/*old style top to bottom flow*/
/* overflow-x: hidden;
@ -228,7 +232,7 @@ margin-top:5px;
grid-template-columns: 40px auto 40px;
width: 100%;
margin: 0 auto 0 auto;
border: 1px solid var(--black30a);
border: 1px solid var(--grey50a);
border-radius: 0 0 20px 20px;
background-color: var(--crimson70a);
@ -690,6 +694,7 @@ input[type=submit] {}
#rm_print_characters_block {
padding: 15px 0;
overflow-y: auto;
flex-grow: 1;
}
#rm_ch_create_block {
@ -1884,6 +1889,7 @@ input[type="range"]{
margin-right: auto;
left: 0;
right: 0;
top: 40px;
box-shadow: 0 0 20px var(--black70a);
padding-left: 30px;
padding-right: 30px;
@ -2688,8 +2694,7 @@ label[for="extensions_autoconnect"] {
padding-top: 5px;
/* right: auto; */
height: 35px;
min-width: 20vw;
max-width: 700px;
width: 800px;
color: white;
justify-content: space-around;
display: grid;
@ -2809,16 +2814,20 @@ label[for="extensions_autoconnect"] {
}
#top-settings-holder{
max-width:70vw;
width:70vw;
position: fixed;
right: 0;
left: 0;
}
#bg1, #bg2 {position:fixed;}
#sheld, #character_popup, #world_popup, #right-nav-panel { /*margin around the sides, and a larger one on bottom to avoid iOS Home bar*/
height: calc(100svh - 55px);
height: calc(100svh - 15px);
width: calc(100vw - 10px);
margin: 0 auto;
margin-left: 5px;
position: fixed;
}
.mes-text {padding-right: 25px;}

View File

@ -968,9 +968,11 @@ function getCharacterFile(directories, response, i) { //old need del
}
}
function getImages(path) {
return fs.readdirSync(path).sort(function (a, b) {
return new Date(fs.statSync(path + '/' + a).mtime) - new Date(fs.statSync(path + '/' + b).mtime);
}).reverse();
return fs.readdirSync(path).sort(Intl.Collator().compare);
/* return fs.readdirSync(path).sort(function (a, b) {
return new Date(fs.statSync(path + '/' + a).mtime) - new Date(fs.statSync(path + '/' + b).mtime);
}).reverse(); */
}
function getKoboldSettingFiles(path) {
return fs.readdirSync(path).sort(function (a, b) {