Comment Header fixes (#13356)
Apply more flexboxes on comment header and remove float hacks. Needs 1.13 backport. Fixes: https://github.com/go-gitea/gitea/issues/13316 Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
		
							parent
							
								
									d01d39d6cf
								
							
						
					
					
						commit
						0e6bf7e4c9
					
				
					 4 changed files with 43 additions and 65 deletions
				
			
		|  | @ -21,6 +21,7 @@ | ||||||
| 			{{end}} | 			{{end}} | ||||||
| 				<div class="content"> | 				<div class="content"> | ||||||
| 					<div class="ui top attached header"> | 					<div class="ui top attached header"> | ||||||
|  | 						<div class="header-left df ac"> | ||||||
| 							{{if .Issue.OriginalAuthor }} | 							{{if .Issue.OriginalAuthor }} | ||||||
| 								<span class="text black"> | 								<span class="text black"> | ||||||
| 									<i class="fa {{MigrationIcon .Repository.GetOriginalURLHostname}}" aria-hidden="true"></i> | 									<i class="fa {{MigrationIcon .Repository.GetOriginalURLHostname}}" aria-hidden="true"></i> | ||||||
|  | @ -38,8 +39,9 @@ | ||||||
| 									{{.i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe}} | 									{{.i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe}} | ||||||
| 								</span> | 								</span> | ||||||
| 							{{end}} | 							{{end}} | ||||||
|  | 						</div> | ||||||
|  | 						<div class="header-right actions df ac"> | ||||||
| 							{{if not $.Repository.IsArchived}} | 							{{if not $.Repository.IsArchived}} | ||||||
| 							<div class="ui right actions"> |  | ||||||
| 								{{if gt .Issue.ShowTag 0}} | 								{{if gt .Issue.ShowTag 0}} | ||||||
| 									<div class="ui basic label"> | 									<div class="ui basic label"> | ||||||
| 										{{if eq .Issue.ShowTag 2}} | 										{{if eq .Issue.ShowTag 2}} | ||||||
|  | @ -51,9 +53,9 @@ | ||||||
| 								{{end}} | 								{{end}} | ||||||
| 								{{template "repo/issue/view_content/add_reaction" Dict "ctx" $ "ActionURL" (Printf "%s/issues/%d/reactions" $.RepoLink .Issue.Index)}} | 								{{template "repo/issue/view_content/add_reaction" Dict "ctx" $ "ActionURL" (Printf "%s/issues/%d/reactions" $.RepoLink .Issue.Index)}} | ||||||
| 								{{template "repo/issue/view_content/context_menu" Dict "ctx" $ "item" .Issue "delete" false "diff" false "IsCommentPoster" $.IsIssuePoster}} | 								{{template "repo/issue/view_content/context_menu" Dict "ctx" $ "item" .Issue "delete" false "diff" false "IsCommentPoster" $.IsIssuePoster}} | ||||||
| 							</div> |  | ||||||
| 							{{end}} | 							{{end}} | ||||||
| 						</div> | 						</div> | ||||||
|  | 					</div> | ||||||
| 					<div class="ui attached segment"> | 					<div class="ui attached segment"> | ||||||
| 						<div class="render-content markdown"> | 						<div class="render-content markdown"> | ||||||
| 							{{if .Issue.RenderedContent}} | 							{{if .Issue.RenderedContent}} | ||||||
|  |  | ||||||
|  | @ -20,13 +20,15 @@ | ||||||
| 		{{end}} | 		{{end}} | ||||||
| 			<div class="content"> | 			<div class="content"> | ||||||
| 				<div class="ui top attached header"> | 				<div class="ui top attached header"> | ||||||
|  | 					<div class="header-left df ac"> | ||||||
| 						{{if .OriginalAuthor }} | 						{{if .OriginalAuthor }} | ||||||
| 							<span class="text black"><i class="fa {{MigrationIcon $.Repository.GetOriginalURLHostname}}" aria-hidden="true"></i> {{ .OriginalAuthor }}</span><span class="text grey"> {{$.i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe}} {{if $.Repository.OriginalURL}}</span><span class="text migrate">({{$.i18n.Tr "repo.migrated_from" $.Repository.OriginalURL $.Repository.GetOriginalURLHostname | Safe }}){{end}}</span> | 							<span class="text black"><i class="fa {{MigrationIcon $.Repository.GetOriginalURLHostname}}" aria-hidden="true"></i> {{ .OriginalAuthor }}</span><span class="text grey"> {{$.i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe}} {{if $.Repository.OriginalURL}}</span><span class="text migrate">({{$.i18n.Tr "repo.migrated_from" $.Repository.OriginalURL $.Repository.GetOriginalURLHostname | Safe }}){{end}}</span> | ||||||
| 						{{else}} | 						{{else}} | ||||||
| 							<span class="text grey"><a class="author"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.GetDisplayName}}</a> {{$.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}}</span> | 							<span class="text grey"><a class="author"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.GetDisplayName}}</a> {{$.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}}</span> | ||||||
| 						{{end}} | 						{{end}} | ||||||
|  | 					</div> | ||||||
|  | 					<div class="header-right actions df ac"> | ||||||
| 						{{if not $.Repository.IsArchived}} | 						{{if not $.Repository.IsArchived}} | ||||||
| 						<div class="ui right actions"> |  | ||||||
| 							{{if eq .PosterID .Issue.PosterID }} | 							{{if eq .PosterID .Issue.PosterID }} | ||||||
| 								<div class="ui basic label"> | 								<div class="ui basic label"> | ||||||
| 									{{$.i18n.Tr "repo.issues.poster"}} | 									{{$.i18n.Tr "repo.issues.poster"}} | ||||||
|  | @ -43,9 +45,9 @@ | ||||||
| 							{{end}} | 							{{end}} | ||||||
| 							{{template "repo/issue/view_content/add_reaction" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.RepoLink .ID)}} | 							{{template "repo/issue/view_content/add_reaction" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.RepoLink .ID)}} | ||||||
| 							{{template "repo/issue/view_content/context_menu" Dict "ctx" $ "item" . "delete" true "diff" false "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}} | 							{{template "repo/issue/view_content/context_menu" Dict "ctx" $ "item" . "delete" true "diff" false "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}} | ||||||
| 						</div> |  | ||||||
| 						{{end}} | 						{{end}} | ||||||
| 					</div> | 					</div> | ||||||
|  | 				</div> | ||||||
| 				<div class="ui attached segment"> | 				<div class="ui attached segment"> | ||||||
| 					<div class="render-content markdown"> | 					<div class="render-content markdown"> | ||||||
| 						{{if .RenderedContent}} | 						{{if .RenderedContent}} | ||||||
|  |  | ||||||
|  | @ -10,15 +10,11 @@ | ||||||
| .ui.attached.header { | .ui.attached.header { | ||||||
|   background: #f0f0f0; |   background: #f0f0f0; | ||||||
| 
 | 
 | ||||||
|   .right { |   .right .button { | ||||||
|     margin-top: -5px; |  | ||||||
| 
 |  | ||||||
|     .button { |  | ||||||
|     padding: 8px 10px; |     padding: 8px 10px; | ||||||
|     font-weight: normal; |     font-weight: normal; | ||||||
|   } |   } | ||||||
| } | } | ||||||
| } |  | ||||||
| 
 | 
 | ||||||
