From 5f47835f4cc2d6c2305830cf1052150633d05797 Mon Sep 17 00:00:00 2001 From: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com> Date: Mon, 15 Jun 2020 09:37:00 +0200 Subject: [PATCH] Better align items using flex within review request box (#11879) * Better align items using flex within review request box * use justify-content Co-authored-by: Lauris BH Co-authored-by: techknowlogick --- templates/repo/issue/view_content/pull.tmpl | 88 +++++++++++---------- web_src/less/_repository.less | 20 +++-- 2 files changed, 60 insertions(+), 48 deletions(-) diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index c66e7734a6..aacbb0c395 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -7,51 +7,55 @@ {{ $createdStr:= TimeSinceUnix .UpdatedUnix $.Lang }}
- - - {{$canChoose := false}} - {{if eq .Type 4}} - {{if or (eq .ReviewerID $.SignedUserID) $.Permission.IsAdmin}} - {{$canChoose = true}} - {{end}} - {{else}} - {{if and (or $.IsIssuePoster $.CanChooseReviewer) (not (eq $.SignedUserID .ReviewerID))}} - {{$canChoose = true}} +
+ + + + {{.Reviewer.Name}} + {{if eq .Type 1}} + {{$.i18n.Tr "repo.issues.review.approve" $createdStr | Safe}} + {{else if eq .Type 2}} + {{$.i18n.Tr "repo.issues.review.comment" $createdStr | Safe}} + {{else if eq .Type 3}} + {{$.i18n.Tr "repo.issues.review.reject" $createdStr | Safe}} + {{else if eq .Type 4}} + {{$.i18n.Tr "repo.issues.review.wait" $createdStr | Safe}} + {{else}} + {{$.i18n.Tr "repo.issues.review.comment" $createdStr | Safe}} {{end}} + +
+
+ {{if .Stale}} + + + {{end}} + - {{if $canChoose }} - - {{svg "octicon-sync" 16}} - - {{end}} - {{svg (printf "octicon-%s" .Type.Icon) 16}} - - {{if .Stale}} - - - - {{end}} - - - - {{.Reviewer.Name}} - {{if eq .Type 1}} - {{$.i18n.Tr "repo.issues.review.approve" $createdStr | Safe}} - {{else if eq .Type 2}} - {{$.i18n.Tr "repo.issues.review.comment" $createdStr | Safe}} - {{else if eq .Type 3}} - {{$.i18n.Tr "repo.issues.review.reject" $createdStr | Safe}} - {{else if eq .Type 4}} - {{$.i18n.Tr "repo.issues.review.wait" $createdStr | Safe}} - {{else}} - {{$.i18n.Tr "repo.issues.review.comment" $createdStr | Safe}} - {{end}} - + {{$canChoose := false}} + {{if eq .Type 4}} + {{if or (eq .ReviewerID $.SignedUserID) $.Permission.IsAdmin}} + {{$canChoose = true}} + {{end}} + {{else}} + {{if and (or $.IsIssuePoster $.CanChooseReviewer) (not (eq $.SignedUserID .ReviewerID))}} + {{$canChoose = true}} + {{end}} + {{end}} + + {{if $canChoose }} + + {{svg "octicon-sync" 16}} + + {{end}} + {{svg (printf "octicon-%s" .Type.Icon) 16}} + +
{{end}} diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 0687347efd..69568c8584 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -657,14 +657,18 @@ } .review-item { + display: flex; + justify-content: space-between; + align-items: center; + + .review-item-left, + .review-item-right { + display: flex; + align-items: center; + } .avatar, .type-icon { - float: none; - display: inline-block; - text-align: center; - vertical-align: middle; - .svg { width: 23px; height: 23px; @@ -676,8 +680,12 @@ } .type-icon { - float: right; + align-self: flex-start; margin-right: 1em; + + i { + line-height: 1.8em; + } } .divider {