Skip to content

Commit 9dfdfe2

Browse files
authored
Remove conflicting CSS rules on notifications, improve notifications table (go-gitea#23565) (go-gitea#23621)
Backport go-gitea#23565 by @silverwind Dropdowns on `/notifications/subscriptions` before and after: <img width="157" alt="Screenshot 2023-03-18 at 20 37 12" src="https://user-images.githubusercontent.com/115237/226133906-e4ad6a0a-de24-4324-8e1d-94081d23fe85.png"> <img width="152" alt="Screenshot 2023-03-18 at 20 41 29" src="https://user-images.githubusercontent.com/115237/226134038-c3946c32-a424-4b92-ad15-890e1036cafe.png"> These selectors are meant to target the notification list which I improved: <img width="1145" alt="Screenshot 2023-03-19 at 01 52 11" src="https://user-images.githubusercontent.com/115237/226147907-1c35736a-4bc9-4698-9813-21a20a1d2106.png"> <img width="1148" alt="Screenshot 2023-03-19 at 01 54 17" src="https://user-images.githubusercontent.com/115237/226147920-626dbd84-11d3-48db-a177-6d808e3212c0.png">
1 parent 4439a68 commit 9dfdfe2

File tree

2 files changed

+17
-29
lines changed

2 files changed

+17
-29
lines changed

templates/user/notification/notification_div.tmpl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,26 @@
3535
{{$issue := .Issue}}
3636
{{$repo := .Repository}}
3737
<tr id="notification_{{.ID}}">
38-
<td class="collapsing" data-href="{{.Link}}">
38+
<td class="collapsing gt-pl-4" data-href="{{.Link}}">
3939
{{if eq .Status 3}}
40-
<span class="blue">{{svg "octicon-pin"}}</span>
40+
{{svg "octicon-pin" 16 "text blue"}}
4141
{{else if not $issue}}
42-
<span class="gray">{{svg "octicon-repo"}}</span>
42+
{{svg "octicon-repo" 16 "text grey"}}
4343
{{else if $issue.IsPull}}
4444
{{if $issue.IsClosed}}
4545
{{if $issue.GetPullRequest.HasMerged}}
46-
<span class="purple">{{svg "octicon-git-merge"}}</span>
46+
{{svg "octicon-git-merge" 16 "text purple"}}
4747
{{else}}
48-
<span class="red">{{svg "octicon-git-pull-request"}}</span>
48+
{{svg "octicon-git-pull-request" 16 "text red"}}
4949
{{end}}
5050
{{else}}
51-
<span class="green">{{svg "octicon-git-pull-request"}}</span>
51+
{{svg "octicon-git-pull-request" 16 "text green"}}
5252
{{end}}
5353
{{else}}
5454
{{if $issue.IsClosed}}
55-
<span class="red">{{svg "octicon-issue-closed"}}</span>
55+
{{svg "octicon-issue-closed" 16 "text red"}}
5656
{{else}}
57-
<span class="green">{{svg "octicon-issue-opened"}}</span>
57+
{{svg "octicon-issue-opened" 16 "text green"}}
5858
{{end}}
5959
{{end}}
6060
</td>

web_src/css/user.css

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -85,27 +85,6 @@
8585
padding: 8px 15px;
8686
}
8787

88-
.user.notification .svg {
89-
float: left;
90-
font-size: 2em;
91-
}
92-
93-
.user.notification .svg.green {
94-
color: var(--color-green);
95-
}
96-
97-
.user.notification .svg.red {
98-
color: var(--color-red);
99-
}
100-
101-
.user.notification .svg.purple {
102-
color: var(--color-purple);
103-
}
104-
105-
.user.notification .svg.blue {
106-
color: var(--color-blue);
107-
}
108-
10988
.user.notification .content {
11089
float: left;
11190
margin-left: 7px;
@@ -170,4 +149,13 @@
170149

171150
#notification_div .tab.segment {
172151
overflow-x: auto;
152+
padding: 0;
153+
}
154+
155+
#notification_div .menu .active.item {
156+
background: var(--color-box-body);
157+
}
158+
159+
#notification_table {
160+
border: none;
173161
}

0 commit comments

Comments
 (0)