From d0bbe4df880fae78bfa7880875cf369979ad17bc Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 10 May 2023 20:00:58 +0200 Subject: [PATCH 1/7] Notification list enhancements --- .../user/notification/notification_div.tmpl | 16 ++++++++-------- web_src/css/base.css | 15 +++++++++++++++ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl index 1ea34fe2a68dd..50d1830001d2a 100644 --- a/templates/user/notification/notification_div.tmpl +++ b/templates/user/notification/notification_div.tmpl @@ -21,7 +21,7 @@ {{end}} -
+
{{if eq (len .Notifications) 0}} {{if eq .Status 1}} {{.locale.Tr "notification.no_unread"}} @@ -29,7 +29,7 @@ {{.locale.Tr "notification.no_read"}} {{end}} {{else}} - +
{{range $notification := .Notifications}} {{$issue := .Issue}} @@ -59,16 +59,16 @@ {{end}}
- + {{if $issue}} - #{{$issue.Index}} - {{$issue.Title}} + #{{$issue.Index}} - {{$issue.Title | RenderEmoji $.Context | RenderCodeBlock}} {{else}} {{$repo.FullName}} {{end}} - {{$repo.FullName}} + {{$repo.FullName}} {{if ne .Status 3}} @@ -76,7 +76,7 @@ {{$.CsrfTokenHtml}} - From 95e7983ce7e6201d3407e5894e511a176ce19a80 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 10 May 2023 20:09:39 +0200 Subject: [PATCH 3/7] brighten color-markup-code-block on arc-green --- web_src/css/themes/theme-arc-green.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/themes/theme-arc-green.css b/web_src/css/themes/theme-arc-green.css index 42cde81802969..84007d2e2dfe5 100644 --- a/web_src/css/themes/theme-arc-green.css +++ b/web_src/css/themes/theme-arc-green.css @@ -151,7 +151,7 @@ --color-menu: #2e323e; --color-card: #2e323e; --color-markup-table-row: #ffffff06; - --color-markup-code-block: #ffffff0d; + --color-markup-code-block: #ffffff16; --color-button: #353846; --color-code-bg: #2a2e3a; --color-code-sidebar-bg: #2e323e; From f5c46f165c4c8bd50b0d0944663d6aabd29bf057 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 10 May 2023 20:35:04 +0200 Subject: [PATCH 4/7] add margin helpers and replace all instances of inline margin-left: auto --- templates/repo/issue/list.tmpl | 4 ++-- templates/repo/issue/milestone_issues.tmpl | 6 +++--- templates/user/dashboard/navbar.tmpl | 2 +- templates/user/notification/notification_div.tmpl | 2 +- web_src/css/helpers.css | 8 ++++++++ 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index a7311c249033b..d739561d27900 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -215,9 +215,9 @@ {{if not .Repository.IsArchived}} {{if .IsShowClosed}} - + {{else}} - + {{end}}
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index a1fc24588733a..82d2cac94348c 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -51,7 +51,7 @@
-
+
{{.locale.Tr "repo.issues.filter_label"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -153,9 +153,9 @@
{{if .IsShowClosed}} - + {{else}} - + {{end}}
diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index 7703bbfb98ce8..20b66b2ec3791 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -78,7 +78,7 @@ {{if .ContextUser.IsOrganization}}
- + {{svg "octicon-rss"}} {{.locale.Tr "activities"}} {{if not .UnitIssuesGlobalDisabled}} diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl index d49c682cd86ed..b8efd2433e8c8 100644 --- a/templates/user/notification/notification_div.tmpl +++ b/templates/user/notification/notification_div.tmpl @@ -11,7 +11,7 @@ {{.locale.Tr "notification.read"}} {{if and (eq .Status 1)}} - + {{$.CsrfTokenHtml}}