|
3 | 3 | {{if .IsSigned}}
|
4 | 4 | {{if .NotificationUnreadCount}}{{$notificationUnreadCount = call .NotificationUnreadCount}}{{end}}
|
5 | 5 | {{end}}
|
6 |
| - <div class="item brand" style="justify-content: space-between;"> |
| 6 | + <div class="item brand sb"> |
7 | 7 | <a href="{{AppSubUrl}}/" aria-label="{{if .IsSigned}}{{.locale.Tr "dashboard"}}{{else}}{{.locale.Tr "home"}}{{end}}">
|
8 | 8 | <img width="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{.locale.Tr "logo"}}" aria-hidden="true">
|
9 | 9 | </a>
|
10 |
| - {{if .IsSigned}} |
11 |
| - <a href="{{AppSubUrl}}/notifications" class="tooltip mobile-only" data-content='{{.locale.Tr "notifications"}}'> |
12 |
| - <span class="text black"> |
13 |
| - <span class="fitted">{{svg "octicon-bell"}}</span> |
14 |
| - <span class="ui red label mini{{if not $notificationUnreadCount}} hidden{{end}} notification_count"> |
15 |
| - {{$notificationUnreadCount}} |
| 10 | + <div class="df ac"> |
| 11 | + {{if .IsSigned}} |
| 12 | + <a href="{{AppSubUrl}}/notifications" class="tooltip mobile-only mr-4 mt-3" data-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}"> |
| 13 | + <span class="fitted item"> |
| 14 | + {{svg "octicon-bell"}} |
| 15 | + <span class="notification_count{{if not $notificationUnreadCount}} hidden{{end}}"> |
| 16 | + {{$notificationUnreadCount}} |
| 17 | + </span> |
16 | 18 | </span>
|
17 |
| - </span> |
18 |
| - </a> |
19 |
| - {{end}} |
20 |
| - <div class="ui basic icon button mobile-only" id="navbar-expand-toggle"> |
21 |
| - <i class="sidebar icon"></i> |
| 19 | + </a> |
| 20 | + {{end}} |
| 21 | + <div class="ui icon button mobile-only" id="navbar-expand-toggle"> |
| 22 | + {{svg "octicon-three-bars"}} |
| 23 | + </div> |
22 | 24 | </div>
|
23 | 25 | </div>
|
24 | 26 |
|
|
78 | 80 | {{else if .IsSigned}}
|
79 | 81 | <div class="right stackable menu">
|
80 | 82 | {{if EnableTimetracking}}
|
81 |
| - <a class="active-stopwatch-trigger item ui label {{if not .ActiveStopwatch}}hidden{{end}}" href="{{.ActiveStopwatch.IssueLink}}"> |
82 |
| - <span class="text"> |
83 |
| - <span class="fitted item"> |
84 |
| - {{svg "octicon-stopwatch"}} |
85 |
| - <span class="red" style="position:absolute; right:-0.6em; top:-0.6em;">{{svg "octicon-dot-fill"}}</span> |
86 |
| - </span> |
| 83 | + <a class="active-stopwatch-trigger item ui mx-0{{if not .ActiveStopwatch}} hidden{{end}}" href="{{.ActiveStopwatch.IssueLink}}"> |
| 84 | + <span class="fitted relative"> |
| 85 | + {{svg "octicon-stopwatch"}} |
| 86 | + <span class="header-stopwatch-dot"></span> |
87 | 87 | <span class="sr-mobile-only">{{.locale.Tr "active_stopwatch"}}</span>
|
88 | 88 | </span>
|
89 | 89 | </a>
|
|
118 | 118 | </div>
|
119 | 119 | {{end}}
|
120 | 120 |
|
121 |
| - <a href="{{AppSubUrl}}/notifications" class="item tooltip not-mobile" data-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}"> |
122 |
| - <span class="text"> |
123 |
| - <span class="fitted">{{svg "octicon-bell"}}</span> |
124 |
| - <span class="ui red label {{if not $notificationUnreadCount}}hidden{{end}} notification_count"> |
| 121 | + <a href="{{AppSubUrl}}/notifications" class="item tooltip not-mobile mx-0" data-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}"> |
| 122 | + <span class="fitted item"> |
| 123 | + {{svg "octicon-bell"}} |
| 124 | + <span class="notification_count{{if not $notificationUnreadCount}} hidden{{end}}"> |
125 | 125 | {{$notificationUnreadCount}}
|
126 | 126 | </span>
|
127 | 127 | </span>
|
128 | 128 | </a>
|
129 | 129 |
|
130 |
| - <div class="ui dropdown jump item tooltip" data-content="{{.locale.Tr "create_new"}}"> |
| 130 | + <div class="ui dropdown jump item tooltip mx-0" data-content="{{.locale.Tr "create_new"}}"> |
131 | 131 | <span class="text">
|
132 | 132 | <span class="fitted">{{svg "octicon-plus"}}</span>
|
133 | 133 | <span class="sr-mobile-only">{{.locale.Tr "create_new"}}</span>
|
|
150 | 150 | </div><!-- end content create new menu -->
|
151 | 151 | </div><!-- end dropdown menu create new -->
|
152 | 152 |
|
153 |
| - <div class="ui dropdown jump item tooltip" tabindex="-1" data-content="{{.locale.Tr "user_profile_and_more"}}"> |
| 153 | + <div class="ui dropdown jump item tooltip mx-0" tabindex="-1" data-content="{{.locale.Tr "user_profile_and_more"}}"> |
154 | 154 | <span class="text">
|
155 | 155 | {{avatar .SignedUser 24 "tiny"}}
|
156 | 156 | <span class="sr-only">{{.locale.Tr "user_profile_and_more"}}</span>
|
|
0 commit comments