From 4f52b1a996f643612a35609f936a54993b598671 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 18 Mar 2023 20:40:17 +0100 Subject: [PATCH 1/3] Remove conflicting/unnecessary CSS rules on notifications --- web_src/css/user.css | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/web_src/css/user.css b/web_src/css/user.css index a3379440dfe66..a5062b67f4678 100644 --- a/web_src/css/user.css +++ b/web_src/css/user.css @@ -90,27 +90,6 @@ padding: 8px 15px; } -.user.notification .svg { - float: left; - font-size: 2em; -} - -.user.notification .svg.green { - color: var(--color-green); -} - -.user.notification .svg.red { - color: var(--color-red); -} - -.user.notification .svg.purple { - color: var(--color-purple); -} - -.user.notification .svg.blue { - color: var(--color-blue); -} - .user.notification .content { float: left; margin-left: 7px; From a96728aaf804627418b82269706562ef94a9228c Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 19 Mar 2023 01:52:30 +0100 Subject: [PATCH 2/3] Improve notifications table --- .../user/notification/notification_div.tmpl | 16 ++++++++-------- web_src/css/user.css | 9 +++++++++ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl index c8db659c13ea4..9a4fbe786eab9 100644 --- a/templates/user/notification/notification_div.tmpl +++ b/templates/user/notification/notification_div.tmpl @@ -35,26 +35,26 @@ {{$issue := .Issue}} {{$repo := .Repository}} - + {{if eq .Status 3}} - {{svg "octicon-pin"}} + {{svg "octicon-pin" 16 "text blue"}} {{else if not $issue}} - {{svg "octicon-repo"}} + {{svg "octicon-repo" 16 "text grey"}} {{else if $issue.IsPull}} {{if $issue.IsClosed}} {{if $issue.GetPullRequest.HasMerged}} - {{svg "octicon-git-merge"}} + {{svg "octicon-git-merge" 16 "text purple"}} {{else}} - {{svg "octicon-git-pull-request"}} + {{svg "octicon-git-pull-request" 16 "text red"}} {{end}} {{else}} - {{svg "octicon-git-pull-request"}} + {{svg "octicon-git-pull-request" 16 "text green"}} {{end}} {{else}} {{if $issue.IsClosed}} - {{svg "octicon-issue-closed"}} + {{svg "octicon-issue-closed" 16 "text red"}} {{else}} - {{svg "octicon-issue-opened"}} + {{svg "octicon-issue-opened" 16 "text green"}} {{end}} {{end}} diff --git a/web_src/css/user.css b/web_src/css/user.css index a5062b67f4678..5d61f3a8d7036 100644 --- a/web_src/css/user.css +++ b/web_src/css/user.css @@ -154,4 +154,13 @@ #notification_div .tab.segment { overflow-x: auto; + padding: 0; +} + +#notification_div .menu .active.item { + background: var(--color-box-body); +} + +#notification_table { + border: none !important; } From 38538cc111d2ab4aa892c067353d8f517c28db64 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 19 Mar 2023 02:01:52 +0100 Subject: [PATCH 3/3] remove unnecessary !important --- web_src/css/user.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/user.css b/web_src/css/user.css index 5d61f3a8d7036..8722181c29071 100644 --- a/web_src/css/user.css +++ b/web_src/css/user.css @@ -162,5 +162,5 @@ } #notification_table { - border: none !important; + border: none; }