diff options
author | silverwind <me@silverwind.io> | 2023-05-10 23:59:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-10 21:59:58 +0000 |
commit | f7ede92f82f7f3ec7bb31a1249f9524e5b728f34 (patch) | |
tree | df8db34ea83fc3489df90dbe8519a0ba37897104 /templates | |
parent | 23ae939ef3ef03848038372de21490725855b5f9 (diff) | |
download | gitea-f7ede92f82f7f3ec7bb31a1249f9524e5b728f34.tar.gz gitea-f7ede92f82f7f3ec7bb31a1249f9524e5b728f34.zip |
Notification list enhancements, fix striped tables on dark theme (#24639)
- Make code block rendering via backticks work
- Remove link color unless hovered
- Remove table stripes and fix stripes rendering on dark theme for other
tables
- Introduce new `button-link` class discussed previously for buttons
that look and act like links and apply it to the two right-side buttons
- Reduce box padding by 8px on each side
- Fix "Mark all read" button margin-right
- brighten `--color-markup-code-block` on arc-green
### Before
<img width="1216" alt="Screenshot 2023-05-10 at 20 00 30"
src="https://github.com/go-gitea/gitea/assets/115237/66da9ec2-dd09-4ef0-8f1d-1822a18b6b43">
<img width="1211" alt="Screenshot 2023-05-10 at 20 00 48"
src="https://github.com/go-gitea/gitea/assets/115237/f48e30a2-9a00-4723-93aa-79b97ca0ba0c">
### After
<img width="1222" alt="Screenshot 2023-05-10 at 20 09 59"
src="https://github.com/go-gitea/gitea/assets/115237/c956e0d0-b3d9-42a4-a3ed-f0431c22bf3f">
<img width="1218" alt="Screenshot 2023-05-10 at 20 05 34"
src="https://github.com/go-gitea/gitea/assets/115237/f72c1628-3961-4c28-9263-07cdf7531316">
Diffstat (limited to 'templates')
-rw-r--r-- | templates/repo/issue/list.tmpl | 4 | ||||
-rw-r--r-- | templates/repo/issue/milestone_issues.tmpl | 6 | ||||
-rw-r--r-- | templates/user/dashboard/navbar.tmpl | 2 | ||||
-rw-r--r-- | templates/user/notification/notification_div.tmpl | 20 |
4 files changed, 16 insertions, 16 deletions
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index a7311c2490..d739561d27 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -215,9 +215,9 @@ {{if not .Repository.IsArchived}} <!-- Action Button --> {{if .IsShowClosed}} - <button class="ui green active basic button issue-action" data-action="open" data-url="{{$.RepoLink}}/issues/status" style="margin-left: auto">{{.locale.Tr "repo.issues.action_open"}}</button> + <button class="ui green active basic button issue-action gt-ml-auto" data-action="open" data-url="{{$.RepoLink}}/issues/status">{{.locale.Tr "repo.issues.action_open"}}</button> {{else}} - <button class="ui red active basic button issue-action" data-action="close" data-url="{{$.RepoLink}}/issues/status" style="margin-left: auto">{{.locale.Tr "repo.issues.action_close"}}</button> + <button class="ui red active basic button issue-action gt-ml-auto" data-action="close" data-url="{{$.RepoLink}}/issues/status">{{.locale.Tr "repo.issues.action_close"}}</button> {{end}} <!-- Labels --> <div class="ui {{if not .Labels}}disabled{{end}} dropdown jump item"> diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index a1fc245887..82d2cac943 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -51,7 +51,7 @@ <div class="issue-list-toolbar-right"> <div class="ui secondary filter stackable menu labels"> <!-- Label --> - <div class="ui {{if not .Labels}}disabled{{end}} dropdown jump item label-filter" style="margin-left: auto"> + <div class="ui {{if not .Labels}}disabled{{end}} dropdown jump item label-filter gt-ml-auto"> <span class="text"> {{.locale.Tr "repo.issues.filter_label"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -153,9 +153,9 @@ <div class="ui secondary filter stackable menu"> <!-- Action Button --> {{if .IsShowClosed}} - <button class="ui green active basic button issue-action" data-action="open" data-url="{{$.RepoLink}}/issues/status" style="margin-left: auto">{{.locale.Tr "repo.issues.action_open"}}</button> + <button class="ui green active basic button issue-action gt-ml-auto" data-action="open" data-url="{{$.RepoLink}}/issues/status">{{.locale.Tr "repo.issues.action_open"}}</button> {{else}} - <button class="ui red active basic button issue-action" data-action="close" data-url="{{$.RepoLink}}/issues/status" style="margin-left: auto">{{.locale.Tr "repo.issues.action_close"}}</button> + <button class="ui red active basic button issue-action gt-ml-auto" data-action="close" data-url="{{$.RepoLink}}/issues/status">{{.locale.Tr "repo.issues.action_close"}}</button> {{end}} <!-- Labels --> <div class="ui {{if not .Labels}}disabled{{end}} dropdown jump item"> diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index 7703bbfb98..20b66b2ec3 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -78,7 +78,7 @@ {{if .ContextUser.IsOrganization}} <div class="right stackable menu"> - <a class="{{if .PageIsNews}}active {{end}}item" style="margin-left: auto" href="{{.ContextUser.DashboardLink}}{{if .Team}}/{{PathEscape .Team.Name}}{{end}}"> + <a class="{{if .PageIsNews}}active {{end}}item gt-ml-auto" href="{{.ContextUser.DashboardLink}}{{if .Team}}/{{PathEscape .Team.Name}}{{end}}"> {{svg "octicon-rss"}} {{.locale.Tr "activities"}} </a> {{if not .UnitIssuesGlobalDisabled}} diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl index 1ea34fe2a6..b8efd2433e 100644 --- a/templates/user/notification/notification_div.tmpl +++ b/templates/user/notification/notification_div.tmpl @@ -11,17 +11,17 @@ {{.locale.Tr "notification.read"}} </a> {{if and (eq .Status 1)}} - <form action="{{AppSubUrl}}/notifications/purge" method="POST" style="margin-left: auto;"> + <form class="gt-ml-auto" action="{{AppSubUrl}}/notifications/purge" method="POST"> {{$.CsrfTokenHtml}} <div class="{{if not $notificationUnreadCount}}gt-hidden{{end}}"> - <button class="ui mini button primary" title='{{$.locale.Tr "notification.mark_all_as_read"}}'> + <button class="ui mini button primary gt-mr-0" title='{{$.locale.Tr "notification.mark_all_as_read"}}'> {{svg "octicon-checklist"}} </button> </div> </form> {{end}} </div> - <div class="ui bottom attached active tab segment"> + <div class="ui bottom attached active tab segment gt-p-3"> {{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}} - <table class="ui unstackable striped very compact small selectable table" id="notification_table"> + <table class="ui unstackable very compact small table" id="notification_table"> <tbody> {{range $notification := .Notifications}} {{$issue := .Issue}} @@ -59,16 +59,16 @@ {{end}} </td> <td class="eleven wide"> - <a class="item" href="{{.Link}}"> + <a class="item issue-title muted" href="{{.Link}}"> {{if $issue}} - #{{$issue.Index}} - {{$issue.Title}} + #{{$issue.Index}} - {{$issue.Title | RenderEmoji $.Context | RenderCodeBlock}} {{else}} {{$repo.FullName}} {{end}} </a> </td> <td> - <a class="item" href="{{$repo.Link}}">{{$repo.FullName}}</a> + <a class="item muted" href="{{$repo.Link}}">{{$repo.FullName}}</a> </td> <td class="collapsing"> {{if ne .Status 3}} @@ -76,7 +76,7 @@ {{$.CsrfTokenHtml}} <input type="hidden" name="notification_id" value="{{.ID}}"> <input type="hidden" name="status" value="pinned"> - <button class="ui mini button" title='{{$.locale.Tr "notification.pin"}}' + <button class="ui mini button button-link" title='{{$.locale.Tr "notification.pin"}}' data-url="{{AppSubUrl}}/notifications/status" data-status="pinned" data-page="{{$.Page.Paginater.Current}}" @@ -94,7 +94,7 @@ <input type="hidden" name="notification_id" value="{{.ID}}"> <input type="hidden" name="status" value="read"> <input type="hidden" name="page" value="{{$.Page.Paginater.Current}}"> - <button class="ui mini button" title='{{$.locale.Tr "notification.mark_as_read"}}' + <button class="ui mini button button-link" title='{{$.locale.Tr "notification.mark_as_read"}}' data-url="{{AppSubUrl}}/notifications/status" data-status="read" data-page="{{$.Page.Paginater.Current}}" @@ -109,7 +109,7 @@ <input type="hidden" name="notification_id" value="{{.ID}}"> <input type="hidden" name="status" value="unread"> <input type="hidden" name="page" value="{{$.Page.Paginater.Current}}"> - <button class="ui mini button" title='{{$.locale.Tr "notification.mark_as_unread"}}' + <button class="ui mini button button-link" title='{{$.locale.Tr "notification.mark_as_unread"}}' data-url="{{AppSubUrl}}/notifications/status" data-status="unread" data-page="{{$.Page.Paginater.Current}}" |