Skip to content

Commit

Permalink
fix: PR status layout on mobile (#21547)
Browse files Browse the repository at this point in the history
This PR fixes the layout of PR status layouts on mobile. For longer
status context names or on very small screens the text would overflow
and push the "Details" and "Required" badges out of the container.

Before:

![Screen Shot 2022-10-22 at 12 27
46](https://user-images.githubusercontent.com/13721712/197335454-e4decf09-4778-43e8-be88-9188fabbec23.png)

After:

![Screen Shot 2022-10-22 at 12 53
24](https://user-images.githubusercontent.com/13721712/197335449-2c731a6c-7fd6-4b97-be0e-704a99fd3d32.png)

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
  • Loading branch information
kolaente and lunny authored Oct 28, 2022
1 parent 5f0cbb3 commit cd5c067
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 8 deletions.
18 changes: 10 additions & 8 deletions templates/repo/pulls/status.tmpl
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
Original file line number Diff line number Diff line change
Expand Up @@ -3477,3 +3477,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
}
}
}

0 comments on commit cd5c067

Please sign in to comment.