diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 36fb98fa6..67d0434e4 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -34,10 +34,12 @@ </div> <div class="diff-detail-actions gt-df gt-ac gt-gap-2 gt-fw"> {{if and .PageIsPullFiles $.SignedUserID (not .IsArchived)}} - <progress id="viewed-files-summary" value="{{.Diff.NumViewedFiles}}" max="{{.Diff.NumFiles}}"></progress> - <label for="viewed-files-summary" id="viewed-files-summary-label" class="gt-f1 gt-whitespace-nowrap not-mobile" data-text-changed-template="{{.locale.Tr "repo.pulls.viewed_files_label"}}"> - {{.locale.Tr "repo.pulls.viewed_files_label" .Diff.NumViewedFiles .Diff.NumFiles}} - </label> + <div class="gt-df gt-ac gt-fc gt-whitespace-nowrap gt-mr-2"> + <label for="viewed-files-summary" id="viewed-files-summary-label" data-text-changed-template="{{.locale.Tr "repo.pulls.viewed_files_label"}}"> + {{.locale.Tr "repo.pulls.viewed_files_label" .Diff.NumViewedFiles .Diff.NumFiles}} + </label> + <progress id="viewed-files-summary" value="{{.Diff.NumViewedFiles}}" max="{{.Diff.NumFiles}}"></progress> + </div> {{end}} {{template "repo/diff/whitespace_dropdown" .}} {{template "repo/diff/options_dropdown" .}} diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index e928b7bd2..895eaee8c 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -70,9 +70,9 @@ {{$.locale.Tr "repo.pulls.title_desc" .NumCommits $headHref $baseHref | Safe}} </span> {{end}} - <span id="pull-desc-edit" class="gt-hidden"> + <span id="pull-desc-edit" class="gt-hidden flex-text-block"> <div class="ui floating filter dropdown"> - <div class="ui basic small button"> + <div class="ui basic small button gt-mr-0"> <span class="text">{{.locale.Tr "repo.pulls.compare_compare"}}: {{$.HeadTarget}}</span> </div> </div> diff --git a/web_src/css/repo.css b/web_src/css/repo.css index c93160473..6a0083b02 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1559,7 +1559,6 @@ .repository .diff-detail-box { padding: 7px 0; background: var(--color-body); - line-height: 30px; } @media (max-width: 991.98px) { diff --git a/web_src/css/review.css b/web_src/css/review.css index 263f821f3..f82a6e7f3 100644 --- a/web_src/css/review.css +++ b/web_src/css/review.css @@ -283,6 +283,6 @@ } #viewed-files-summary { - width: 72px; - height: 10px; + width: 100%; + height: 8px; }