diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-03-15 12:15:47 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-03-15 12:15:47 +0000 |
| commit | 7adf10e1869f13a1a66c7db5d403f3cfdccc8560 (patch) | |
| tree | 843b5dc29fe14a0e47c67d6f77a905f379d34e3f /app | |
| parent | a885e2d0a63b25411995fce2057067348f1bad9b (diff) | |
| parent | df24b369f1a1ad937b25dde03776ee7c103ddb0a (diff) | |
| download | gitlab-ce-7adf10e1869f13a1a66c7db5d403f3cfdccc8560.tar.gz | |
Merge branch '58933-broken-ui-on-commits-on-mobile' into 'master'
Fix UI layout on Commits on mobile
Closes #58933
See merge request gitlab-org/gitlab-ce!26133
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/commits/_commit.html.haml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index 0d3c6e7027c..ce55dd78747 100644 --- a/app/views/projects/commits/_commit.html.haml +++ b/app/views/projects/commits/_commit.html.haml @@ -20,12 +20,9 @@ = link_to commit.title, project_commit_path(project, commit.id, merge_request_iid: merge_request.iid), class: "commit-row-message item-title" - else = link_to_markdown_field(commit, :title, link, class: "commit-row-message item-title") - %span.commit-row-message.d-block.d-sm-none + %span.commit-row-message.d-inline.d-sm-none · = commit.short_id - - if commit_status - .d-block.d-sm-none - = render_commit_status(commit, ref: ref) - if commit.description? %button.text-expander.js-toggle-button = sprite_icon('ellipsis_h', size: 12) @@ -40,7 +37,7 @@ %pre.commit-row-description.js-toggle-content.append-bottom-8 = preserve(markdown_field(commit, :description)) - .commit-actions.flex-row.d-none.d-sm-flex + .commit-actions.flex-row - if request.xhr? = render partial: 'projects/commit/signature', object: commit.signature - else @@ -51,7 +48,7 @@ .js-commit-pipeline-status{ data: { endpoint: pipelines_project_commit_path(project, commit.id, ref: ref) } } - .commit-sha-group + .commit-sha-group.d-none.d-sm-flex .label.label-monospace = commit.short_id = clipboard_button(text: commit.id, title: _("Copy commit SHA to clipboard"), class: "btn btn-default", container: "body") |