From df24b369f1a1ad937b25dde03776ee7c103ddb0a Mon Sep 17 00:00:00 2001 From: Takuya Noguchi Date: Thu, 14 Mar 2019 07:33:10 +0900 Subject: [PATCH] Fix UI layout on Commits on mobile Signed-off-by: Takuya Noguchi --- app/views/projects/commits/_commit.html.haml | 9 +++------ .../unreleased/58933-broken-ui-on-commits-on-mobile.yml | 5 +++++ 2 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 changelogs/unreleased/58933-broken-ui-on-commits-on-mobile.yml 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") diff --git a/changelogs/unreleased/58933-broken-ui-on-commits-on-mobile.yml b/changelogs/unreleased/58933-broken-ui-on-commits-on-mobile.yml new file mode 100644 index 00000000000..ca9f9dd21c9 --- /dev/null +++ b/changelogs/unreleased/58933-broken-ui-on-commits-on-mobile.yml @@ -0,0 +1,5 @@ +--- +title: Fix UI layout on Commits on mobile +merge_request: 26133 +author: Takuya Noguchi +type: fixed