From 9a0494eaac909c348edbf965d4ebc0b203b5360c Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Wed, 20 Mar 2024 18:18:34 +0100
Subject: [PATCH 1/4] Add background to dashboard navbar, fix missing padding

---
 templates/user/dashboard/navbar.tmpl | 2 +-
 web_src/css/base.css                 | 3 ++-
 web_src/css/dashboard.css            | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl
index 480c39e8bf260..b2482db13e6f3 100644
--- a/templates/user/dashboard/navbar.tmpl
+++ b/templates/user/dashboard/navbar.tmpl
@@ -3,7 +3,7 @@
 		<div class="item">
 			<div class="ui floating dropdown jump">
 				<span class="text truncated-item-container">
-					{{ctx.AvatarUtils.Avatar .ContextUser}}
+					{{ctx.AvatarUtils.Avatar .ContextUser 24}}
 					<span class="truncated-item-name">{{.ContextUser.ShortName 40}}</span>
 					<span class="org-visibility">
 						{{if .ContextUser.Visibility.IsLimited}}<div class="ui basic tiny horizontal label">{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}}
diff --git a/web_src/css/base.css b/web_src/css/base.css
index fdfbea610b8de..2d33774212562 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -669,7 +669,8 @@ img.ui.avatar,
 }
 
 .page-content.new:is(.repo,.migrate,.org),
-.page-content.profile:is(.user,.organization) {
+.page-content.profile:is(.user,.organization),
+.page-content.user:is(.settings,.notification) {
   padding-top: 15px;
 }
 
diff --git a/web_src/css/dashboard.css b/web_src/css/dashboard.css
index 140cd2e4bf644..e9f6be20c6e9e 100644
--- a/web_src/css/dashboard.css
+++ b/web_src/css/dashboard.css
@@ -78,7 +78,8 @@
 }
 
 .dashboard .dashboard-navbar {
-  padding: 4px 12px;
+  padding: 0 12px;
+  background: var(--color-header-wrapper);
 }
 
 .dashboard .dashboard-navbar .org-visibility .label {

From 597b39398882ed7d130686568ad08ddeaa20ae74 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Wed, 20 Mar 2024 18:55:07 +0100
Subject: [PATCH 2/4] margin tweaks

---
 templates/user/dashboard/navbar.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl
index b2482db13e6f3..917e024a6f9b0 100644
--- a/templates/user/dashboard/navbar.tmpl
+++ b/templates/user/dashboard/navbar.tmpl
@@ -3,13 +3,13 @@
 		<div class="item">
 			<div class="ui floating dropdown jump">
 				<span class="text truncated-item-container">
-					{{ctx.AvatarUtils.Avatar .ContextUser 24}}
+					{{ctx.AvatarUtils.Avatar .ContextUser 24 "tw-mr-1"}}
 					<span class="truncated-item-name">{{.ContextUser.ShortName 40}}</span>
 					<span class="org-visibility">
 						{{if .ContextUser.Visibility.IsLimited}}<div class="ui basic tiny horizontal label">{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}}
 						{{if .ContextUser.Visibility.IsPrivate}}<div class="ui basic tiny horizontal label">{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}</div>{{end}}
 					</span>
-					{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+					{{svg "octicon-triangle-down" 14 "dropdown icon tw-ml-1"}}
 				</span>
 				<div class="context user overflow menu">
 					<div class="ui header">

From 70c87f5d34500f825f07ce87d6fae25007518696 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Wed, 20 Mar 2024 19:03:18 +0100
Subject: [PATCH 3/4] pixel tweaks

---
 web_src/css/base.css      | 2 +-
 web_src/css/dashboard.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web_src/css/base.css b/web_src/css/base.css
index 2d33774212562..58332fb21c44c 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -1797,7 +1797,7 @@ table th[data-sortt-desc] .svg {
 
 .ui.tabular.menu .item,
 .ui.secondary.pointing.menu .item {
-  padding: 11px 12px !important;
+  padding: 11.55px 12px !important; /* match .dashboard-navbar in height */
   color: var(--color-text-light-2);
 }
 
diff --git a/web_src/css/dashboard.css b/web_src/css/dashboard.css
index e9f6be20c6e9e..74e4385344977 100644
--- a/web_src/css/dashboard.css
+++ b/web_src/css/dashboard.css
@@ -78,7 +78,7 @@
 }
 
 .dashboard .dashboard-navbar {
-  padding: 0 12px;
+  padding: 1px 12px; /* match overflow-menu in height */
   background: var(--color-header-wrapper);
 }
 

From 3a56151ffb1d4041ff6d71177c5384753a81c9d3 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Wed, 20 Mar 2024 19:05:27 +0100
Subject: [PATCH 4/4] fix comment

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

diff --git a/web_src/css/dashboard.css b/web_src/css/dashboard.css
index 74e4385344977..0fa81b1c2a883 100644
--- a/web_src/css/dashboard.css
+++ b/web_src/css/dashboard.css
@@ -78,7 +78,7 @@
 }
 
 .dashboard .dashboard-navbar {
-  padding: 1px 12px; /* match overflow-menu in height */
+  padding: 1px 12px; /* match .overflow-menu-items in height */
   background: var(--color-header-wrapper);
 }