Merge branch 'threecolumn' into shigusegubu-vue3

* threecolumn:
  fix dropzone
  cleanup
This commit is contained in:
Henry Jameson 2022-04-11 00:20:41 +03:00
commit d9d84b40d9
2 changed files with 15 additions and 9 deletions

View file

@ -7,6 +7,7 @@
html { html {
font-size: 14px; font-size: 14px;
// overflow-x: clip causes my browser's tab to crash with SIGILL lul
} }
body { body {
@ -25,9 +26,12 @@ body {
} }
} }
// Apply Custom scrollbars
@media (any-pointer: fine) { @media (any-pointer: fine) {
// Body should have background to scrollbar otherwise it will use white (body color?)
body { body {
background: var(--bg); background: var(--bg);
scrollbar-color: var(--btn) var(--bg);
} }
* { * {
@ -44,6 +48,9 @@ body {
border-radius: var(--btnRadius); border-radius: var(--btnRadius);
} }
// horizontal/vertical/increment/decrement are webkit-specific stuff
// that indicates whether we're affecting vertical scrollbar, increase button etc
// stylelint-disable selector-pseudo-class-no-unknown
&::-webkit-scrollbar-button { &::-webkit-scrollbar-button {
--___bgPadding: 2px; --___bgPadding: 2px;
@ -86,6 +93,7 @@ body {
} }
} }
} }
// stylelint-enable selector-pseudo-class-no-unknown
} }
} }
@ -99,6 +107,12 @@ h4 {
margin: 0; margin: 0;
} }
i[class*=icon-],
.svg-inline--fa {
color: $fallback--icon;
color: var(--icon, $fallback--icon);
}
nav { nav {
z-index: 1000; z-index: 1000;
color: var(--topBarText); color: var(--topBarText);
@ -490,7 +504,6 @@ textarea,
box-sizing: border-box; box-sizing: border-box;
color: transparent; color: transparent;
overflow: hidden; overflow: hidden;
box-sizing: border-box;
} }
} }
@ -531,7 +544,6 @@ textarea,
box-sizing: border-box; box-sizing: border-box;
color: transparent; color: transparent;
overflow: hidden; overflow: hidden;
box-sizing: border-box;
} }
} }
@ -557,12 +569,6 @@ option {
} }
} }
i[class*=icon-],
.svg-inline--fa {
color: $fallback--icon;
color: var(--icon, $fallback--icon);
}
.btn-block { .btn-block {
display: block; display: block;
width: 100%; width: 100%;

View file

@ -572,7 +572,7 @@
.drop-indicator { .drop-indicator {
position: absolute; position: absolute;
z-index: 1; z-index: 100;
width: 100%; width: 100%;
height: 100%; height: 100%;
font-size: 5em; font-size: 5em;