From 61a4a7568c86d7a7fd16f8930e96a258847a6dce Mon Sep 17 00:00:00 2001
From: arctic <arctic>
Date: Fri, 13 Jan 2023 10:33:40 -0800
Subject: [PATCH 01/10] improve video-chnl-info-pill styles

---
 css/poketube.css | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/css/poketube.css b/css/poketube.css
index c6d0566e..4cd9f79a 100644
--- a/css/poketube.css
+++ b/css/poketube.css
@@ -131,6 +131,16 @@ a {
   color: var(--text-link);
 }
 
+a.avatar {
+  height: 36px;
+  margin-left: 6px;
+  font-size: 0;
+}
+
+.video-chnl-info-pill > a:first-child {
+  margin-right: -8px;
+}
+
 .video > .info > .title {
   font-family: var(--text-font-primary);
   width: 10em;
@@ -260,7 +270,7 @@ a {
   font-family: Inter;
   clear: both;
   margin-top: 1.1em;
-  padding: 4.5px;
+  padding: 5px 0;
   background: #0009;
   margin-right: -13px;
   width: fit-content;
@@ -282,7 +292,7 @@ a {
   grid-area: buttons;
   display: flex;
   flex-direction: row;
-  column-gap: 3px;
+  column-gap: 6px;
   height: min-content;
   width: -moz-fit-content;
   width: fit-content;

From 561361211f250b76d207ac2f21e7bc4f55c93877 Mon Sep 17 00:00:00 2001
From: arctic <arctic>
Date: Fri, 13 Jan 2023 10:48:42 -0800
Subject: [PATCH 02/10] improve video-info-buttons spacing

---
 css/poketube.css | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/css/poketube.css b/css/poketube.css
index 4cd9f79a..b5eb6887 100644
--- a/css/poketube.css
+++ b/css/poketube.css
@@ -141,6 +141,19 @@ a.avatar {
   margin-right: -8px;
 }
 
+.video-info-buttons.pill > .engagement {
+  margin-right: 2px;
+}
+
+.video-info-buttons.pill > div:nth-child(2) > .new-button, .button-encryption {
+  margin-right: 4px;
+}
+
+/* div.button-encryption { */
+/* color: red !important; */
+/*   margin-right: 2px; */
+/* } */
+
 .video > .info > .title {
   font-family: var(--text-font-primary);
   width: 10em;

From 4d1855d5485e3a5153f245e519ccdbcc2d965279 Mon Sep 17 00:00:00 2001
From: arctic <arctic>
Date: Fri, 13 Jan 2023 10:51:16 -0800
Subject: [PATCH 03/10] fix loggedout-dropdown button cursor

---
 css/poketube.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/css/poketube.css b/css/poketube.css
index b5eb6887..8b7799d4 100644
--- a/css/poketube.css
+++ b/css/poketube.css
@@ -580,6 +580,10 @@ a.avatar {
   display: block;
 }
 
+label[for="loggedout-dropdown"] {
+cursor: pointer;
+}
+
 .new-button.engagement:hover {
   background-color: #0009;
 }

From 2c6e5ab3a99c405d57a7e8cd2ed516299f02103e Mon Sep 17 00:00:00 2001
From: arctic <arctic>
Date: Fri, 13 Jan 2023 17:44:21 -0800
Subject: [PATCH 04/10] remove commented style

---
 css/poketube.css | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/css/poketube.css b/css/poketube.css
index 8b7799d4..3f25a895 100644
--- a/css/poketube.css
+++ b/css/poketube.css
@@ -149,11 +149,6 @@ a.avatar {
   margin-right: 4px;
 }
 
-/* div.button-encryption { */
-/* color: red !important; */
-/*   margin-right: 2px; */
-/* } */
-
 .video > .info > .title {
   font-family: var(--text-font-primary);
   width: 10em;

From e5d5023af348254b80e5be7a948719563b67e20a Mon Sep 17 00:00:00 2001
From: arctic <arctic>
Date: Fri, 13 Jan 2023 17:45:26 -0800
Subject: [PATCH 05/10] fix indentation

---
 css/poketube.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/poketube.css b/css/poketube.css
index 3f25a895..8b7c5531 100644
--- a/css/poketube.css
+++ b/css/poketube.css
@@ -576,7 +576,7 @@ a.avatar {
 }
 
 label[for="loggedout-dropdown"] {
-cursor: pointer;
+  cursor: pointer;
 }
 
 .new-button.engagement:hover {

From 508d65e44c6ea35171a5436e16045bb51bfe7ea0 Mon Sep 17 00:00:00 2001
From: arctic <arctic>
Date: Fri, 13 Jan 2023 21:47:26 -0800
Subject: [PATCH 06/10] reduce spacing

---
 css/poketube.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/css/poketube.css b/css/poketube.css
index 8b7c5531..2c4287c1 100644
--- a/css/poketube.css
+++ b/css/poketube.css
@@ -146,7 +146,7 @@ a.avatar {
 }
 
 .video-info-buttons.pill > div:nth-child(2) > .new-button, .button-encryption {
-  margin-right: 4px;
+  margin-right: 2px;
 }
 
 .video > .info > .title {
@@ -300,7 +300,7 @@ a.avatar {
   grid-area: buttons;
   display: flex;
   flex-direction: row;
-  column-gap: 6px;
+  column-gap: 4px;
   height: min-content;
   width: -moz-fit-content;
   width: fit-content;

From 847fc607cd8dfcd893b4b36e22c9385709b628a8 Mon Sep 17 00:00:00 2001
From: arctic <arctic>
Date: Fri, 13 Jan 2023 21:47:36 -0800
Subject: [PATCH 07/10] fix landing button clickableness

---
 css/app.main.css | 7 +++++++
 html/landing.ejs | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/css/app.main.css b/css/app.main.css
index 1afd12b0..cf1547a5 100644
--- a/css/app.main.css
+++ b/css/app.main.css
@@ -51,6 +51,13 @@ a:not([href]):hover {
   text-decoration: none;
 }
 
+.channel-page > div:nth-child(3) {
+  position: relative;
+  top: 11.5em;
+  padding-bottom: 2em;
+  overflow: hidden;
+}
+
 .page-footer-section a,
 .page-footer-section p {
   color: #b2b4bf;
diff --git a/html/landing.ejs b/html/landing.ejs
index b7a1af78..d3e78ece 100644
--- a/html/landing.ejs
+++ b/html/landing.ejs
@@ -317,7 +317,7 @@ z-index: 10; /* Was 2 */"
       </div>
     </div>
     <div style="display: flex;justify-content: center;">
-           <img src="/css/product.svg" style="width: 25em;margin-top: 11.2em;transform: scale(1.3);margin-right: 1em;margin-bottom: 1em;">
+           <img src="/css/product.svg" style="width: 25em;transform: scale(1.3);margin-right: 1em;margin-bottom: 1em;">
          </div>
      </div>
 

From dbc19f036789f776c823e68a822f3e7d2a131854 Mon Sep 17 00:00:00 2001
From: arctic <arctic>
Date: Fri, 13 Jan 2023 22:08:00 -0800
Subject: [PATCH 08/10] add class + move changes to landing.ejs

---
 css/app.main.css |  7 -------
 html/landing.ejs | 13 +++++++++++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/css/app.main.css b/css/app.main.css
index cf1547a5..1afd12b0 100644
--- a/css/app.main.css
+++ b/css/app.main.css
@@ -51,13 +51,6 @@ a:not([href]):hover {
   text-decoration: none;
 }
 
-.channel-page > div:nth-child(3) {
-  position: relative;
-  top: 11.5em;
-  padding-bottom: 2em;
-  overflow: hidden;
-}
-
 .page-footer-section a,
 .page-footer-section p {
   color: #b2b4bf;
diff --git a/html/landing.ejs b/html/landing.ejs
index d3e78ece..2a1936dc 100644
--- a/html/landing.ejs
+++ b/html/landing.ejs
@@ -212,7 +212,16 @@ section#landing-page {
 font-stretch: ultra-expanded;
   font-weight: 1000;
 }
-   
+
+.product-container {
+  display: flex;
+  justify-content: center;
+  position: relative;
+  top: 11.5em;
+  padding-bottom: 2em;
+  overflow: hidden;
+}
+
 .btn-explore {
   padding: 20px;
   display: flex;
@@ -316,7 +325,7 @@ z-index: 10; /* Was 2 */"
         <a href="/discover" class="btn-explore">Discover Videos</a>
       </div>
     </div>
-    <div style="display: flex;justify-content: center;">
+    <div class="product-container">
            <img src="/css/product.svg" style="width: 25em;transform: scale(1.3);margin-right: 1em;margin-bottom: 1em;">
          </div>
      </div>

From f04160f5df482f9a5c46ac16d0cc52bcb3955c5f Mon Sep 17 00:00:00 2001
From: arctic <arctic>
Date: Fri, 13 Jan 2023 22:46:26 -0800
Subject: [PATCH 09/10] less hacky fix for spacing + new variable

---
 css/poketube.css   | 12 +++++-------
 css/watch.main.css |  2 +-
 html/poketube.ejs  |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/css/poketube.css b/css/poketube.css
index 2c4287c1..6c21f29b 100644
--- a/css/poketube.css
+++ b/css/poketube.css
@@ -73,6 +73,7 @@
   --ptd-margin-base: 4px;
   --ptd-avatar-size: 32px;
   --ptd-toolbar-height: 56px;
+  --ptd-button-spacing: 6px;
 
   /* margins */
   --ptd-margin-2x: 8px;
@@ -141,12 +142,9 @@ a.avatar {
   margin-right: -8px;
 }
 
-.video-info-buttons.pill > .engagement {
-  margin-right: 2px;
-}
-
-.video-info-buttons.pill > div:nth-child(2) > .new-button, .button-encryption {
-  margin-right: 2px;
+/* If the "Encryption duh" duplication bug is fixed, remove this rule. */
+.new-button.button-encryption + a[title="Encryption duh"] {
+  display: none;
 }
 
 .video > .info > .title {
@@ -300,7 +298,7 @@ a.avatar {
   grid-area: buttons;
   display: flex;
   flex-direction: row;
-  column-gap: 4px;
+  column-gap: var(--ptd-button-spacing);
   height: min-content;
   width: -moz-fit-content;
   width: fit-content;
diff --git a/css/watch.main.css b/css/watch.main.css
index 2ce77b98..e279af09 100644
--- a/css/watch.main.css
+++ b/css/watch.main.css
@@ -322,7 +322,7 @@ a.icon-button > img {
   color: var(--text-primary);
   justify-content: center;
   align-content: center;
-  column-gap: 4px;
+  column-gap: var(--ptd-button-spacing);
   text-decoration: none;
   height: 36px;
   line-height: 32px;
diff --git a/html/poketube.ejs b/html/poketube.ejs
index 8fca8233..63a994d7 100644
--- a/html/poketube.ejs
+++ b/html/poketube.ejs
@@ -596,7 +596,7 @@ display: block;" autoplay controls
                                                     
  <% if (!video.Channel.Name.endsWith(' - Topic')) { %> 
     <% if (!video.Title.endsWith('Audio)')) { %>                         
-      <div class="new-button button-lite" style=";margin-left: -4px;">
+      <div class="new-button button-lite">
         <a title="Low Bandwidth? try PokeTube Lite!" style="color:var(--text-color);text-decoration: none" href="/lite?v=<%=video.id%>">
                                         <div class="pill-button">
 

From 6dcd172df8855d8d63f5047a105d279085f1404e Mon Sep 17 00:00:00 2001
From: arctic <arctic>
Date: Fri, 13 Jan 2023 23:01:18 -0800
Subject: [PATCH 10/10] fix flag/text vertical alignment

---
 html/landing.ejs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/landing.ejs b/html/landing.ejs
index 2a1936dc..edca9255 100644
--- a/html/landing.ejs
+++ b/html/landing.ejs
@@ -262,13 +262,13 @@ font-stretch: ultra-expanded;
   margin-block-end: 1em;
   margin-inline-start: 0;
   margin-inline-end: 0;
-  margin-top: 0;
+  margin-top: 1rem;
   margin-bottom: 1rem;
+  margin-left: 0.2rem;
  font-family: Whitney, Helvetica Neue, Helvetica, Arial, sans-serif;
 font-weight: 400;
  font-size: 16px;
 line-height: 24px;
-margin-top: 12px;
 z-index: 10; /* Was 2 */"
    }
       </style>