Merge remote-tracking branch 'origin/dev'

.gitignore

@@ -4,4 +4,7 @@ config.json
 public/b
 public/ca
 public/t
+deleted/b
+deleted/ca
+deleted/t
 tmp/*

README.md

@@ -22,7 +22,7 @@ cd f0ckv2
  #(for developers: git checkout dev)
 npm i
 psql f0ck < f0ck.sql
-mkdir -p public/ca
+mkdir -p public/ca deleted/{ca,b,t}
 cp config_example.json config.json
   - edit config.json
   - set up clients, as described here: https://git.lat/keinBot/cuffeo

public/s/css/f0ck.css

@@ -868,6 +868,14 @@ html[theme="f0ck95"] ._error_topbar {
   background: -webkit-linear-gradient(left,#08216b,#a5cef7);
 }
 
+html[theme="f0ck95"] .f0ckgle {
+  color: black;
+}
+
+html[theme="f0ck95"] .admin-search button {
+  color: black;
+}
+
 /* f0ck95dARK */
 html[theme='f0ck95d'] {
   --accent: #fff;
@@ -877,7 +885,7 @@ html[theme='f0ck95d'] {
   --gray: silver;
   --nav-bg: #0b0a0a;
   --nav-brand-border: inset 1px black;
-  --nav-brand-bg: #4c4c4c;
+  --nav-brand-bg: #0000;
   --navigation-links-bg: #0b0b0b;
   --navigation-links-background-linear-gradient: rgba(0,0,0,.12),rgba(0,0,0,0);
   --navigation-links-border-color: rgba(0,0,0,.8) rgba(0,0,0,.65) rgba(0,0,0,.5);
@@ -1071,6 +1079,10 @@ html[theme="f0ck95d"] .badge-danger {
   border-radius: 0; 
 }
 
+html[theme="f0ck95d"] .admin-search button {
+  color: black;
+}
+
 ::-webkit-scrollbar {
   width: 2px;
 }

views/search.html

@@ -1,35 +1,37 @@
 @include(snippets/header)
-<h1 style="text-align: center">f0ckgle</h1>
+<div class="f0ckgle">
-<form action="/search" class="admin-search">
+  <h1 style="text-align: center">f0ckgle</h1>
-  <input type="text" name="tag" value="{!! searchstring || '' !!}" /><button type="submit"><b>f0ck</b></button>
+  <form action="/search" class="admin-search">
-</form>
+    <input type="text" name="tag" value="{!! searchstring || '' !!}" /><button type="submit"><b>f0ck</b></button>
-<div class="results">
+  </form>
-  @if(result)
+  <div class="results">
-  <h2>{{ count }} f0cks given (page {{ pagination.page }} of {{ pagination.end }}):</h2>
+    @if(result)
-  <table style="width: 100%" class="table">
+    <h2>{{ count }} f0cks given (page {{ pagination.page }} of {{ pagination.end }}):</h2>
-    <thead>
+    <table style="width: 100%" class="table">
-      <tr>
+      <thead>
-        <th>Thumbnail</th>
+        <tr>
-        <th>ID</th>
+          <th>Thumbnail</th>
-        <th>Tag</th>
+          <th>ID</th>
-        <th>Mime</th>
+          <th>Tag</th>
-        <th>Username</th>
+          <th>Mime</th>
-        <th>Score</th>
+          <th>Username</th>
-      </tr>
+          <th>Score</th>
-    </thead>
+        </tr>
-    <tbody>
+      </thead>
-  @each(result as line)
+      <tbody>
-      <tr>
+    @each(result as line)
-        <td style="width: 128px;"><a href="/tag/{!! line.tag !!}/{{ line.id }}" target="_blank"><img src="/t/{{ line.id }}.webp" /></a></td>
+        <tr>
-        <td><span class="mview_desc">ID:</span><a href="/tag/{!! line.tag !!}/{{ line.id }}" target="_blank">{{ line.id }}</a></td>
+          <td style="width: 128px;"><a href="/tag/{!! line.tag !!}/{{ line.id }}" target="_blank"><img src="/t/{{ line.id }}.webp" /></a></td>
-        <td><span class="mview_desc">Tag:</span><a href="/tag/{!! line.tag !!}">{!! line.tag !!}</a></td>
+          <td><span class="mview_desc">ID:</span><a href="/tag/{!! line.tag !!}/{{ line.id }}" target="_blank">{{ line.id }}</a></td>
-        <td><span class="mview_desc">Mime:</span>{{ line.mime }}</td>
+          <td><span class="mview_desc">Tag:</span><a href="/tag/{!! line.tag !!}">{!! line.tag !!}</a></td>
-        <td><span class="mview_desc">User:</span><a href="/user/{!! line.username !!}/f0cks/{{ line.id }}">{!! line.username !!}</a></td>
+          <td><span class="mview_desc">Mime:</span>{{ line.mime }}</td>
-        <td><span class="mview_desc">Score:</span>{{ line.score?.toFixed(2) }}</td>
+          <td><span class="mview_desc">User:</span><a href="/user/{!! line.username !!}/f0cks/{{ line.id }}">{!! line.username !!}</a></td>
-      </tr>
+          <td><span class="mview_desc">Score:</span>{{ line.score?.toFixed(2) }}</td>
-  @endeach
+        </tr>
-    </tbody>
+    @endeach
-  </table>
+      </tbody>
-  @endif
+    </table>
+    @endif
+  </div>
 </div>
 @include(snippets/footer)