From 04a6d296b586f62e7bc44e7e59b04973e0b1ab03 Mon Sep 17 00:00:00 2001
From: Paul Z <info@pfz4.de>
Date: Fri, 10 Nov 2023 16:07:15 +0100
Subject: [PATCH] flake-update

---
 flake.lock                   |   6 +-
 flake.nix                    |   2 -
 server/static/zettoit-style  |   1 -
 server/static/zettoit.css    | 172 +++++++++++++++++++++++++++++++++++
 server/static/zettoit.svg    |  60 ++++++++++++
 server/templates/delete.stpl |   6 +-
 server/templates/index.stpl  |   6 +-
 7 files changed, 241 insertions(+), 12 deletions(-)
 delete mode 160000 server/static/zettoit-style
 create mode 100644 server/static/zettoit.css
 create mode 100644 server/static/zettoit.svg

diff --git a/flake.lock b/flake.lock
index 371f807..e09d9de 100644
--- a/flake.lock
+++ b/flake.lock
@@ -72,11 +72,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1699495996,
-        "narHash": "sha256-m0LWmnEJhHTY4gJX9HPsQ8voZptvr1Sx6dXkk9Xp0sI=",
+        "lastModified": 1699582387,
+        "narHash": "sha256-sPmUXPDl+cEi+zFtM5lnAs7dWOdRn0ptZ4a/qHwvNDk=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "603e4962d7d2225ba2caf66b0eabfcaa9a93c490",
+        "rev": "41f7b0618052430d3a050e8f937030d00a2fcced",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 45b8ad9..27a4e7a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,8 +15,6 @@
       url = "github:ipetkov/crane";
       inputs = {
         nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-        rust-overlay.follows = "rust-overlay";
       };
     };
   };
diff --git a/server/static/zettoit-style b/server/static/zettoit-style
deleted file mode 160000
index 6de783b..0000000
--- a/server/static/zettoit-style
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6de783bed1960fc6ba3a06dc56f8999459817795
diff --git a/server/static/zettoit.css b/server/static/zettoit.css
new file mode 100644
index 0000000..0aa6884
--- /dev/null
+++ b/server/static/zettoit.css
@@ -0,0 +1,172 @@
+/*
+ * GENERAL
+ */
+:root {
+    --s0: 1px;
+    --s1: 2px;
+    --s2: 4px;
+    --s3: 8px;
+    --s4: 16px;
+}
+html {
+    font-family: monospace;
+    font-size: 16px;
+    line-height: calc(1em + var(--spacing-2));
+}
+body {
+    min-height: 100vh;
+    max-width: 100%;
+    background-color: black;
+    color: #eceff4;
+    margin: 0;
+
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    gap: 1rem;
+}
+
+main {
+    border: 1px solid white;
+    padding: var(--s3);
+    max-width: calc(100% - 2*var(--s3) - 2*var(--s0));
+    display: flex;
+    flex-direction: column;
+    gap: var(--s4);
+
+}
+
+.watermark {
+    position: fixed;
+    right: 0.25rem;
+    bottom: 0.25rem;
+    filter: invert();
+    height: 1em;
+    color: white;
+}
+.watermark img {
+    height: 100%;
+}
+
+/*
+ * LAYOUT
+ */
+.container {
+    width: 100%;
+    margin-left: auto;
+    margin-right: auto;
+}
+@media (min-width: 576px) {
+    .container {
+        max-width: 540px;
+    }
+}
+@media (min-width: 768px) {
+    .container {
+        max-width: 720px;
+    }
+}
+@media (min-width: 992px) {
+    .container {
+        max-width: 960px;
+    }
+}
+@media (min-width: 1200px) {
+    .container {
+        max-width: 1140px;
+    }
+}
+
+.centered {
+    text-align: center;
+}
+
+/*
+ * TYPOGRAPHY
+ */
+h1,h2,h3,h4,h5,h6,p {
+    margin: 0;
+}
+h1 {
+    font-size: 1.6rem;
+}
+h2 {
+    font-size: 1.5rem;
+}
+h3 {
+    font-size: 1.4rem;
+}
+h4 {
+    font-size: 1.3rem;
+}
+h5 {
+    font-size: 1.2rem;
+}
+h6 {
+    font-size: 1.1rem;
+}
+small {
+    font-size: 0.9rem;
+}
+
+/*
+ * COMPONENTS
+ */
+pre {
+    border-width: var(--s0) var(--s0) var(--s0) var(--s2);
+    border-color: #e5e9f0;
+    border-style: solid;
+    padding-left: var(--s1);
+    font-size: 0.8rem;
+    overflow-x: auto;
+    margin: 0px;
+}
+
+article {
+    border: var(--s0) solid #e5e9f0;
+    padding: var(--s3);
+}
+
+button {
+    background-color: white;
+    color: black;
+    border: 1px solid white;
+    font-weight: bold;
+    padding: 0.5em;
+    font-size: 1.1em;
+    cursor: pointer;
+    display: block;
+    width: 100%;
+}
+button:active, input[type="file"]::file-selector-button:active {
+    background-color: black;
+    color: white;
+}
+
+/*
+ * Form
+ */
+form{
+    display: flex;
+    flex-direction: column;
+    gap: var(--s3);
+    margin: 0;
+}
+
+input[type="file"] {
+    display: block;
+    border: 1px solid white;
+    font-weight: bold;
+    width: calc(100% - 2px);
+    cursor: pointer;
+}
+input[type="file"]::file-selector-button {
+    background-color: white;
+    color: black;
+    font-weight: bold;
+    border: none;
+    padding: 0.5em;
+    cursor: pointer;
+}
+
diff --git a/server/static/zettoit.svg b/server/static/zettoit.svg
new file mode 100644
index 0000000..f77f51e
--- /dev/null
+++ b/server/static/zettoit.svg
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="34mm"
+   height="15mm"
+   viewBox="0 0 34 15"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   sodipodi:docname="zettoIT_new.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050"
+     inkscape:document-units="mm"
+     showgrid="true"
+     inkscape:zoom="3.659624"
+     inkscape:cx="94.95511"
+     inkscape:cy="25.002569"
+     inkscape:window-width="1916"
+     inkscape:window-height="2110"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4316"
+       empspacing="4"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <defs
+     id="defs2" />
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       d="M 1.0583328,3.175 H 17.991667 l -1e-6,-2.1166667 h 2.116667 V 3.175 h 2.116666 l -1e-6,-2.1166667 h 2.116667 V 3.175 h 2.116667 6.35 v 10.583333 h -6.35 V 6.35 l 2.116666,-10e-8 10e-7,5.2916661 h 2.116666 V 5.2916666 h -6.35 v 8.4666664 h -2.116667 l 1e-6,-8.4666664 h -2.116666 v 8.4666664 h -2.116667 l 1e-6,-8.4666664 -6.350001,-2e-7 v 2.1166667 l 3.175,2e-7 v 2.116667 c -2.245125,-3e-6 -1.763889,0 -3.175,0 v 2.1166657 h 4.233333 v 2.116667 H 9.5249988 V 5.2916664 l -8.466666,2e-7 z"
+       id="path13059"
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccc" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.0583328,11.641666 v 2.116667 h 6.35 V 11.641666 H 3.1749995 L 5.2916662,6.35 l -2.1166667,-10e-8 c 0,0 -2.1166667,5.2916661 -2.1166667,5.2916661 z"
+       id="path13061"
+       sodipodi:nodetypes="cccccccc" />
+  </g>
+</svg>
diff --git a/server/templates/delete.stpl b/server/templates/delete.stpl
index 2600ccc..821b201 100644
--- a/server/templates/delete.stpl
+++ b/server/templates/delete.stpl
@@ -1,8 +1,8 @@
 <html>
     <head>
         <title>zettoit bin</title>
