From 253a00aaac6b17346927e42c709f3f96672caaf3 Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 21 Mar 2023 20:11:25 +0100 Subject: [PATCH] Remove conflicting CSS rules on notifications, improve notifications table (#23565) Dropdowns on `/notifications/subscriptions` before and after: Screenshot 2023-03-18 at 20 37 12 Screenshot 2023-03-18 at 20 41 29 These selectors are meant to target the notification list which I improved: Screenshot 2023-03-19 at 01 52 11 Screenshot 2023-03-19 at 01 54 17 --- .../user/notification/notification_div.tmpl | 16 +++++----- web_src/css/user.css | 30 ++++++------------- 2 files changed, 17 insertions(+), 29 deletions(-) diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl index c8db659c13..9a4fbe786e 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 a3379440df..8722181c29 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; @@ -175,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; }