Skip to content

Remove conflicting CSS rules on notifications, improve notifications table (#23565) #23621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 21, 2023
Merged

Remove conflicting CSS rules on notifications, improve notifications table (#23565) #23621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c21e929
Remove conflicting CSS rules on notifications, improve notifications …
silverwind Mar 21, 2023
5698f28
Merge branch 'release/v1.19' into backport-23565-v1.19
lafriks Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions templates/user/notification/notification_div.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,26 +35,26 @@
{{$issue := .Issue}}
{{$repo := .Repository}}
<tr id="notification_{{.ID}}">
<td class="collapsing" data-href="{{.Link}}">
<td class="collapsing gt-pl-4" data-href="{{.Link}}">
{{if eq .Status 3}}
<span class="blue">{{svg "octicon-pin"}}</span>
{{svg "octicon-pin" 16 "text blue"}}
{{else if not $issue}}
<span class="gray">{{svg "octicon-repo"}}</span>
{{svg "octicon-repo" 16 "text grey"}}
{{else if $issue.IsPull}}
{{if $issue.IsClosed}}
{{if $issue.GetPullRequest.HasMerged}}
<span class="purple">{{svg "octicon-git-merge"}}</span>
{{svg "octicon-git-merge" 16 "text purple"}}
{{else}}
<span class="red">{{svg "octicon-git-pull-request"}}</span>
{{svg "octicon-git-pull-request" 16 "text red"}}
{{end}}
{{else}}
<span class="green">{{svg "octicon-git-pull-request"}}</span>
{{svg "octicon-git-pull-request" 16 "text green"}}
{{end}}
{{else}}
{{if $issue.IsClosed}}
<span class="red">{{svg "octicon-issue-closed"}}</span>
{{svg "octicon-issue-closed" 16 "text red"}}
{{else}}
<span class="green">{{svg "octicon-issue-opened"}}</span>
{{svg "octicon-issue-opened" 16 "text green"}}
{{end}}
{{end}}
</td>
Expand Down
30 changes: 9 additions & 21 deletions web_src/css/user.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,27 +85,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;
Expand Down Expand Up @@ -170,4 +149,13 @@

#notification_div .tab.segment {
overflow-x: auto;
padding: 0;
}

#notification_div .menu .active.item {
background: var(--color-box-body);
}

#notification_table {
border: none;
}