master #50

Merged
schrumpel merged 101 commits from master into dev 2022-10-22 23:40:03 +00:00
2 changed files with 24 additions and 14 deletions
Showing only changes of commit 39fb6eaab3 - Show all commits

View File

@ -24,7 +24,7 @@ html[theme='f0ck'] {
--dropdown-bg: #232323; --dropdown-bg: #232323;
--dropdown-item-hover: #0d0d0d; --dropdown-item-hover: #0d0d0d;
--nav-brand-font: 'VCR'; --nav-brand-font: 'VCR';
--font: 'Open Sans'; --font: 'monospace';
--pagination-background: #2b2b2b; --pagination-background: #2b2b2b;
--pagination-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 0px rgba(255,255,255,.04),inset 0 0px rgba(0,0,0,.15),0 0px 0px rgba(0,0,0,.1); --pagination-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 0px rgba(255,255,255,.04),inset 0 0px rgba(0,0,0,.15),0 0px 0px rgba(0,0,0,.1);
--pagination-anchor-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 1px rgba(255,255,255,.04),inset 0 -1px rgba(0,0,0,.15),0 1px 1px rgba(0,0,0,.1); --pagination-anchor-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 1px rgba(255,255,255,.04),inset 0 -1px rgba(0,0,0,.15),0 1px 1px rgba(0,0,0,.1);
@ -59,7 +59,7 @@ html[theme='p1nk'] {
--dropdown-bg: #232323; --dropdown-bg: #232323;
--dropdown-item-hover: #0d0d0d; --dropdown-item-hover: #0d0d0d;
--nav-brand-font: 'VCR'; --nav-brand-font: 'VCR';
--font: 'Open Sans'; --font: 'monospace';
--pagination-background: #2b2b2b; --pagination-background: #2b2b2b;
--pagination-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 1px rgba(255,255,255,.04),inset 0 -1px rgba(0,0,0,.15),0 1px 1px rgba(0,0,0,.1);; --pagination-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 1px rgba(255,255,255,.04),inset 0 -1px rgba(0,0,0,.15),0 1px 1px rgba(0,0,0,.1);;
--pagination-anchor-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 1px rgba(255,255,255,.04),inset 0 -1px rgba(0,0,0,.15),0 1px 1px rgba(0,0,0,.1); --pagination-anchor-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 1px rgba(255,255,255,.04),inset 0 -1px rgba(0,0,0,.15),0 1px 1px rgba(0,0,0,.1);
@ -94,7 +94,7 @@ html[theme='orange'] {
--dropdown-bg: #232323; --dropdown-bg: #232323;
--dropdown-item-hover: #0d0d0d; --dropdown-item-hover: #0d0d0d;
--nav-brand-font: 'VCR'; --nav-brand-font: 'VCR';
--font: 'Open Sans'; --font: 'monospace';
--pagination-background: #2b2b2b; --pagination-background: #2b2b2b;
--pagination-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 1px rgba(255,255,255,.04),inset 0 -1px rgba(0,0,0,.15),0 1px 1px rgba(0,0,0,.1); --pagination-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 1px rgba(255,255,255,.04),inset 0 -1px rgba(0,0,0,.15),0 1px 1px rgba(0,0,0,.1);
--pagination-anchor-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 1px rgba(255,255,255,.04),inset 0 -1px rgba(0,0,0,.15),0 1px 1px rgba(0,0,0,.1); --pagination-anchor-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 1px rgba(255,255,255,.04),inset 0 -1px rgba(0,0,0,.15),0 1px 1px rgba(0,0,0,.1);
@ -130,7 +130,7 @@ html[theme='amoled'] {
--dropdown-bg: #232323; --dropdown-bg: #232323;
--dropdown-item-hover: #0d0d0d; --dropdown-item-hover: #0d0d0d;
--nav-brand-font: 'VCR'; --nav-brand-font: 'VCR';
--font: 'Open Sans'; --font: 'monospace';
--pagination-background: #000; --pagination-background: #000;
--pagination-box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0),inset 0 0px rgba(255, 255, 255, 0),inset 0 0px rgba(248, 248, 248, 0),0 0px 0px rgba(255, 255, 255, 0); --pagination-box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0),inset 0 0px rgba(255, 255, 255, 0),inset 0 0px rgba(248, 248, 248, 0),0 0px 0px rgba(255, 255, 255, 0);
--pagination-anchor-box-shadow: inset 0 0 0 1px rgb(92, 92, 92),inset 0 1px rgb(92, 92, 92),inset 0 -1px rgb(92, 92, 92),0 1px 1px rgba(92, 92, 92, 0); --pagination-anchor-box-shadow: inset 0 0 0 1px rgb(92, 92, 92),inset 0 1px rgb(92, 92, 92),inset 0 -1px rgb(92, 92, 92),0 1px 1px rgba(92, 92, 92, 0);
@ -166,7 +166,7 @@ html[theme="paper"] {
--dropdown-bg: #fff; --dropdown-bg: #fff;
--dropdown-item-hover: #3939354a; --dropdown-item-hover: #3939354a;
--nav-brand-font: 'VCR'; --nav-brand-font: 'VCR';
--font: 'Open Sans'; --font: 'monospace';
--pagination-background: #fff; --pagination-background: #fff;
--pagination-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 0px rgba(255,255,255,.04),inset 0 0px rgba(0,0,0,.15),0 0px 0px rgba(0,0,0,.1); --pagination-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 0px rgba(255,255,255,.04),inset 0 0px rgba(0,0,0,.15),0 0px 0px rgba(0,0,0,.1);
--pagination-anchor-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 1px rgba(255,255,255,.04),inset 0 -1px rgba(0,0,0,.15),0 1px 1px rgba(0,0,0,.1); --pagination-anchor-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 1px rgba(255,255,255,.04),inset 0 -1px rgba(0,0,0,.15),0 1px 1px rgba(0,0,0,.1);
@ -285,7 +285,7 @@ html[theme="atmos"] {
--dropdown-bg: #232323; --dropdown-bg: #232323;
--dropdown-item-hover: #0d0d0d; --dropdown-item-hover: #0d0d0d;
--nav-brand-font: 'VCR'; --nav-brand-font: 'VCR';
--font: 'Open Sans'; --font: 'monospace';
--pagination-background: rgb(32, 32, 32); --pagination-background: rgb(32, 32, 32);
--pagination-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 0px rgba(255,255,255,.04),inset 0 0px rgba(0,0,0,.15),0 0px 0px rgba(0,0,0,.1); --pagination-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 0px rgba(255,255,255,.04),inset 0 0px rgba(0,0,0,.15),0 0px 0px rgba(0,0,0,.1);
--pagination-anchor-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 1px rgba(255,255,255,.04),inset 0 -1px rgba(0,0,0,.15),0 1px 1px rgba(0,0,0,.1); --pagination-anchor-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 1px rgba(255,255,255,.04),inset 0 -1px rgba(0,0,0,.15),0 1px 1px rgba(0,0,0,.1);
@ -320,7 +320,7 @@ html[theme="term"] {
--dropdown-bg: #040404; --dropdown-bg: #040404;
--dropdown-item-hover: #282828; --dropdown-item-hover: #282828;
--nav-brand-font: 'VCR'; --nav-brand-font: 'VCR';
--font: 'Open Sans'; --font: 'monospace';
--pagination-background: #040404; --pagination-background: #040404;
--pagination-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 0px rgba(255,255,255,.04),inset 0 0px rgba(0,0,0,.15),0 0px 0px rgba(0,0,0,.1); --pagination-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 0px rgba(255,255,255,.04),inset 0 0px rgba(0,0,0,.15),0 0px 0px rgba(0,0,0,.1);
--pagination-anchor-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 1px rgba(255,255,255,.04),inset 0 -1px rgba(0,0,0,.15),0 1px 1px rgba(0,0,0,.1); --pagination-anchor-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 1px rgba(255,255,255,.04),inset 0 -1px rgba(0,0,0,.15),0 1px 1px rgba(0,0,0,.1);
@ -370,7 +370,7 @@ html[theme="iced"] {
--dropdown-bg: #111d37; --dropdown-bg: #111d37;
--dropdown-item-hover: #0a3f53; --dropdown-item-hover: #0a3f53;
--nav-brand-font: 'VCR'; --nav-brand-font: 'VCR';
--font: 'Open Sans'; --font: 'monospace';
--pagination-background: #111d37; --pagination-background: #111d37;
--pagination-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 0px rgba(255,255,255,.04),inset 0 0px rgba(0,0,0,.15),0 0px 0px rgba(0,0,0,.1); --pagination-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 0px rgba(255,255,255,.04),inset 0 0px rgba(0,0,0,.15),0 0px 0px rgba(0,0,0,.1);
--pagination-anchor-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 1px rgba(255,255,255,.04),inset 0 -1px rgba(0,0,0,.15),0 1px 1px rgba(0,0,0,.1); --pagination-anchor-box-shadow: inset 0 0 0 1px rgba(255,255,255,.04),inset 0 1px rgba(255,255,255,.04),inset 0 -1px rgba(0,0,0,.15),0 1px 1px rgba(0,0,0,.1);
@ -412,6 +412,7 @@ html[theme="iced"] .navbar-brand:hover {
src: url('/s/vcr.ttf') format('truetype'); src: url('/s/vcr.ttf') format('truetype');
/* https://www.dafont.com/vcr-osd-mono.font */ /* https://www.dafont.com/vcr-osd-mono.font */
} }
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
src: url('/s/OpenSans.ttf') format('truetype'); src: url('/s/OpenSans.ttf') format('truetype');
@ -429,6 +430,7 @@ html, body {
scrollbar-width: thin; scrollbar-width: thin;
overscroll-behavior-y: contain; overscroll-behavior-y: contain;
overflow: overlay; overflow: overlay;
font-size: 14px;
} }
.noscript-badge { .noscript-badge {
@ -670,6 +672,10 @@ span.f0ck {
.embed-responsive-16by9::before { .embed-responsive-16by9::before {
padding-top: 75% !important; padding-top: 75% !important;
} }
.pagination {
justify-content: center !important;
}
} }
@media (max-width: 768px) { @media (max-width: 768px) {
@ -780,6 +786,10 @@ span.placeholder {
justify-content: center; justify-content: center;
} }
.pagination {
justify-content: flex-end !important;
}
/* needs rework!!!! */ /* needs rework!!!! */
.pagination a:nth-last-child(2), .pagination a:nth-last-child(3), .pagination a:nth-last-child(2), .pagination a:nth-last-child(3),
.pagination a:nth-child(2), .pagination a:nth-child(3) { .pagination a:nth-child(2), .pagination a:nth-child(3) {
@ -854,7 +864,7 @@ span.placeholder {
float: left; float: left;
padding: 0 5px; padding: 0 5px;
min-width: 17px; min-width: 17px;
font-size: 12px; font-size: 14px;
font-weight: 500; font-weight: 500;
color: var(--accent); color: var(--accent);
text-align: center; text-align: center;
@ -1209,7 +1219,7 @@ span#tags:empty {
@media(max-height: 755px) { @media(max-height: 755px) {
.embed-responsive-16by9::before { .embed-responsive-16by9::before {
padding-top: 46.25%; padding-top: 42.25%;
} }
} }
@ -1456,7 +1466,7 @@ img.avatar {
position: relative; position: relative;
width: 24px; width: 24px;
margin: 0; margin: 0;
left: -6px; left: -7px;
top: 0px; top: 0px;
border-top-left-radius: 3px; border-top-left-radius: 3px;
border-bottom-left-radius: 3px; border-bottom-left-radius: 3px;

View File

@ -231,7 +231,7 @@ export default {
} }
else { else {
items = db` items = db`
select * select "items".*
from "items" from "items"
${ tag ${ tag
? db` ? db`
@ -240,7 +240,7 @@ export default {
from "tags" from "tags"
left join "tags_assign" on "tags_assign".tag_id = "tags".id left join "tags_assign" on "tags_assign".tag_id = "tags".id
where "tags".tag ilike ${'%' + tag + '%'} where "tags".tag ilike ${'%' + tag + '%'}
group by "tags_assign".item_id, "tags_assign".tag_id, "tags".tag group by "tags_assign".item_id, "tags".tag, "tags_assign".tag_id
) as st on st.item_id = "items".id` ) as st on st.item_id = "items".id`
: db`` : db``
} }
@ -254,7 +254,7 @@ export default {
: db`` : db``
} }
${ tag ${ tag
? db`group by st.item_id, "items".id, st.tag, st.tag_id` ? db`group by st.item_id, "items".id, st.tag_id`
: db`group by "items".id` : db`group by "items".id`
} }
order by "items".id desc order by "items".id desc