From 41ab13c14fdb30a53b88bfc5de7f9f19cb984325 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Thu, 11 Apr 2024 23:02:27 +0500 Subject: [PATCH] Various improvements to pages: notifications and subscriptions - fix rounding on /notifications/subscriptions - add navigation interconnectivity between notifications and subscriptions - use modern style for tabs - clearing notificatons: hide the whole form instead of div. It doesn't seem like its changed via JS? - replace issue-title-buttons and edit-buttons with universal top-right-buttons, get rid of tw-mr-0 helpers - repo issues: fix misalignments on mobile view --- templates/repo/issue/view_title.tmpl | 8 ++--- .../user/notification/notification_div.tmpl | 29 +++++++++++-------- .../notification_subscriptions.tmpl | 19 +++++++----- web_src/css/base.css | 12 ++++++++ web_src/css/repo.css | 20 +++++-------- 5 files changed, 53 insertions(+), 35 deletions(-) diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 3a5ba0f4a3..66afd49090 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -12,16 +12,16 @@ -
+
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}} - + {{end}} {{if not .Issue.IsPull}} - {{ctx.Locale.Tr "repo.issues.new"}} + {{ctx.Locale.Tr "repo.issues.new"}} {{end}}
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}} -
+
diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl index bf3b51ee3b..99da119901 100644 --- a/templates/user/notification/notification_div.tmpl +++ b/templates/user/notification/notification_div.tmpl @@ -1,8 +1,8 @@
{{$notificationUnreadCount := call .NotificationUnreadCount}} -
-
+
+
{{ctx.Locale.Tr "notification.unread"}}
{{$notificationUnreadCount}}
@@ -11,16 +11,21 @@ {{ctx.Locale.Tr "notification.read"}}
- {{if and (eq .Status 1)}} -
- {{$.CsrfTokenHtml}} -
- -
-
- {{end}} +
+ + {{ctx.Locale.Tr "notification.subscriptions"}} + + {{if and (eq .Status 1)}} +
+ {{$.CsrfTokenHtml}} +
+ +
+
+ {{end}} +
diff --git a/templates/user/notification/notification_subscriptions.tmpl b/templates/user/notification/notification_subscriptions.tmpl index a5a965ca52..0a3ae99b40 100644 --- a/templates/user/notification/notification_subscriptions.tmpl +++ b/templates/user/notification/notification_subscriptions.tmpl @@ -1,15 +1,20 @@ {{template "base/head" .}}
-
- - {{ctx.Locale.Tr "notification.subscriptions"}} - - - {{ctx.Locale.Tr "notification.watching"}} +
+
+ + {{ctx.Locale.Tr "notification.subscriptions"}} + + + {{ctx.Locale.Tr "notification.watching"}} + +
+ + {{ctx.Locale.Tr "notifications"}}
-
+
{{if eq .Status 1}}
diff --git a/web_src/css/base.css b/web_src/css/base.css index d7ef9598bd..06542c652e 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -246,6 +246,18 @@ h1.error-code { user-select: none; } +.top-right-buttons { + gap: 0.5rem; +} + +.top-right-buttons .ui.button { + margin-right: 0; +} + +.ui.partial.secondary.menu { + margin-bottom: 0; +} + a { color: var(--color-primary); cursor: pointer; diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 7c3839f498..3cb22bb00f 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -595,26 +595,18 @@ td .commit-summary { align-items: center; } -.repository.view.issue .issue-title-buttons, -.repository.view.issue .edit-buttons { +.repository.view.issue .top-right-buttons { display: flex; } -.issue-title-buttons { - gap: 0.5rem; -} - @media (max-width: 767.98px) { .repository.view.issue .issue-title { flex-direction: column; } - .repository.view.issue .issue-title-buttons, - .repository.view.issue .edit-buttons { + .repository.view.issue .top-right-buttons { width: 100%; - justify-content: space-between; - } - .repository.view.issue .edit-buttons { margin-top: .5rem; + justify-content: space-between; } .comment.form .issue-content-left .avatar { display: none; @@ -628,6 +620,10 @@ td .commit-summary { .comment.form .content .form::after { display: none; } + + .repository.view.issue .issue-title.edit-active h1 { + padding-right: 0; + } } .repository.view.issue .issue-title { @@ -645,7 +641,7 @@ td .commit-summary { font-size: 32px; line-height: 40px; margin: 0; - padding-right: 0.25rem; + padding-right: 0.5rem; min-height: var(--repo-header-issue-min-height); }