-        <link rel="icon" type="image/svg" href="/static/zettoit-style/zettoit.svg"/>
-        <link rel="stylesheet" href="/static/zettoit-style/zettoit.css"/>
+        <link rel="icon" type="image/svg" href="/static/zettoit.svg"/>
+        <link rel="stylesheet" href="/static/zettoit.css"/>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
     </head>
@@ -14,6 +14,6 @@
                 <button type="submit">Delete</button>
             </form>
         </main>
-        <a class="watermark" href="https://git2.zettoit.eu/zettoit"><img src="/static/zettoit-style/zettoit.svg" alt="zettoIT Logo"></a>
+        <a class="watermark" href="https://git2.zettoit.eu/zettoit"><img src="/static/zettoit.svg" alt="zettoIT Logo"></a>
     </body>
 </html>
diff --git a/server/templates/index.stpl b/server/templates/index.stpl
index fb12306..737f889 100644
--- a/server/templates/index.stpl
+++ b/server/templates/index.stpl
@@ -1,8 +1,8 @@
 <html>
     <head>
         <title>zettoit bin</title>
-        <link rel="icon" type="image/svg" href="/static/zettoit-style/zettoit.svg"/>
-        <link rel="stylesheet" href="/static/zettoit-style/zettoit.css"/>
+        <link rel="icon" type="image/svg" href="/static/zettoit.svg"/>
+        <link rel="stylesheet" href="/static/zettoit.css"/>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
     </head>
@@ -43,6 +43,6 @@ $ curl <%= bin_url %> | gpg -d - | tar -xzf
                 <button type="submit">Upload</button>
             </form>
         </main>
-        <a class="watermark" href="https://git2.zettoit.eu/zettoit"><img src="/static/zettoit-style/zettoit.svg" alt="zettoIT Logo"></a>
+        <a class="watermark" href="https://git2.zettoit.eu/zettoit"><img src="/static/zettoit.svg" alt="zettoIT Logo"></a>
     </body>
 </html>