Merge branch '27610-issue-number-alignment' into 'master'
fix alignment for long title Closes #27610 See merge request !9020
This commit is contained in:
commit
088096cd25
|
@ -461,8 +461,19 @@
|
||||||
|
|
||||||
.issuable-list {
|
.issuable-list {
|
||||||
li {
|
li {
|
||||||
|
|
||||||
|
.issue-box {
|
||||||
|
display: -webkit-flex;
|
||||||
|
display: flex;
|
||||||
|
}
|
||||||
|
|
||||||
|
.issue-info-container {
|
||||||
|
-webkit-flex: 1;
|
||||||
|
flex: 1;
|
||||||
|
padding-right: $gl-padding;
|
||||||
|
}
|
||||||
|
|
||||||
.issue-check {
|
.issue-check {
|
||||||
float: left;
|
|
||||||
padding-right: $gl-padding;
|
padding-right: $gl-padding;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
min-width: 15px;
|
min-width: 15px;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
.issues-list {
|
.issues-list {
|
||||||
.issue {
|
.issue {
|
||||||
padding: 10px $gl-padding;
|
padding: 10px 0 10px $gl-padding;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
||||||
.title {
|
.title {
|
||||||
|
|
|
@ -272,8 +272,15 @@
|
||||||
|
|
||||||
.mr-list {
|
.mr-list {
|
||||||
.merge-request {
|
.merge-request {
|
||||||
padding: 10px 15px;
|
padding: 10px 0 10px 15px;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
display: -webkit-flex;
|
||||||
|
display: flex;
|
||||||
|
|
||||||
|
.issue-info-container {
|
||||||
|
-webkit-flex: 1;
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
|
||||||
.merge-request-title {
|
.merge-request-title {
|
||||||
margin-bottom: 2px;
|
margin-bottom: 2px;
|
||||||
|
|
|
@ -1,60 +1,61 @@
|
||||||
%li{ id: dom_id(issue), class: issue_css_classes(issue), url: issue_path(issue), data: { labels: issue.label_ids, id: issue.id } }
|
%li{ id: dom_id(issue), class: issue_css_classes(issue), url: issue_path(issue), data: { labels: issue.label_ids, id: issue.id } }
|
||||||
- if @bulk_edit
|
.issue-box
|
||||||
.issue-check
|
- if @bulk_edit
|
||||||
= check_box_tag dom_id(issue, "selected"), nil, false, 'data-id' => issue.id, class: "selected_issue"
|
.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)
|
||||||
|
= link_to issue.title, issue_path(issue)
|
||||||
|
%ul.controls
|
||||||
|
- if issue.closed?
|
||||||
|
%li
|
||||||
|
CLOSED
|
||||||
|
|
||||||
.issue-title.title
|
- if issue.assignee
|
||||||
%span.issue-title-text
|
%li
|
||||||
= confidential_icon(issue)
|
= link_to_member(@project, issue.assignee, name: false, title: "Assigned to :name")
|
||||||
= link_to issue.title, issue_path(issue)
|
|
||||||
%ul.controls
|
|
||||||
- if issue.closed?
|
|
||||||
%li
|
|
||||||
CLOSED
|
|
||||||
|
|
||||||
- if issue.assignee
|
- upvotes, downvotes = issue.upvotes, issue.downvotes
|
||||||
%li
|
- if upvotes > 0
|
||||||
= link_to_member(@project, issue.assignee, name: false, title: "Assigned to :name")
|
%li
|
||||||
|
= icon('thumbs-up')
|
||||||
|
= upvotes
|
||||||
|
|
||||||
- upvotes, downvotes = issue.upvotes, issue.downvotes
|
- if downvotes > 0
|
||||||
- if upvotes > 0
|
%li
|
||||||
%li
|
= icon('thumbs-down')
|
||||||
= icon('thumbs-up')
|
= downvotes
|
||||||
= upvotes
|
|
||||||
|
|
||||||
- if downvotes > 0
|
- note_count = issue.notes.user.count
|
||||||
%li
|
%li
|
||||||
= icon('thumbs-down')
|
= link_to issue_path(issue, anchor: 'notes'), class: ('no-comments' if note_count.zero?) do
|
||||||
= downvotes
|
= icon('comments')
|
||||||
|
= note_count
|
||||||
|
|
||||||
- note_count = issue.notes.user.count
|
.issue-info
|
||||||
%li
|
#{issuable_reference(issue)} ·
|
||||||
= link_to issue_path(issue, anchor: 'notes'), class: ('no-comments' if note_count.zero?) do
|
opened #{time_ago_with_tooltip(issue.created_at, placement: 'bottom')}
|
||||||
= icon('comments')
|
by #{link_to_member(@project, issue.author, avatar: false)}
|
||||||
= note_count
|
- if issue.milestone
|
||||||
|
|
||||||
|
= link_to namespace_project_issues_path(issue.project.namespace, issue.project, milestone_title: issue.milestone.title) do
|
||||||
|
= icon('clock-o')
|
||||||
|
= issue.milestone.title
|
||||||
|
- if issue.due_date
|
||||||
|
%span{ class: "#{'cred' if issue.overdue?}" }
|
||||||
|
|
||||||
|
= icon('calendar')
|
||||||
|
= issue.due_date.to_s(:medium)
|
||||||
|
- if issue.labels.any?
|
||||||
|
|
||||||
|
- issue.labels.each do |label|
|
||||||
|
= link_to_label(label, subject: issue.project, css_class: 'label-link')
|
||||||
|
- if issue.tasks?
|
||||||
|
|
||||||
|
%span.task-status
|
||||||
|
= issue.task_status
|
||||||
|
|
||||||
.issue-info
|
.pull-right.issue-updated-at
|
||||||
#{issuable_reference(issue)} ·
|
%span updated #{time_ago_with_tooltip(issue.updated_at, placement: 'bottom', html_class: 'issue_update_ago')}
|
||||||
opened #{time_ago_with_tooltip(issue.created_at, placement: 'bottom')}
|
|
||||||
by #{link_to_member(@project, issue.author, avatar: false)}
|
|
||||||
- if issue.milestone
|
|
||||||
|
|
||||||
= link_to namespace_project_issues_path(issue.project.namespace, issue.project, milestone_title: issue.milestone.title) do
|
|
||||||
= icon('clock-o')
|
|
||||||
= issue.milestone.title
|
|
||||||
- if issue.due_date
|
|
||||||
%span{ class: "#{'cred' if issue.overdue?}" }
|
|
||||||
|
|
||||||
= icon('calendar')
|
|
||||||
= issue.due_date.to_s(:medium)
|
|
||||||
- if issue.labels.any?
|
|
||||||
|
|
||||||
- issue.labels.each do |label|
|
|
||||||
= link_to_label(label, subject: issue.project, css_class: 'label-link')
|
|
||||||
- if issue.tasks?
|
|
||||||
|
|
||||||
%span.task-status
|
|
||||||
= issue.task_status
|
|
||||||
|
|
||||||
.pull-right.issue-updated-at
|
|
||||||
%span updated #{time_ago_with_tooltip(issue.updated_at, placement: 'bottom', html_class: 'issue_update_ago')}
|
|
||||||
|
|
|
@ -3,73 +3,74 @@
|
||||||
.issue-check
|
.issue-check
|
||||||
= check_box_tag dom_id(merge_request, "selected"), nil, false, 'data-id' => merge_request.id, class: "selected_issue"
|
= check_box_tag dom_id(merge_request, "selected"), nil, false, 'data-id' => merge_request.id, class: "selected_issue"
|
||||||
|
|
||||||
.merge-request-title.title
|
.issue-info-container
|
||||||
%span.merge-request-title-text
|
.merge-request-title.title
|
||||||
= link_to merge_request.title, merge_request_path(merge_request)
|
%span.merge-request-title-text
|
||||||
%ul.controls
|
= link_to merge_request.title, merge_request_path(merge_request)
|
||||||
- if merge_request.merged?
|
%ul.controls
|
||||||
|
- if merge_request.merged?
|
||||||
|
%li
|
||||||
|
MERGED
|
||||||
|
- elsif merge_request.closed?
|
||||||
|
%li
|
||||||
|
= icon('ban')
|
||||||
|
CLOSED
|
||||||
|
|
||||||
|
- if merge_request.head_pipeline
|
||||||
|
%li
|
||||||
|
= render_pipeline_status(merge_request.head_pipeline)
|
||||||
|
|
||||||
|
- if merge_request.open? && merge_request.broken?
|
||||||
|
%li
|
||||||
|
= link_to merge_request_path(merge_request), class: "has-tooltip", title: "Cannot be merged automatically", data: { container: 'body' } do
|
||||||
|
= icon('exclamation-triangle')
|
||||||
|
|
||||||
|
- if merge_request.assignee
|
||||||
|
%li
|
||||||
|
= link_to_member(merge_request.source_project, merge_request.assignee, name: false, title: "Assigned to :name")
|
||||||
|
|
||||||
|
- upvotes, downvotes = merge_request.upvotes, merge_request.downvotes
|
||||||
|
- if upvotes > 0
|
||||||
|
%li
|
||||||
|
= icon('thumbs-up')
|
||||||
|
= upvotes
|
||||||
|
|
||||||
|
- if downvotes > 0
|
||||||
|
%li
|
||||||
|
= icon('thumbs-down')
|
||||||
|
= downvotes
|
||||||
|
|
||||||
|
- note_count = merge_request.related_notes.user.count
|
||||||
%li
|
%li
|
||||||
MERGED
|
= link_to merge_request_path(merge_request, anchor: 'notes'), class: ('no-comments' if note_count.zero?) do
|
||||||
- elsif merge_request.closed?
|
= icon('comments')
|
||||||
%li
|
= note_count
|
||||||
= icon('ban')
|
|
||||||
CLOSED
|
|
||||||
|
|
||||||
- if merge_request.head_pipeline
|
.merge-request-info
|
||||||
%li
|
#{issuable_reference(merge_request)} ·
|
||||||
= render_pipeline_status(merge_request.head_pipeline)
|
opened #{time_ago_with_tooltip(merge_request.created_at, placement: 'bottom')}
|
||||||
|
by #{link_to_member(@project, merge_request.author, avatar: false)}
|
||||||
|
- if merge_request.target_project.default_branch != merge_request.target_branch
|
||||||
|
|
||||||
|
= link_to namespace_project_commits_path(merge_request.project.namespace, merge_request.project, merge_request.target_branch) do
|
||||||
|
= icon('code-fork')
|
||||||
|
= merge_request.target_branch
|
||||||
|
|
||||||
- if merge_request.open? && merge_request.broken?
|
- if merge_request.milestone
|
||||||
%li
|
|
||||||
= link_to merge_request_path(merge_request), class: "has-tooltip", title: "Cannot be merged automatically", data: { container: 'body' } do
|
= link_to namespace_project_merge_requests_path(merge_request.project.namespace, merge_request.project, milestone_title: merge_request.milestone.title) do
|
||||||
= icon('exclamation-triangle')
|
= icon('clock-o')
|
||||||
|
= merge_request.milestone.title
|
||||||
|
|
||||||
- if merge_request.assignee
|
- if merge_request.labels.any?
|
||||||
%li
|
|
||||||
= link_to_member(merge_request.source_project, merge_request.assignee, name: false, title: "Assigned to :name")
|
- merge_request.labels.each do |label|
|
||||||
|
= link_to_label(label, subject: merge_request.project, type: :merge_request, css_class: 'label-link')
|
||||||
|
|
||||||
- upvotes, downvotes = merge_request.upvotes, merge_request.downvotes
|
- if merge_request.tasks?
|
||||||
- if upvotes > 0
|
|
||||||
%li
|
%span.task-status
|
||||||
= icon('thumbs-up')
|
= merge_request.task_status
|
||||||
= upvotes
|
|
||||||
|
|
||||||
- if downvotes > 0
|
.pull-right.hidden-xs
|
||||||
%li
|
%span updated #{time_ago_with_tooltip(merge_request.updated_at, placement: 'bottom', html_class: 'merge_request_updated_ago')}
|
||||||
= icon('thumbs-down')
|
|
||||||
= downvotes
|
|
||||||
|
|
||||||
- note_count = merge_request.related_notes.user.count
|
|
||||||
%li
|
|
||||||
= link_to merge_request_path(merge_request, anchor: 'notes'), class: ('no-comments' if note_count.zero?) do
|
|
||||||
= icon('comments')
|
|
||||||
= note_count
|
|
||||||
|
|
||||||
.merge-request-info
|
|
||||||
#{issuable_reference(merge_request)} ·
|
|
||||||
opened #{time_ago_with_tooltip(merge_request.created_at, placement: 'bottom')}
|
|
||||||
by #{link_to_member(@project, merge_request.author, avatar: false)}
|
|
||||||
- if merge_request.target_project.default_branch != merge_request.target_branch
|
|
||||||
|
|
||||||
= link_to namespace_project_commits_path(merge_request.project.namespace, merge_request.project, merge_request.target_branch) do
|
|
||||||
= icon('code-fork')
|
|
||||||
= merge_request.target_branch
|
|
||||||
|
|
||||||
- if merge_request.milestone
|
|
||||||
|
|
||||||
= link_to namespace_project_merge_requests_path(merge_request.project.namespace, merge_request.project, milestone_title: merge_request.milestone.title) do
|
|
||||||
= icon('clock-o')
|
|
||||||
= merge_request.milestone.title
|
|
||||||
|
|
||||||
- if merge_request.labels.any?
|
|
||||||
|
|
||||||
- merge_request.labels.each do |label|
|
|
||||||
= link_to_label(label, subject: merge_request.project, type: :merge_request, css_class: 'label-link')
|
|
||||||
|
|
||||||
- if merge_request.tasks?
|
|
||||||
|
|
||||||
%span.task-status
|
|
||||||
= merge_request.task_status
|
|
||||||
|
|
||||||
.pull-right.hidden-xs
|
|
||||||
%span updated #{time_ago_with_tooltip(merge_request.updated_at, placement: 'bottom', html_class: 'merge_request_updated_ago')}
|
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
title: fixes issue number alignment problem in MR and issue list
|
||||||
|
merge_request: 9020
|
||||||
|
author:
|
Loading…
Reference in New Issue