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

fix: PR status layout on mobile (#21547) #22441

Merged
merged 3 commits into from
Jan 14, 2023
Merged

fix: PR status layout on mobile (#21547) #22441

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b77a27
fix: PR status layout on mobile (#21547)
kolaente Oct 28, 2022
36e8836
Merge branch 'release/v1.18' into backport-21547-v1.18
lunny Jan 14, 2023
8f1760f
Merge branch 'release/v1.18' into backport-21547-v1.18
lunny Jan 14, 2023
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
18 changes: 10 additions & 8 deletions templates/repo/pulls/status.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,16 @@
{{end}}

{{range $.LatestCommitStatuses}}
<div class="ui attached segment">
<span>{{template "repo/commit_status" .}}</span>
<span class="ui">{{.Context}} <span class="text grey">{{.Description}}</span></span>
<div class="ui right">
{{if $.is_context_required}}
{{if (call $.is_context_required .Context)}}<div class="ui label">{{$.locale.Tr "repo.pulls.status_checks_requested"}}</div>{{end}}
{{end}}
<span class="ui">{{if .TargetURL}}<a href="{{.TargetURL}}">{{$.locale.Tr "repo.pulls.status_checks_details"}}</a>{{end}}</span>
<div class="ui attached segment pr-status">
{{template "repo/commit_status" .}}
<div class="status-context">
<span>{{.Context}} <span class="text grey">{{.Description}}</span></span>
<div class="ui status-details">
{{if $.is_context_required}}
{{if (call $.is_context_required .Context)}}<div class="ui label">{{$.locale.Tr "repo.pulls.status_checks_requested"}}</div>{{end}}
{{end}}
<span class="ui">{{if .TargetURL}}<a href="{{.TargetURL}}">{{$.locale.Tr "repo.pulls.status_checks_details"}}</a>{{end}}</span>
</div>
</div>
</div>
{{end}}
Expand Down
38 changes: 38 additions & 0 deletions web_src/less/_repository.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3494,3 +3494,41 @@ td.blob-excerpt {
max-width: 165px;
}
}

.pr-status {
padding: 0 !important; // To clear fomantic's padding on .ui.segment elements
display: flex;
align-items: center;

.commit-status {
margin: 1em;
flex-shrink: 0;
}

.status-context {
display: flex;
justify-content: space-between;
width: 100%;

> span {
padding: 1em 0;
}
}

.status-details {
display: flex;
padding-right: .5em;
align-items: center;
justify-content: flex-end;

@media @mediaSm {
flex-direction: column;
align-items: flex-end;
justify-content: center;
}

> span {
padding-right: .5em; // To match the alignment with the "required" label
}
}
}