diff options
| author | 0ko <0ko@noreply.codeberg.org> | 2025-01-13 09:28:06 +0100 |
|---|---|---|
| committer | Otto <otto@codeberg.org> | 2025-01-13 09:28:06 +0100 |
| commit | 2ff408c8c803353ba731e49379f9d700f2d103f8 (patch) | |
| tree | be45ab30fde4fa90be781f6c05e5c16f14da6a8e | |
| parent | Fix minor misalignment (#6541) (diff) | |
| download | forgejo-2ff408c8c803353ba731e49379f9d700f2d103f8.tar.xz forgejo-2ff408c8c803353ba731e49379f9d700f2d103f8.zip | |
Apply switch redesign to more areas (#6542)
[skip ci] no relevant tests
Followup to https://codeberg.org/forgejo/forgejo/pulls/6459.
This PR applies the new switch design to areas where it is simple to apply and no other interventions are needed other than switching classes.
Also, added back the utility class `list-header-toggle` to a few places where it was removed in https://codeberg.org/forgejo/forgejo/pulls/6459. It is used for item reordering on smaller screens and it isn't actually needed in those areas (does nothing because of too wide elements), but it wasn't supposed to be removed.
The affected areas also include the menus in notifications. This is a followup to https://codeberg.org/forgejo/forgejo/pulls/3175 which should make the unchosen item look more obviously as an interactive element.
## Preview
|Area|Before|After|
|-|-|-|
|`projects/list.tmpl`|||
|`repo/issue/navbar.tmp`||No visible change|
|`repo/issue/openclose.tmpl`||No visible change|
|`.../dashboard/issues.tmpl`|||
|`.../dashboard/milestones.tmpl`|||
|`.../notification_div.tmpl`|||
|`.../notification_subscriptions.tmpl`|||
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6542
Reviewed-by: Otto <otto@codeberg.org>
Co-authored-by: 0ko <0ko@noreply.codeberg.org>
Co-committed-by: 0ko <0ko@noreply.codeberg.org>
| -rw-r--r-- | templates/projects/list.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/issue/navbar.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/issue/openclose.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/dashboard/issues.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/dashboard/milestones.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/notification/notification_div.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/notification/notification_subscriptions.tmpl | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index b892cff996..5da2757748 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -1,6 +1,6 @@ {{if and $.CanWriteProjects (not $.Repository.IsArchived)}} <div class="tw-flex tw-justify-between tw-mb-4"> - <div class="small-menu-items ui compact tiny menu list-header-toggle"> + <div class="switch list-header-toggle"> <a class="item{{if not .IsShowClosed}} active{{end}}" href="?state=open&q={{$.Keyword}}"> {{svg "octicon-project-symlink" 16 "tw-mr-2"}} {{ctx.Locale.PrettyNumber .OpenCount}} {{ctx.Locale.Tr "repo.issues.open_title"}} diff --git a/templates/repo/issue/navbar.tmpl b/templates/repo/issue/navbar.tmpl index 8310d3a33f..4874bf2ad4 100644 --- a/templates/repo/issue/navbar.tmpl +++ b/templates/repo/issue/navbar.tmpl @@ -1,4 +1,4 @@ -<div class="switch"> +<div class="switch list-header-toggle"> <a class="{{if .PageIsLabels}}active {{end}}item" href="{{.RepoLink}}/labels">{{ctx.Locale.Tr "repo.labels"}}</a> <a class="{{if .PageIsMilestones}}active {{end}}item" href="{{.RepoLink}}/milestones">{{ctx.Locale.Tr "repo.milestones"}}</a> </div> diff --git a/templates/repo/issue/openclose.tmpl b/templates/repo/issue/openclose.tmpl index efe4fa6756..d93c7e01f5 100644 --- a/templates/repo/issue/openclose.tmpl +++ b/templates/repo/issue/openclose.tmpl @@ -1,4 +1,4 @@ -<div class="switch"> +<div class="switch list-header-toggle"> <a class="{{if eq .State "open"}}active {{end}}item" href="{{.OpenLink}}" data-test-name="open-issue-count"> {{if .PageIsMilestones}} {{svg "octicon-milestone" 16 "tw-mr-2"}} diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 09d282b029..2039bf44e3 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -4,7 +4,7 @@ <div class="ui container"> {{template "base/alert" .}} <div class="list-header"> - <div class="small-menu-items ui compact tiny menu list-header-toggle"> + <div class="switch list-header-toggle"> <a class="item{{if not .IsShowClosed}} active{{end}}" href="?type={{$.ViewType}}&sort={{$.SortType}}&state=open&labels={{.SelectLabels}}&q={{$.Keyword}}&fuzzy={{.IsFuzzy}}"> {{svg "octicon-issue-opened" 16 "tw-mr-2"}} {{ctx.Locale.PrettyNumber .IssueStats.OpenCount}} {{ctx.Locale.Tr "repo.issues.open_title"}} diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 6b315eccd3..3d046110ae 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -35,7 +35,7 @@ </div> <div class="flex-container-main content"> <div class="list-header"> - <div class="small-menu-items ui compact tiny menu list-header-toggle"> + <div class="switch list-header-toggle"> <a class="item{{if not .IsShowClosed}} active{{end}}" href="?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=open&q={{$.Keyword}}"> {{svg "octicon-milestone" 16 "tw-mr-2"}} {{ctx.Locale.PrettyNumber .MilestoneStats.OpenCount}} {{ctx.Locale.Tr "repo.issues.open_title"}} diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl index bf6a94410d..3340c83e63 100644 --- a/templates/user/notification/notification_div.tmpl +++ b/templates/user/notification/notification_div.tmpl @@ -2,7 +2,7 @@ <div class="ui container"> {{$notificationUnreadCount := call .NotificationUnreadCount}} <div class="tw-flex tw-items-center tw-justify-between tw-mb-4"> - <div class="ui secondary partial menu"> + <div class="switch"> <a class="{{if eq .Status 1}}active {{end}}item" href="{{AppSubUrl}}/notifications?q=unread"> {{ctx.Locale.Tr "notification.unread"}} <div class="notifications-unread-count ui label {{if not $notificationUnreadCount}}tw-hidden{{end}}">{{$notificationUnreadCount}}</div> diff --git a/templates/user/notification/notification_subscriptions.tmpl b/templates/user/notification/notification_subscriptions.tmpl index 0a3ae99b40..0b8193f797 100644 --- a/templates/user/notification/notification_subscriptions.tmpl +++ b/templates/user/notification/notification_subscriptions.tmpl @@ -2,7 +2,7 @@ <div role="main" aria-label="{{.Title}}" class="page-content user notification"> <div class="ui container"> <div class="tw-flex tw-items-center tw-justify-between tw-mb-4"> - <div class="ui secondary partial menu"> + <div class="switch"> <a href="{{AppSubUrl}}/notifications/subscriptions" class="{{if eq .Status 1}}active {{end}}item"> {{ctx.Locale.Tr "notification.subscriptions"}} </a> |