diff options
| author | Kyle D <kdumontnu@gmail.com> | 2024-01-05 09:38:56 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-05 17:38:56 +0000 |
| commit | e522e774cae2240279fc48c349fc513c9d3353ee (patch) | |
| tree | c310ffbae1dd03d4dd3ffd7b682f180e3bbc3b7f | |
| parent | dd5693387e0642e1aba05b01eeb18139ce90ef5e (diff) | |
| download | gitea-e522e774cae2240279fc48c349fc513c9d3353ee.tar.gz gitea-e522e774cae2240279fc48c349fc513c9d3353ee.zip | |
Add merge arrow direction and update styling (#28523)
Close https://github.com/go-gitea/gitea/issues/28522
~Adds some [negative
margin](https://tailwindcss.com/docs/margin#using-negative-values)
helper css classes using tailwind's [prefix
syntax](https://tailwindcss.com/docs/configuration#prefix)~
### Before
### After
| -rw-r--r-- | templates/repo/diff/compare.tmpl | 4 | ||||
| -rw-r--r-- | web_src/css/repo.css | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index 0e8a598a65..42a7bf3c2a 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -36,7 +36,7 @@ {{- end -}} {{- end -}} <div class="ui segment choose branch"> - <a href="{{$.HeadRepo.Link}}/compare/{{PathEscapeSegments $.HeadBranch}}{{$.CompareSeparator}}{{if not $.PullRequestCtx.SameRepo}}{{PathEscape $.BaseName}}/{{PathEscape $.Repository.Name}}:{{end}}{{PathEscapeSegments $.BaseBranch}}" title="{{ctx.Locale.Tr "repo.pulls.switch_head_and_base"}}">{{svg "octicon-git-compare"}}</a> + <a class="gt-mr-3" href="{{$.HeadRepo.Link}}/compare/{{PathEscapeSegments $.HeadBranch}}{{$.CompareSeparator}}{{if not $.PullRequestCtx.SameRepo}}{{PathEscape $.BaseName}}/{{PathEscape $.Repository.Name}}:{{end}}{{PathEscapeSegments $.BaseBranch}}" title="{{ctx.Locale.Tr "repo.pulls.switch_head_and_base"}}">{{svg "octicon-git-compare"}}</a> <div class="ui floating filter dropdown" data-no-results="{{ctx.Locale.Tr "repo.pulls.no_results"}}"> <div class="ui basic small button"> <span class="text">{{if $.PageIsComparePull}}{{ctx.Locale.Tr "repo.pulls.compare_base"}}{{else}}{{ctx.Locale.Tr "repo.compare.compare_base"}}{{end}}: {{$BaseCompareName}}:{{$.BaseBranch}}</span> @@ -105,7 +105,7 @@ </div> </div> </div> - <a href="{{.RepoLink}}/compare/{{PathEscapeSegments .BaseBranch}}{{.OtherCompareSeparator}}{{if not $.PullRequestCtx.SameRepo}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{end}}{{PathEscapeSegments $.HeadBranch}}" title="{{ctx.Locale.Tr "repo.pulls.switch_comparison_type"}}">{{.CompareSeparator}}</a> + <a href="{{.RepoLink}}/compare/{{PathEscapeSegments .BaseBranch}}{{.OtherCompareSeparator}}{{if not $.PullRequestCtx.SameRepo}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{end}}{{PathEscapeSegments $.HeadBranch}}" title="{{ctx.Locale.Tr "repo.pulls.switch_comparison_type"}}">{{svg "octicon-arrow-left" 16}}<div class="compare-separator">{{.CompareSeparator}}</div></a> <div class="ui floating filter dropdown"> <div class="ui basic small button"> <span class="text">{{if $.PageIsComparePull}}{{ctx.Locale.Tr "repo.pulls.compare_compare"}}{{else}}{{ctx.Locale.Tr "repo.compare.compare_head"}}{{end}}: {{$HeadCompareName}}:{{$.HeadBranch}}</span> diff --git a/web_src/css/repo.css b/web_src/css/repo.css index e37788505e..6b6be99f74 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1166,8 +1166,10 @@ flex-wrap: wrap; } -.repository .choose.branch .svg { - margin-right: 10px; +.repository .choose .compare-separator { + width: 100%; + margin-top: -1rem; + text-align: center; } .repository.compare.pull .comment.form .content::before, |