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 @@ + + + + + + + + + + + + + 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 @@ zettoit bin - - + + @@ -14,6 +14,6 @@ - zettoIT Logo + zettoIT Logo 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 @@ zettoit bin - - + + @@ -43,6 +43,6 @@ $ curl <%= bin_url %> | gpg -d - | tar -xzf - zettoIT Logo + zettoIT Logo