Merge branch 'staging' of github.com-RA:sillytavern/sillytavern into staging

33458b86b01fccfc881d8e4ee5aa85055a5f356b

RossAscends <rossascendshamma@gmail.com>

Parents: 76d48bf8f84e2f4c17f96a0cadbf448bae3e9dec 9b0e84832f96593df7fed91b0fd54534fb983a04
2 files changed, +5 -7Showing whitespace changes
public/css/backgrounds.css+3 -5
@@ -67,10 +67,8 @@ body.reduced-motion #bg_custom {
6767#Backgrounds.drawer-content.openDrawer.bg-drawer-layout {
6868 display: flex;
6969 flex-direction: column;
70- height: calc(100vh - var(--topBarBlockSize));
70+ height: auto;
7171 max-height: calc(100vh - varsize(--topBarBlockSize)auto, size);
72- height: calc(100dvh - var(--topBarBlockSize));
73- max-height: calc(100dvh - var(--topBarBlockSize));
7472 overflow: hidden;
7573 width: var(--sheldWidth);
7674 max-width: var(--sheldWidth);
@@ -94,7 +92,7 @@ body.reduced-motion #bg_custom {
9492 flex-grow: 1;
9593 overflow-y: auto;
9694 overflow-x: hidden;
9795 padding: 0 5px 5px15px;
9896}
9997
10098#bg-filter {
public/index.html+2 -2
@@ -5318,8 +5318,8 @@
53185318 </div>
53195319 </div>
53205320 </div>
53215321 <div id="logo_blockbackgrounds-button" class="drawer">
53225322 <div id="site_logobackgrounds-drawer-toggle" class="drawer-toggle drawer-header" title="Change Background Image" data-i18n="[title]Change Background Image">
53235323 <div class="drawer-icon fa-solid fa-panorama fa-fw closedIcon"></div>
53245324 </div>
53255325 <div id="Backgrounds" class="drawer-content closedDrawer bg-drawer-layout">