From 67c9bb5a7f9db7158481cca1606f6bf441b90bad Mon Sep 17 00:00:00 2001 From: Thomas Smith <49042513+tsmitty11@users.noreply.github.com> Date: Wed, 14 Dec 2022 17:26:04 -0500 Subject: [PATCH 01/15] left/right padding => vw for main content, aligns with grids lines --- packages/gui/src/routes/+layout.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gui/src/routes/+layout.svelte b/packages/gui/src/routes/+layout.svelte index 153952a..4b816ab 100644 --- a/packages/gui/src/routes/+layout.svelte +++ b/packages/gui/src/routes/+layout.svelte @@ -23,7 +23,7 @@ {/if}
-
+
From 21b08b7a43ae4685b99b452a0526f5c95200ff0d Mon Sep 17 00:00:00 2001 From: Thomas Smith <49042513+tsmitty11@users.noreply.github.com> Date: Wed, 14 Dec 2022 17:32:55 -0500 Subject: [PATCH 02/15] left/right padding => vw for main content, aligns with grids lines --- packages/gui/src/routes/+layout.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gui/src/routes/+layout.svelte b/packages/gui/src/routes/+layout.svelte index 153952a..6db6281 100644 --- a/packages/gui/src/routes/+layout.svelte +++ b/packages/gui/src/routes/+layout.svelte @@ -23,7 +23,7 @@ {/if}
-
+
From 6f92c5b2ecb8ac28dc298c4983a2fb0dd88ddba5 Mon Sep 17 00:00:00 2001 From: Thomas Smith <49042513+tsmitty11@users.noreply.github.com> Date: Wed, 14 Dec 2022 17:36:03 -0500 Subject: [PATCH 03/15] left/right padding --- packages/gui/src/routes/+layout.svelte | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/gui/src/routes/+layout.svelte b/packages/gui/src/routes/+layout.svelte index 30f7d21..2f52406 100644 --- a/packages/gui/src/routes/+layout.svelte +++ b/packages/gui/src/routes/+layout.svelte @@ -23,11 +23,8 @@ {/if}
-<<<<<<< HEAD +
-======= -
->>>>>>> 67c9bb5a7f9db7158481cca1606f6bf441b90bad
From 23be274a02bf196f741f4b3286144fc945165b2d Mon Sep 17 00:00:00 2001 From: Thomas Smith <49042513+tsmitty11@users.noreply.github.com> Date: Wed, 14 Dec 2022 17:39:10 -0500 Subject: [PATCH 04/15] Black background for news module --- packages/gui/src/components/News/News.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gui/src/components/News/News.svelte b/packages/gui/src/components/News/News.svelte index bbd4fb7..f868bbd 100644 --- a/packages/gui/src/components/News/News.svelte +++ b/packages/gui/src/components/News/News.svelte @@ -18,7 +18,7 @@ {#if news.length} {:else} -
+
{/if} From 27dc7ce601ea49520c4cc47c3e07907849467c79 Mon Sep 17 00:00:00 2001 From: Thomas Smith <49042513+tsmitty11@users.noreply.github.com> Date: Wed, 14 Dec 2022 18:05:11 -0500 Subject: [PATCH 05/15] Smaller gallery indicators, height of header --- packages/gui/src/routes/+layout.svelte | 5 ++--- packages/ui/src/Gallery/Gallery.svelte | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/gui/src/routes/+layout.svelte b/packages/gui/src/routes/+layout.svelte index 2f52406..6c3a7fc 100644 --- a/packages/gui/src/routes/+layout.svelte +++ b/packages/gui/src/routes/+layout.svelte @@ -18,7 +18,7 @@
{#if backLink} -
+
←
{/if} @@ -81,8 +81,7 @@ top: 0px; left: 0px; width: 100%; - height: 50px; - border-bottom: #ccc 1px solid; + height: 40px; } slot { diff --git a/packages/ui/src/Gallery/Gallery.svelte b/packages/ui/src/Gallery/Gallery.svelte index 0b749d2..1c1d5ef 100644 --- a/packages/ui/src/Gallery/Gallery.svelte +++ b/packages/ui/src/Gallery/Gallery.svelte @@ -65,7 +65,7 @@ focus = i; resetLoop(); }} - class={`bg-purple h-4 w-4 rounded-lg border-2 border-white transition-colors ${ + class={`bg-purple h-3 w-3 rounded-lg border border-white transition-colors ${ i === focus ? 'bg-purple-900' : '' }`} /> From 004ea41619b99c6cc80417d857fe3f83a07095ee Mon Sep 17 00:00:00 2001 From: Thomas Smith <49042513+tsmitty11@users.noreply.github.com> Date: Thu, 15 Dec 2022 17:32:06 -0500 Subject: [PATCH 06/15] Run prettier --- packages/gui/src/components/News/News.svelte | 2 +- packages/gui/src/routes/+layout.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gui/src/components/News/News.svelte b/packages/gui/src/components/News/News.svelte index f868bbd..91069ab 100644 --- a/packages/gui/src/components/News/News.svelte +++ b/packages/gui/src/components/News/News.svelte @@ -18,7 +18,7 @@ {#if news.length} {:else} -
+
{/if} diff --git a/packages/gui/src/routes/+layout.svelte b/packages/gui/src/routes/+layout.svelte index 6c3a7fc..4d8ee6b 100644 --- a/packages/gui/src/routes/+layout.svelte +++ b/packages/gui/src/routes/+layout.svelte @@ -18,7 +18,7 @@
{#if backLink} -
+
←
{/if} From 4f270be8e6334cb171118a4cb5956db7eda60513 Mon Sep 17 00:00:00 2001 From: Thomas Smith <49042513+tsmitty11@users.noreply.github.com> Date: Mon, 19 Dec 2022 15:50:02 -0500 Subject: [PATCH 07/15] Grid adjustments, margins are consistently aligned with y-axis --- packages/gui/src/routes/+layout.svelte | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/gui/src/routes/+layout.svelte b/packages/gui/src/routes/+layout.svelte index 4d8ee6b..aa11bc7 100644 --- a/packages/gui/src/routes/+layout.svelte +++ b/packages/gui/src/routes/+layout.svelte @@ -24,7 +24,7 @@ {/if}
-
+
@@ -50,7 +50,8 @@ height: 100vh; overflow-y: scroll; } - @media screen and (min-width: 1215px) { + + @media screen and (min-width: 1440px) { figure { position: fixed; z-index: 0; @@ -60,10 +61,13 @@ bottom: 0px; background-image: url('/images/gui-background-grid.svg'); background-size: cover; - background-repeat: repeat; + background-repeat: repeat-y; + } + .content { + padding: 0vw 3.6vw !important; } } - @media screen and (max-width: 1215px) { + @media screen and (max-width: 1440px) { figure { position: fixed; z-index: 0; @@ -75,6 +79,9 @@ background-size: contain; background-repeat: repeat; } + .content { + padding: 0vw 3.33vw; + } } header { position: absolute; From 074521a417e089793f2f37dd5620d9a4d56233a0 Mon Sep 17 00:00:00 2001 From: Thomas Smith <49042513+tsmitty11@users.noreply.github.com> Date: Mon, 19 Dec 2022 16:04:56 -0500 Subject: [PATCH 08/15] Headers use Neue Machina --- packages/gui/src/app.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/gui/src/app.css b/packages/gui/src/app.css index c5791be..0c9f428 100644 --- a/packages/gui/src/app.css +++ b/packages/gui/src/app.css @@ -22,3 +22,10 @@ html { font-family: sono, sans-serif; } } + +.text-primary, +header, +h1,h2,h3,h4,h5,h6, +button{ + font-family: 'pp-neue-machina' !important; +} From e4930546df6fcd1815e7b7ebcbc3c01b3f22eb27 Mon Sep 17 00:00:00 2001 From: Thomas Smith <49042513+tsmitty11@users.noreply.github.com> Date: Mon, 19 Dec 2022 16:05:52 -0500 Subject: [PATCH 09/15] Run prettier --- packages/gui/src/app.css | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/gui/src/app.css b/packages/gui/src/app.css index 0c9f428..6982594 100644 --- a/packages/gui/src/app.css +++ b/packages/gui/src/app.css @@ -25,7 +25,12 @@ html { .text-primary, header, -h1,h2,h3,h4,h5,h6, -button{ +h1, +h2, +h3, +h4, +h5, +h6, +button { font-family: 'pp-neue-machina' !important; } From 24d2997f34b721cb979aa1297be35773c877420e Mon Sep 17 00:00:00 2001 From: Thomas Smith <49042513+tsmitty11@users.noreply.github.com> Date: Mon, 19 Dec 2022 16:39:24 -0500 Subject: [PATCH 10/15] featured image -> object fit > w/h --- packages/ui/src/Gallery/GalleryItem.svelte | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/ui/src/Gallery/GalleryItem.svelte b/packages/ui/src/Gallery/GalleryItem.svelte index 28e119f..64c35fc 100644 --- a/packages/ui/src/Gallery/GalleryItem.svelte +++ b/packages/ui/src/Gallery/GalleryItem.svelte @@ -31,8 +31,7 @@