Various UI fixes (#14239)
* Fix #14238 * Fix #14235 * Fix #14237 * Fix #14234 * Use octicon to show private status of repo in admin dashboard * Fix #14232 * Fix #14236
This commit is contained in:
		
							parent
							
								
									4092c044e0
								
							
						
					
					
						commit
						21fbee1503
					
				
					 6 changed files with 31 additions and 8 deletions
				
			
		|  | @ -22,7 +22,6 @@ | ||||||
| 							{{.i18n.Tr "admin.repos.name"}} | 							{{.i18n.Tr "admin.repos.name"}} | ||||||
| 							{{SortArrow "alphabetically" "reversealphabetically" $.SortType false}} | 							{{SortArrow "alphabetically" "reversealphabetically" $.SortType false}} | ||||||
| 						</th> | 						</th> | ||||||
| 						<th>{{.i18n.Tr "admin.repos.private"}}</th> |  | ||||||
| 						<th>{{.i18n.Tr "admin.repos.watches"}}</th> | 						<th>{{.i18n.Tr "admin.repos.watches"}}</th> | ||||||
| 						<th  data-sortt-asc="moststars" data-sortt-desc="feweststars"> | 						<th  data-sortt-asc="moststars" data-sortt-desc="feweststars"> | ||||||
| 							{{.i18n.Tr "admin.repos.stars"}} | 							{{.i18n.Tr "admin.repos.stars"}} | ||||||
|  | @ -51,8 +50,12 @@ | ||||||
| 									<span class="text gold">{{svg "octicon-lock"}}</span> | 									<span class="text gold">{{svg "octicon-lock"}}</span> | ||||||
| 								{{end}} | 								{{end}} | ||||||
| 							</td> | 							</td> | ||||||
| 							<td><a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">{{.Name}}</a></td> | 							<td> | ||||||
| 							<td>{{if .IsPrivate}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td> | 								<a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">{{.Name}}</a> | ||||||
|  | 								{{if .IsPrivate}} | ||||||
|  | 									<span class="text gold">{{svg "octicon-lock"}}</span> | ||||||
|  | 								{{end}} | ||||||
|  | 							</td> | ||||||
| 							<td>{{.NumWatches}}</td> | 							<td>{{.NumWatches}}</td> | ||||||
| 							<td>{{.NumStars}}</td> | 							<td>{{.NumStars}}</td> | ||||||
| 							<td>{{.NumForks}}</td> | 							<td>{{.NumForks}}</td> | ||||||
|  |  | ||||||
|  | @ -12,7 +12,7 @@ | ||||||
| 					<span class="header"> | 					<span class="header"> | ||||||
| 						<a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}} | 						<a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}} | ||||||
| 						{{if .Visibility.IsPrivate}} | 						{{if .Visibility.IsPrivate}} | ||||||
| 							<span class="text gold">{{svg "octicon-lock"}}</span> | 							<span class="ui basic label">{{$.i18n.Tr "repo.desc.private"}}</span> | ||||||
| 						{{end}} | 						{{end}} | ||||||
| 					</span> | 					</span> | ||||||
| 					<div class="description"> | 					<div class="description"> | ||||||
|  |  | ||||||
|  | @ -15,7 +15,9 @@ | ||||||
| 						{{$.i18n.Tr "settings.revoke_key"}} | 						{{$.i18n.Tr "settings.revoke_key"}} | ||||||
| 					</button> | 					</button> | ||||||
| 				</div> | 				</div> | ||||||
|  | 				<div class="left floated content"> | ||||||
| 					{{svg "octicon-key"}} | 					{{svg "octicon-key"}} | ||||||
|  | 				</div> | ||||||
| 				<div class="content"> | 				<div class="content"> | ||||||
| 					<strong>{{$grant.Application.Name}}</strong> | 					<strong>{{$grant.Application.Name}}</strong> | ||||||
| 					<div class="activity meta"> | 					<div class="activity meta"> | ||||||
|  |  | ||||||
|  | @ -1556,10 +1556,13 @@ a.ui.label:hover { | ||||||
| .ui.button { | .ui.button { | ||||||
|   background: var(--color-button); |   background: var(--color-button); | ||||||
|   border: 1px solid var(--color-light-border); |   border: 1px solid var(--color-light-border); | ||||||
|   box-shadow: none !important; |  | ||||||
|   color: var(--color-text); |   color: var(--color-text); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | .page-content .ui.button { | ||||||
|  |   box-shadow: none !important; | ||||||
|  | } | ||||||
|  | 
 | ||||||
| .ui.button:hover { | .ui.button:hover { | ||||||
|   background: var(--color-hover); |   background: var(--color-hover); | ||||||
|   color: var(--color-text); |   color: var(--color-text); | ||||||
|  |  | ||||||
|  | @ -111,6 +111,7 @@ | ||||||
| 
 | 
 | ||||||
|     .issue.title { |     .issue.title { | ||||||
|       width: 80%; |       width: 80%; | ||||||
|  |       margin: 0 0 1em; | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     .push.news .content ul { |     .push.news .content ul { | ||||||
|  |  | ||||||
|  | @ -1475,7 +1475,7 @@ | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   .diff-box .header { |   .diff-box .header:not(.resolved-placeholder) { | ||||||
|     display: flex; |     display: flex; | ||||||
|     align-items: center; |     align-items: center; | ||||||
| 
 | 
 | ||||||
|  | @ -1493,6 +1493,15 @@ | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|  |   .diff-box .resolved-placeholder { | ||||||
|  |     display: flex; | ||||||
|  |     align-items: center; | ||||||
|  | 
 | ||||||
|  |     .button { | ||||||
|  |       padding: 8px 12px; | ||||||
|  |     } | ||||||
|  |   } | ||||||
|  | 
 | ||||||
|   .diff-file-box { |   .diff-file-box { | ||||||
|     margin-top: 1rem; |     margin-top: 1rem; | ||||||
|     margin-bottom: 1rem; |     margin-bottom: 1rem; | ||||||
|  | @ -2697,7 +2706,12 @@ tbody.commit-list { | ||||||
| 
 | 
 | ||||||
| .commit-body { | .commit-body { | ||||||
|   white-space: pre-wrap; |   white-space: pre-wrap; | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | .repository:not(.diff) { | ||||||
|  |   .commit-body { | ||||||
|     margin: 0; |     margin: 0; | ||||||
|  |   } | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| .git-notes.top { | .git-notes.top { | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue