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
This commit is contained in:
Annabel Dunstone Gray 2019-03-15 12:15:47 +00:00
commit 7adf10e186
2 changed files with 8 additions and 6 deletions

View file

@ -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" = link_to commit.title, project_commit_path(project, commit.id, merge_request_iid: merge_request.iid), class: "commit-row-message item-title"
- else - else
= link_to_markdown_field(commit, :title, link, class: "commit-row-message item-title") = 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 = commit.short_id
- if commit_status
.d-block.d-sm-none
= render_commit_status(commit, ref: ref)
- if commit.description? - if commit.description?
%button.text-expander.js-toggle-button %button.text-expander.js-toggle-button
= sprite_icon('ellipsis_h', size: 12) = sprite_icon('ellipsis_h', size: 12)
@ -40,7 +37,7 @@
%pre.commit-row-description.js-toggle-content.append-bottom-8 %pre.commit-row-description.js-toggle-content.append-bottom-8
= preserve(markdown_field(commit, :description)) = preserve(markdown_field(commit, :description))
.commit-actions.flex-row.d-none.d-sm-flex .commit-actions.flex-row
- if request.xhr? - if request.xhr?
= render partial: 'projects/commit/signature', object: commit.signature = render partial: 'projects/commit/signature', object: commit.signature
- else - else
@ -51,7 +48,7 @@
.js-commit-pipeline-status{ data: { endpoint: pipelines_project_commit_path(project, commit.id, ref: ref) } } .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 .label.label-monospace
= commit.short_id = commit.short_id
= clipboard_button(text: commit.id, title: _("Copy commit SHA to clipboard"), class: "btn btn-default", container: "body") = clipboard_button(text: commit.id, title: _("Copy commit SHA to clipboard"), class: "btn btn-default", container: "body")

View file

@ -0,0 +1,5 @@
---
title: Fix UI layout on Commits on mobile
merge_request: 26133
author: Takuya Noguchi
type: fixed