diff options
author | silverwind <me@silverwind.io> | 2023-06-20 22:35:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-20 20:35:25 +0000 |
commit | e50c3e8431972a41fc9792939956c3281b1b4810 (patch) | |
tree | a96591babff24e625fecd81aad931b5bb6fc4556 /templates/base | |
parent | 54259dbf37f4a7f7d8865755484cbcad1c9ea8c0 (diff) | |
download | gitea-e50c3e8431972a41fc9792939956c3281b1b4810.tar.gz gitea-e50c3e8431972a41fc9792939956c3281b1b4810.zip |
Navbar styling rework (#25343)
- Extract navbar CSS to own file
- Reduce height from 52px to 50px
- Give every item a hover effect of of 36px, including the logo and on
mobile
- Consistent horizontal padding of 10px left and right
<img width="549" alt="Screenshot 2023-06-18 at 13 41 16"
src="https://github.com/go-gitea/gitea/assets/115237/0b00d101-253e-4b1f-9ee2-322d60fb2e26">
<img width="98" alt="Screenshot 2023-06-18 at 14 03 43"
src="https://github.com/go-gitea/gitea/assets/115237/4ef5d98b-4d1e-45de-822e-c2c844e19876">
<img width="234" alt="Screenshot 2023-06-18 at 14 03 18"
src="https://github.com/go-gitea/gitea/assets/115237/a4d9b04b-83de-42aa-a9ce-f010a9690688">
<img width="873" alt="Screenshot 2023-06-18 at 13 58 28"
src="https://github.com/go-gitea/gitea/assets/115237/8cb8e31e-2adf-40c8-ae3f-d00d011b4d1b">
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: Giteabot <teabot@gitea.io>
Diffstat (limited to 'templates/base')
-rw-r--r-- | templates/base/head_navbar.tmpl | 75 |
1 files changed, 38 insertions, 37 deletions
diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index e46e276ed0..3086e674fd 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -3,62 +3,63 @@ {{$notificationUnreadCount = call .NotificationUnreadCount}} {{end}} -<nav id="navbar" class="ui secondary stackable menu" aria-label="{{.locale.Tr "aria.navbar"}}"> - <div class="item"> +<nav id="navbar" aria-label="{{.locale.Tr "aria.navbar"}}"> + <div class="navbar-left ui secondary menu"> <!-- the logo --> - <a href="{{AppSubUrl}}/" aria-label="{{if .IsSigned}}{{.locale.Tr "dashboard"}}{{else}}{{.locale.Tr "home"}}{{end}}"> + <a class="item" id="navbar-logo" href="{{AppSubUrl}}/" aria-label="{{if .IsSigned}}{{.locale.Tr "dashboard"}}{{else}}{{.locale.Tr "home"}}{{end}}"> <img width="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{.locale.Tr "logo"}}" aria-hidden="true"> </a> <!-- mobile right menu, it must be here because in mobile view, each item is a flex column, the first item is a full row column --> - <div class="ui secondary menu navbar-mobile-right gt-gap-2"> + <div class="ui secondary menu item navbar-mobile-right gt-gap-2"> {{if .IsSigned}} - <a class="item gt-mx-0 gt-p-3" href="{{AppSubUrl}}/notifications" data-tooltip-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}"> + <a class="item mobile-right-item gt-mr-2 gt-p-3" href="{{AppSubUrl}}/notifications" data-tooltip-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}"> <div class="gt-relative"> {{svg "octicon-bell"}} <span class="notification_count{{if not $notificationUnreadCount}} gt-hidden{{end}}">{{$notificationUnreadCount}}</span> </div> </a> {{end}} - <button class="item ui icon mini button gt-p-3 gt-m-0" id="navbar-expand-toggle">{{svg "octicon-three-bars"}}</button> + <button class="item mobile-right-item ui icon mini button gt-p-3 gt-m-0" id="navbar-expand-toggle">{{svg "octicon-three-bars"}}</button> </div> - </div> - <!-- navbar links --> - {{if and .IsSigned .MustChangePassword}} - {{/* No links */}} - {{else if .IsSigned}} - {{if not .UnitIssuesGlobalDisabled}} - <a class="item{{if .PageIsIssues}} active{{end}}" href="{{AppSubUrl}}/issues">{{.locale.Tr "issues"}}</a> - {{end}} - {{if not .UnitPullsGlobalDisabled}} - <a class="item{{if .PageIsPulls}} active{{end}}" href="{{AppSubUrl}}/pulls">{{.locale.Tr "pull_requests"}}</a> - {{end}} - {{if not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled)}} - {{if .ShowMilestonesDashboardPage}} - <a class="item{{if .PageIsMilestonesDashboard}} active{{end}}" href="{{AppSubUrl}}/milestones">{{.locale.Tr "milestones"}}</a> + + <!-- navbar links non-mobile --> + {{if and .IsSigned .MustChangePassword}} + {{/* No links */}} + {{else if .IsSigned}} + {{if not .UnitIssuesGlobalDisabled}} + <a class="item{{if .PageIsIssues}} active{{end}}" href="{{AppSubUrl}}/issues">{{.locale.Tr "issues"}}</a> {{end}} + {{if not .UnitPullsGlobalDisabled}} + <a class="item{{if .PageIsPulls}} active{{end}}" href="{{AppSubUrl}}/pulls">{{.locale.Tr "pull_requests"}}</a> + {{end}} + {{if not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled)}} + {{if .ShowMilestonesDashboardPage}} + <a class="item{{if .PageIsMilestonesDashboard}} active{{end}}" href="{{AppSubUrl}}/milestones">{{.locale.Tr "milestones"}}</a> + {{end}} + {{end}} + <a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.locale.Tr "explore"}}</a> + {{else if .IsLandingPageOrganizations}} + <a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/organizations">{{.locale.Tr "explore"}}</a> + {{else}} + <a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.locale.Tr "explore"}}</a> {{end}} - <a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.locale.Tr "explore"}}</a> - {{else if .IsLandingPageOrganizations}} - <a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/organizations">{{.locale.Tr "explore"}}</a> - {{else}} - <a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.locale.Tr "explore"}}</a> - {{end}} - {{template "custom/extra_links" .}} + {{template "custom/extra_links" .}} - {{if not .IsSigned}} - <a class="item" target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io">{{.locale.Tr "help"}}</a> - {{end}} + {{if not .IsSigned}} + <a class="item" target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io">{{.locale.Tr "help"}}</a> + {{end}} + </div> <!-- the full dropdown menus --> - <div class="right menu"> + <div class="navbar-right ui secondary menu"> {{if and .IsSigned .MustChangePassword}} <div class="ui dropdown jump item" data-tooltip-content="{{.locale.Tr "user_profile_and_more"}}"> <span class="text gt-df gt-ac"> {{avatar $.Context .SignedUser 24 "gt-mr-2"}} - <span class="mobile-only gt-ml-2">{{.SignedUser.Name}}</span> + <span class="mobile-only gt-ml-3">{{.SignedUser.Name}}</span> <span class="not-mobile">{{svg "octicon-triangle-down"}}</span> </span> <div class="menu user-menu"> @@ -75,14 +76,14 @@ </div><!-- end dropdown avatar menu --> {{else if .IsSigned}} {{if EnableTimetracking}} - <a class="active-stopwatch-trigger item ui gt-mx-0{{if not .ActiveStopwatch}} gt-hidden{{end}}" href="{{.ActiveStopwatch.IssueLink}}" title="{{.locale.Tr "active_stopwatch"}}"> + <a class="active-stopwatch-trigger item gt-mx-0{{if not .ActiveStopwatch}} gt-hidden{{end}}" href="{{.ActiveStopwatch.IssueLink}}" title="{{.locale.Tr "active_stopwatch"}}"> <div class="gt-relative"> {{svg "octicon-stopwatch"}} <span class="header-stopwatch-dot"></span> </div> - <span class="mobile-only gt-ml-2">{{.locale.Tr "active_stopwatch"}}</span> + <span class="mobile-only gt-ml-3">{{.locale.Tr "active_stopwatch"}}</span> </a> - <div class="active-stopwatch-popup tippy-target gt-p-3"> + <div class="active-stopwatch-popup item tippy-target gt-p-3"> <div class="gt-df gt-ac"> <a class="stopwatch-link gt-df gt-ac" href="{{.ActiveStopwatch.IssueLink}}"> {{svg "octicon-issue-opened" 16 "gt-mr-3"}} @@ -111,7 +112,7 @@ </div> {{end}} - <a href="{{AppSubUrl}}/notifications" class="item not-mobile gt-mx-0" data-tooltip-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}"> + <a class="item not-mobile gt-mx-0" href="{{AppSubUrl}}/notifications" data-tooltip-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}"> <div class="gt-relative"> {{svg "octicon-bell"}} <span class="notification_count{{if not $notificationUnreadCount}} gt-hidden{{end}}">{{$notificationUnreadCount}}</span> @@ -144,7 +145,7 @@ <div class="ui dropdown jump item gt-mx-0 gt-pr-3" data-tooltip-content="{{.locale.Tr "user_profile_and_more"}}"> <span class="text gt-df gt-ac"> {{avatar $.Context .SignedUser 24 "gt-mr-2"}} - <span class="mobile-only gt-ml-2">{{.SignedUser.Name}}</span> + <span class="mobile-only gt-ml-3">{{.SignedUser.Name}}</span> <span class="not-mobile">{{svg "octicon-triangle-down"}}</span> </span> <div class="menu user-menu"> |