diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-09-09 15:00:21 +0100 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-09-09 19:05:47 +0100 |
| commit | 0dcfc899d124bb618c84b6e25393a3c36939d633 (patch) | |
| tree | 2a921f2948967deb1803ac490908b5988080fab3 | |
| parent | 0794f7fe6244974ceedcc24d9dda9f77c48779ac (diff) | |
| download | gitlab-ce-21877-no-mr-branch-title-link-in-issue-on-mobile.tar.gz | |
Used flexbox to force related merge request list items into columned items21877-no-mr-branch-title-link-in-issue-on-mobile
| -rw-r--r-- | app/assets/stylesheets/pages/issues.scss | 9 | ||||
| -rw-r--r-- | app/views/projects/issues/_merge_requests.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/issues/_related_branches.html.haml | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index d14224ed00f..64ee1c308c0 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -48,6 +48,15 @@ form.edit-issue { margin: 0; } +ul.related-merge-requests > li { + display: -ms-flexbox; + display: -webkit-flex; + display: flex; + .merge-request-id { + flex-shrink: 0; + } +} + .merge-requests-title, .related-branches-title { font-size: 16px; font-weight: 600; diff --git a/app/views/projects/issues/_merge_requests.html.haml b/app/views/projects/issues/_merge_requests.html.haml index d8075371853..31d3ec23276 100644 --- a/app/views/projects/issues/_merge_requests.html.haml +++ b/app/views/projects/issues/_merge_requests.html.haml @@ -1,7 +1,7 @@ - if @merge_requests.any? %h2.merge-requests-title = pluralize(@merge_requests.count, 'Related Merge Request') - %ul.unstyled-list + %ul.unstyled-list.related-merge-requests - has_any_ci = @merge_requests.any?(&:pipeline) - @merge_requests.each do |merge_request| %li diff --git a/app/views/projects/issues/_related_branches.html.haml b/app/views/projects/issues/_related_branches.html.haml index a8eeab3e55e..44683c8bcdb 100644 --- a/app/views/projects/issues/_related_branches.html.haml +++ b/app/views/projects/issues/_related_branches.html.haml @@ -1,7 +1,7 @@ - if @related_branches.any? %h2.related-branches-title = pluralize(@related_branches.count, 'Related Branch') - %ul.unstyled-list + %ul.unstyled-list.related-merge-requests - @related_branches.each do |branch| %li - target = @project.repository.find_branch(branch).target |