Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add merge arrow direction and update styling #28523

Merged
merged 15 commits into from
Jan 5, 2024
Merged

Add merge arrow direction and update styling #28523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d724ecb
Add merge arrow direction and update styling
kdumontnu Dec 19, 2023
fbf1f4c
Use center text instead of position
kdumontnu Dec 19, 2023
76612a4
Use tailwind prefix notation
kdumontnu Dec 19, 2023
92a6e0c
Merge branch 'main' into kd/add_compare_arrow
kdumontnu Dec 19, 2023
fdc398a
Merge branch 'main' into kd/add_compare_arrow
kdumontnu Dec 20, 2023
c3e4159
use -gt notation to be consistent with tailwind
kdumontnu Dec 21, 2023
6f774b7
Merge branch 'main' into kd/add_compare_arrow
kdumontnu Dec 21, 2023
a130d24
Merge branch 'main' into kd/add_compare_arrow
kdumontnu Dec 23, 2023
14eac57
Merge branch 'main' into kd/add_compare_arrow
kdumontnu Dec 29, 2023
3e52c5f
Merge branch 'main' into kd/add_compare_arrow
kdumontnu Dec 31, 2023
0df33a2
Merge branch 'main' into kd/add_compare_arrow
kdumontnu Jan 2, 2024
8306813
Merge branch 'main' into kd/add_compare_arrow
kdumontnu Jan 2, 2024
356e866
Use class definition css
kdumontnu Jan 3, 2024
dfe0454
Merge branch 'main' into kd/add_compare_arrow
kdumontnu Jan 3, 2024
4f7946a
Merge branch 'main' into kd/add_compare_arrow
kdumontnu Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions templates/repo/diff/compare.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 4 additions & 2 deletions web_src/css/repo.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down