f0ck/f0ckv2
3
4
Fork 0
Code Issues 13 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'revert font' (#15) from dev into master

Browse Source 
Reviewed-on: #15
This commit is contained in:
Flummi 2022-04-08 09:51:21 +02:00
commit 39fb6eaab3
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
public/s/css/f0ck.css
View File

@ -24,7 +24,7 @@ html[theme='f0ck'] {
--dropdown-bg: #232323;
--dropdown-item-hover: #0d0d0d;
--nav-brand-font: 'VCR';
--font: 'Open Sans';
--font: 'monospace';
--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-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-item-hover: #0d0d0d;
--nav-brand-font: 'VCR';
--font: 'Open Sans';
--font: 'monospace';
--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-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-item-hover: #0d0d0d;
--nav-brand-font: 'VCR';
--font: 'Open Sans';
--font: 'monospace';
--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-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-item-hover: #0d0d0d;
--nav-brand-font: 'VCR';
--font: 'Open Sans';
--font: 'monospace';
--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-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-item-hover: #3939354a;
--nav-brand-font: 'VCR';
--font: 'Open Sans';
--font: 'monospace';
--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-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-item-hover: #0d0d0d;
--nav-brand-font: 'VCR';
--font: 'Open Sans';
--font: 'monospace';
--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-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-item-hover: #282828;
--nav-brand-font: 'VCR';
--font: 'Open Sans';
--font: 'monospace';
--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-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-item-hover: #0a3f53;
--nav-brand-font: 'VCR';
--font: 'Open Sans';
--font: 'monospace';
--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-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');
/* https://www.dafont.com/vcr-osd-mono.font */
}
@font-face {
font-family: 'Open Sans';
src: url('/s/OpenSans.ttf') format('truetype');
@ -429,6 +430,7 @@ html, body {
scrollbar-width: thin;
overscroll-behavior-y: contain;
overflow: overlay;
font-size: 14px;
}
.noscript-badge {
@ -670,6 +672,10 @@ span.f0ck {
.embed-responsive-16by9::before {
padding-top: 75% !important;
}
.pagination {
justify-content: center !important;
}
}
@media (max-width: 768px) {
@ -780,6 +786,10 @@ span.placeholder {
justify-content: center;
}
.pagination {
justify-content: flex-end !important;
}
/* needs rework!!!! */
.pagination a:nth-last-child(2), .pagination a:nth-last-child(3),
.pagination a:nth-child(2), .pagination a:nth-child(3) {
@ -854,7 +864,7 @@ span.placeholder {
float: left;
padding: 0 5px;
min-width: 17px;
font-size: 12px;
font-size: 14px;
font-weight: 500;
color: var(--accent);
text-align: center;
@ -1209,7 +1219,7 @@ span#tags:empty {
@media(max-height: 755px) {
.embed-responsive-16by9::before {
padding-top: 46.25%;
padding-top: 42.25%;
}
}
@ -1456,7 +1466,7 @@ img.avatar {
position: relative;
width: 24px;
margin: 0;
left: -6px;
left: -7px;
top: 0px;
border-top-left-radius: 3px;
border-bottom-left-radius: 3px;

6
src/inc/routeinc/f0cklib.mjs
View File

@ -231,7 +231,7 @@ export default {
}
else {
items = db`
select *
select "items".*
from "items"
${ tag
? db`
@ -240,7 +240,7 @@ export default {
from "tags"
left join "tags_assign" on "tags_assign".tag_id = "tags".id
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`
: db``
}
@ -254,7 +254,7 @@ export default {
: db``
}
${ 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`
}
order by "items".id desc