From da0b3307565bdec0d67014b0de8be71d90789762 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 26 Aug 2021 20:28:06 +0300 Subject: chore(web/tvl): Move TVL static assets out of //users/tazjin It's now more like my personal homepage depends on TVL assets, not the other way around. Change-Id: Ifb9d61aa8ec2cab549e25de3a3dfbbd08f3d336c Reviewed-on: https://cl.tvl.fyi/c/depot/+/3435 Tested-by: BuildkiteCI Reviewed-by: sterni --- users/tazjin/homepage/default.nix | 4 +- .../static/jetbrains-mono-bold-italic.woff2 | Bin 53364 -> 0 bytes .../homepage/static/jetbrains-mono-bold.woff2 | Bin 49892 -> 0 bytes .../homepage/static/jetbrains-mono-italic.woff2 | Bin 50936 -> 0 bytes users/tazjin/homepage/static/jetbrains-mono.woff2 | Bin 48700 -> 0 bytes users/tazjin/homepage/static/tazjin.css | 183 --------------------- web/static/default.nix | 6 + web/static/favicon.webp | Bin 0 -> 18750 bytes web/static/jetbrains-mono-bold-italic.woff2 | Bin 0 -> 53364 bytes web/static/jetbrains-mono-bold.woff2 | Bin 0 -> 49892 bytes web/static/jetbrains-mono-italic.woff2 | Bin 0 -> 50936 bytes web/static/jetbrains-mono.woff2 | Bin 0 -> 48700 bytes web/static/tvl.css | 183 +++++++++++++++++++++ web/static/virus_lounge.webp | Bin 0 -> 77556 bytes web/tvl/default.nix | 8 +- web/tvl/static/favicon.webp | Bin 18750 -> 0 bytes web/tvl/static/virus_lounge.webp | Bin 77556 -> 0 bytes 17 files changed, 194 insertions(+), 190 deletions(-) delete mode 100644 users/tazjin/homepage/static/jetbrains-mono-bold-italic.woff2 delete mode 100644 users/tazjin/homepage/static/jetbrains-mono-bold.woff2 delete mode 100644 users/tazjin/homepage/static/jetbrains-mono-italic.woff2 delete mode 100644 users/tazjin/homepage/static/jetbrains-mono.woff2 delete mode 100644 users/tazjin/homepage/static/tazjin.css create mode 100644 web/static/default.nix create mode 100644 web/static/favicon.webp create mode 100644 web/static/jetbrains-mono-bold-italic.woff2 create mode 100644 web/static/jetbrains-mono-bold.woff2 create mode 100644 web/static/jetbrains-mono-italic.woff2 create mode 100644 web/static/jetbrains-mono.woff2 create mode 100644 web/static/tvl.css create mode 100644 web/static/virus_lounge.webp delete mode 100644 web/tvl/static/favicon.webp delete mode 100644 web/tvl/static/virus_lounge.webp diff --git a/users/tazjin/homepage/default.nix b/users/tazjin/homepage/default.nix index 17d5d5cc87..a8ebe7e282 100644 --- a/users/tazjin/homepage/default.nix +++ b/users/tazjin/homepage/default.nix @@ -71,5 +71,7 @@ in runCommandNoCC "website" {} '' mkdir $out cp ${homepage} $out/index.html cp ${atomFeed} $out/feed.atom - cp -r ${./static} $out/static + mkdir $out/static + cp -r ${depot.web.static}/* $out/static + cp -rf ${./static}/* $out/static '' diff --git a/users/tazjin/homepage/static/jetbrains-mono-bold-italic.woff2 b/users/tazjin/homepage/static/jetbrains-mono-bold-italic.woff2 deleted file mode 100644 index 34b5c69ae1..0000000000 Binary files a/users/tazjin/homepage/static/jetbrains-mono-bold-italic.woff2 and /dev/null differ diff --git a/users/tazjin/homepage/static/jetbrains-mono-bold.woff2 b/users/tazjin/homepage/static/jetbrains-mono-bold.woff2 deleted file mode 100644 index 84a008af7e..0000000000 Binary files a/users/tazjin/homepage/static/jetbrains-mono-bold.woff2 and /dev/null differ diff --git a/users/tazjin/homepage/static/jetbrains-mono-italic.woff2 b/users/tazjin/homepage/static/jetbrains-mono-italic.woff2 deleted file mode 100644 index 85fd468789..0000000000 Binary files a/users/tazjin/homepage/static/jetbrains-mono-italic.woff2 and /dev/null differ diff --git a/users/tazjin/homepage/static/jetbrains-mono.woff2 b/users/tazjin/homepage/static/jetbrains-mono.woff2 deleted file mode 100644 index d5b94cb9e7..0000000000 Binary files a/users/tazjin/homepage/static/jetbrains-mono.woff2 and /dev/null differ diff --git a/users/tazjin/homepage/static/tazjin.css b/users/tazjin/homepage/static/tazjin.css deleted file mode 100644 index aea4d426ea..0000000000 --- a/users/tazjin/homepage/static/tazjin.css +++ /dev/null @@ -1,183 +0,0 @@ -/* Jetbrains Mono font from https://www.jetbrains.com/lp/mono/ - licensed under Apache 2.0. Thanks, Jetbrains! */ -@font-face { - font-family: jetbrains-mono; - src: url(jetbrains-mono.woff2); -} - -@font-face { - font-family: jetbrains-mono; - font-weight: bold; - src: url(jetbrains-mono-bold.woff2); -} - -@font-face { - font-family: jetbrains-mono; - font-style: italic; - src: url(jetbrains-mono-italic.woff2); -} - -@font-face { - font-family: jetbrains-mono; - font-weight: bold; - font-style: italic; - src: url(jetbrains-mono-bold-italic.woff2); -} - -/* Generic-purpose styling */ - -body { - max-width: 800px; - margin: 40px auto; - line-height: 1.6; - font-size: 18px; - padding: 0 10px; - font-family: jetbrains-mono, monospace; -} - -p, a :not(.uncoloured-link) { - color: inherit; -} - -h1, h2, h3 { - line-height: 1.2 -} - -/* Homepage styling */ - -.dark { - background-color: #181818; - color: #e4e4ef; -} - -.dark-link, .interblag-title { - color: #96a6c8; -} - -.entry-container { - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: flex-start; -} - -.interblag-title { - text-decoration: none; -} - -.entry { - width: 42%; - margin: 5px; - padding-left: 7px; - padding-right: 5px; - border: 2px solid; - border-radius: 5px; - flex-grow: 1; - text-decoration: none; -} - -.misc { - color: #73c936; - border-color: #73c936; -} - -.blog { - color: #268bd2; - border-color: #268bd2; -} - -.project { - color: #ff4f58; - border-color: #ff4f58; -} - -.entry-title { - color: inherit !important; - font-weight: bold; - text-decoration: none; -} - -.entry-date { - font-style: italic; -} - -/* Blog styling */ - -.light { - color: #383838; -} - -.blog-title { - color: inherit; - text-decoration: none; -} - -.footer { - text-align: right; -} - -.date { - text-align: right; - font-style: italic; - float: right; -} - -.inline { - display: inline; -} - -.lod { - text-align: center; -} - -.uncoloured-link { - color: inherit; -} - -pre { - width: 100%; - overflow: auto; -} - -img { - max-width: 100%; -} - -.cheddar-callout { - display: block; - padding: 10px; -} - -.cheddar-question { - color: #3367d6; - background-color: #e8f0fe; -} - -.cheddar-todo { - color: #616161; - background-color: #eeeeee; -} - -.cheddar-tip { - color: #00796b; - background-color: #e0f2f1; -} - -.cheddar-warning { - color: #a52714; - background-color: #fbe9e7; -} - -kbd { - background-color: #eee; - border-radius: 3px; - border: 1px solid #b4b4b4; - box-shadow: 0 1px 1px rgba(0, 0, 0, .2), 0 2px 0 0 rgba(255, 255, 255, .7) inset; - color: #333; - display: inline-block; - font-size: .85em; - font-weight: 700; - line-height: 1; - padding: 2px 4px; - white-space: nowrap; -} diff --git a/web/static/default.nix b/web/static/default.nix new file mode 100644 index 0000000000..518f21d6f9 --- /dev/null +++ b/web/static/default.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: + +# Needs to be a derivation ... +pkgs.runCommand "tvl-static" {} '' + cp -r ${./.} $out +'' diff --git a/web/static/favicon.webp b/web/static/favicon.webp new file mode 100644 index 0000000000..741cdbc64f Binary files /dev/null and b/web/static/favicon.webp differ diff --git a/web/static/jetbrains-mono-bold-italic.woff2 b/web/static/jetbrains-mono-bold-italic.woff2 new file mode 100644 index 0000000000..34b5c69ae1 Binary files /dev/null and b/web/static/jetbrains-mono-bold-italic.woff2 differ diff --git a/web/static/jetbrains-mono-bold.woff2 b/web/static/jetbrains-mono-bold.woff2 new file mode 100644 index 0000000000..84a008af7e Binary files /dev/null and b/web/static/jetbrains-mono-bold.woff2 differ diff --git a/web/static/jetbrains-mono-italic.woff2 b/web/static/jetbrains-mono-italic.woff2 new file mode 100644 index 0000000000..85fd468789 Binary files /dev/null and b/web/static/jetbrains-mono-italic.woff2 differ diff --git a/web/static/jetbrains-mono.woff2 b/web/static/jetbrains-mono.woff2 new file mode 100644 index 0000000000..d5b94cb9e7 Binary files /dev/null and b/web/static/jetbrains-mono.woff2 differ diff --git a/web/static/tvl.css b/web/static/tvl.css new file mode 100644 index 0000000000..aea4d426ea --- /dev/null +++ b/web/static/tvl.css @@ -0,0 +1,183 @@ +/* Jetbrains Mono font from https://www.jetbrains.com/lp/mono/ + licensed under Apache 2.0. Thanks, Jetbrains! */ +@font-face { + font-family: jetbrains-mono; + src: url(jetbrains-mono.woff2); +} + +@font-face { + font-family: jetbrains-mono; + font-weight: bold; + src: url(jetbrains-mono-bold.woff2); +} + +@font-face { + font-family: jetbrains-mono; + font-style: italic; + src: url(jetbrains-mono-italic.woff2); +} + +@font-face { + font-family: jetbrains-mono; + font-weight: bold; + font-style: italic; + src: url(jetbrains-mono-bold-italic.woff2); +} + +/* Generic-purpose styling */ + +body { + max-width: 800px; + margin: 40px auto; + line-height: 1.6; + font-size: 18px; + padding: 0 10px; + font-family: jetbrains-mono, monospace; +} + +p, a :not(.uncoloured-link) { + color: inherit; +} + +h1, h2, h3 { + line-height: 1.2 +} + +/* Homepage styling */ + +.dark { + background-color: #181818; + color: #e4e4ef; +} + +.dark-link, .interblag-title { + color: #96a6c8; +} + +.entry-container { + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: flex-start; +} + +.interblag-title { + text-decoration: none; +} + +.entry { + width: 42%; + margin: 5px; + padding-left: 7px; + padding-right: 5px; + border: 2px solid; + border-radius: 5px; + flex-grow: 1; + text-decoration: none; +} + +.misc { + color: #73c936; + border-color: #73c936; +} + +.blog { + color: #268bd2; + border-color: #268bd2; +} + +.project { + color: #ff4f58; + border-color: #ff4f58; +} + +.entry-title { + color: inherit !important; + font-weight: bold; + text-decoration: none; +} + +.entry-date { + font-style: italic; +} + +/* Blog styling */ + +.light { + color: #383838; +} + +.blog-title { + color: inherit; + text-decoration: none; +} + +.footer { + text-align: right; +} + +.date { + text-align: right; + font-style: italic; + float: right; +} + +.inline { + display: inline; +} + +.lod { + text-align: center; +} + +.uncoloured-link { + color: inherit; +} + +pre { + width: 100%; + overflow: auto; +} + +img { + max-width: 100%; +} + +.cheddar-callout { + display: block; + padding: 10px; +} + +.cheddar-question { + color: #3367d6; + background-color: #e8f0fe; +} + +.cheddar-todo { + color: #616161; + background-color: #eeeeee; +} + +.cheddar-tip { + color: #00796b; + background-color: #e0f2f1; +} + +.cheddar-warning { + color: #a52714; + background-color: #fbe9e7; +} + +kbd { + background-color: #eee; + border-radius: 3px; + border: 1px solid #b4b4b4; + box-shadow: 0 1px 1px rgba(0, 0, 0, .2), 0 2px 0 0 rgba(255, 255, 255, .7) inset; + color: #333; + display: inline-block; + font-size: .85em; + font-weight: 700; + line-height: 1; + padding: 2px 4px; + white-space: nowrap; +} diff --git a/web/static/virus_lounge.webp b/web/static/virus_lounge.webp new file mode 100644 index 0000000000..1f898b6ad8 Binary files /dev/null and b/web/static/virus_lounge.webp differ diff --git a/web/tvl/default.nix b/web/tvl/default.nix index e79c47b531..aa1fc225fe 100644 --- a/web/tvl/default.nix +++ b/web/tvl/default.nix @@ -41,11 +41,7 @@ let ''; }; in runCommandNoCC "website" {} '' - mkdir -p $out/static + mkdir $out cp ${homepage} $out/index.html - cp -r ${./static}/* $out/static - - # Some assets are stolen from tazjin's blog - cp ${depot.users.tazjin.homepage}/static/jetbrains-* $out/static - cp ${depot.users.tazjin.homepage}/static/tazjin.css $out/static + cp -r ${depot.web.static} $out/static '' diff --git a/web/tvl/static/favicon.webp b/web/tvl/static/favicon.webp deleted file mode 100644 index 741cdbc64f..0000000000 Binary files a/web/tvl/static/favicon.webp and /dev/null differ diff --git a/web/tvl/static/virus_lounge.webp b/web/tvl/static/virus_lounge.webp deleted file mode 100644 index 1f898b6ad8..0000000000 Binary files a/web/tvl/static/virus_lounge.webp and /dev/null differ -- cgit 1.4.1