| @create-page-form-input-padding: 250px !important; | @create-page-form-input-padding: 250px !important; | ||||||
| #create-page-form { | #create-page-form { | ||||||
|  |  | ||||||
|  | @ -1002,27 +1002,6 @@ | ||||||
|       } |       } | ||||||
| 
 | 
 | ||||||
|       .comment { |       .comment { | ||||||
| 
 |  | ||||||
|         .actions { |  | ||||||
|           .item { |  | ||||||
|             float: left; |  | ||||||
| 
 |  | ||||||
|             &.context { |  | ||||||
|               float: none; |  | ||||||
|             } |  | ||||||
| 
 |  | ||||||
|             &.tag { |  | ||||||
|               margin-right: 5px; |  | ||||||
|             } |  | ||||||
| 
 |  | ||||||
|             &.action { |  | ||||||
|               margin-top: 6px; |  | ||||||
|               padding-left: 10px; |  | ||||||
|               padding-right: 3px; |  | ||||||
|             } |  | ||||||
|           } |  | ||||||
|         } |  | ||||||
| 
 |  | ||||||
|         > .content { |         > .content { | ||||||
|           > div:first-child { |           > div:first-child { | ||||||
|             border-top-left-radius: 4px; |             border-top-left-radius: 4px; | ||||||
|  | @ -1062,15 +1041,14 @@ | ||||||
|               left: 7px; |               left: 7px; | ||||||
|             } |             } | ||||||
| 
 | 
 | ||||||
|             .actions { |             .header-left > * + *, | ||||||
|               display: flex; |             .header-right > * + * { | ||||||
|               padding: 0 .5rem; |               margin-left: .25rem; | ||||||
| 
 |  | ||||||
|               &.right { |  | ||||||
|                 margin: 0; |  | ||||||
|             } |             } | ||||||
| 
 | 
 | ||||||
|  |             .actions { | ||||||
|               a { |               a { | ||||||
|  |                 padding: .5rem; | ||||||
|                 color: rgba(0, 0, 0, .4); |                 color: rgba(0, 0, 0, .4); | ||||||
| 
 | 
 | ||||||
|                 &:hover { |                 &:hover { | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue