Merge branch '27610-issue-number-alignment' into 'master'

fix alignment for long title

Closes #27610

See merge request !9020
This commit is contained in:
Annabel Dunstone Gray 2017-02-09 14:41:43 +00:00
commit 088096cd25
6 changed files with 144 additions and 120 deletions

View File

@ -461,8 +461,19 @@
.issuable-list {
li {
.issue-box {
display: -webkit-flex;
display: flex;
}
.issue-info-container {
-webkit-flex: 1;
flex: 1;
padding-right: $gl-padding;
}
.issue-check {
float: left;
padding-right: $gl-padding;
margin-bottom: 10px;
min-width: 15px;

View File

@ -1,6 +1,6 @@
.issues-list {
.issue {
padding: 10px $gl-padding;
padding: 10px 0 10px $gl-padding;
position: relative;
.title {

View File

@ -272,8 +272,15 @@
.mr-list {
.merge-request {
padding: 10px 15px;
padding: 10px 0 10px 15px;
position: relative;
display: -webkit-flex;
display: flex;
.issue-info-container {
-webkit-flex: 1;
flex: 1;
}
.merge-request-title {
margin-bottom: 2px;

View File

@ -1,8 +1,9 @@
%li{ id: dom_id(issue), class: issue_css_classes(issue), url: issue_path(issue), data: { labels: issue.label_ids, id: issue.id } }
.issue-box
- if @bulk_edit
.issue-check
= check_box_tag dom_id(issue, "selected"), nil, false, 'data-id' => issue.id, class: "selected_issue"
.issue-info-container
.issue-title.title
%span.issue-title-text
= confidential_icon(issue)

View File

@ -3,6 +3,7 @@
.issue-check
= check_box_tag dom_id(merge_request, "selected"), nil, false, 'data-id' => merge_request.id, class: "selected_issue"
.issue-info-container
.merge-request-title.title
%span.merge-request-title-text
= link_to merge_request.title, merge_request_path(merge_request)

View File

@ -0,0 +1,4 @@
---
title: fixes issue number alignment problem in MR and issue list
merge_request: 9020
author: