* Adjust template for #20069 smallbell * Adjust notification Unread Count variable to global and count bell position with mobile * Adjust bell icon style * Adjust smallbell to middle * Avoid using inline styles * move notificationUnreadCount to a general code block, reduce changed lines * Solved conflicts Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: 6543 <6543@obermui.de>
This commit is contained in:
		
							parent
							
								
									2921d3c8c9
								
							
						
					
					
						commit
						c174bdc494
					
				| @ -1,8 +1,22 @@ | |||||||
| <div class="ui container" id="navbar"> | <div class="ui container" id="navbar"> | ||||||
|  | 	{{$notificationUnreadCount := 0}} | ||||||
|  | 	{{if .IsSigned}} | ||||||
|  | 		{{if .NotificationUnreadCount}}{{$notificationUnreadCount = call .NotificationUnreadCount}}{{end}} | ||||||
|  | 	{{end}} | ||||||
| 	<div class="item brand" style="justify-content: space-between;"> | 	<div class="item brand" style="justify-content: space-between;"> | ||||||
| 		<a href="{{AppSubUrl}}/" aria-label="{{if .IsSigned}}{{.locale.Tr "dashboard"}}{{else}}{{.locale.Tr "home"}}{{end}}"> | 		<a href="{{AppSubUrl}}/" aria-label="{{if .IsSigned}}{{.locale.Tr "dashboard"}}{{else}}{{.locale.Tr "home"}}{{end}}"> | ||||||
| 			<img class="ui mini image" width="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{.locale.Tr "logo"}}" aria-hidden="true"> | 			<img class="ui mini image" width="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{.locale.Tr "logo"}}" aria-hidden="true"> | ||||||
| 		</a> | 		</a> | ||||||
|  | 		{{if .IsSigned}} | ||||||
|  | 		<a href="{{AppSubUrl}}/notifications" class="tooltip mobile-only" data-content='{{.i18n.Tr "notifications"}}'> | ||||||
|  | 			<span class="text black"> | ||||||
|  | 				<span class="fitted">{{svg "octicon-bell"}}</span> | ||||||
|  | 				<span class="ui red label mini{{if not $notificationUnreadCount}} hidden{{end}} notification_count"> | ||||||
|  | 					{{$notificationUnreadCount}} | ||||||
|  | 				</span> | ||||||
|  | 			</span> | ||||||
|  | 		</a> | ||||||
|  | 		{{end}} | ||||||
| 		<div class="ui basic icon button mobile-only" id="navbar-expand-toggle"> | 		<div class="ui basic icon button mobile-only" id="navbar-expand-toggle"> | ||||||
| 			<i class="sidebar icon"></i> | 			<i class="sidebar icon"></i> | ||||||
| 		</div> | 		</div> | ||||||
| @ -100,12 +114,9 @@ | |||||||
| 				</div> | 				</div> | ||||||
| 			</div> | 			</div> | ||||||
| 
 | 
 | ||||||
| 			<a href="{{AppSubUrl}}/notifications" class="item tooltip" data-content='{{.locale.Tr "notifications"}}'> | 			<a href="{{AppSubUrl}}/notifications" class="item tooltip not-mobile" data-content='{{.locale.Tr "notifications"}}'> | ||||||
| 				<span class="text"> | 				<span class="text"> | ||||||
| 					<span class="fitted">{{svg "octicon-bell"}}</span> | 					<span class="fitted">{{svg "octicon-bell"}}</span> | ||||||
| 					<span class="sr-mobile-only">{{.locale.Tr "notifications"}}</span> |  | ||||||
| 					{{$notificationUnreadCount := 0}} |  | ||||||
| 					{{if .NotificationUnreadCount}}{{$notificationUnreadCount = call .NotificationUnreadCount}}{{end}} |  | ||||||
| 					<span class="ui red label {{if not $notificationUnreadCount}}hidden{{end}} notification_count"> | 					<span class="ui red label {{if not $notificationUnreadCount}}hidden{{end}} notification_count"> | ||||||
| 						{{$notificationUnreadCount}} | 						{{$notificationUnreadCount}} | ||||||
| 					</span> | 					</span> | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user