Skip to content

G
gitlab-ce
Commit 088096cd authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray
Browse files
Options

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

fix alignment for long title

Closes #27610

See merge request !9020
parents 110cd589 ca81c1c0
Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 115 deletions
app/assets/stylesheets/pages/issuable.scss
View file @ 088096cd
...@@ -461,8 +461,19 @@ ...@@ -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;
......
app/assets/stylesheets/pages/issues.scss
View file @ 088096cd
.issues-list { .issues-list {
.issue { .issue {
padding: 10px $gl-padding; padding: 10px 0 10px $gl-padding;
position: relative; position: relative;
.title { .title {
......
app/assets/stylesheets/pages/merge_requests.scss
View file @ 088096cd
...@@ -272,8 +272,15 @@ ...@@ -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;
......
app/views/projects/issues/_issue.html.haml
View file @ 088096cd
%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')}
app/views/projects/merge_requests/_merge_request.html.haml
View file @ 088096cd
...@@ -3,73 +3,74 @@ ...@@ -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
%li - if merge_request.merged?
MERGED %li
- elsif merge_request.closed? MERGED
%li - elsif merge_request.closed?
= icon('ban') %li
CLOSED = icon('ban')
CLOSED
- if merge_request.head_pipeline - if merge_request.head_pipeline
%li %li
= render_pipeline_status(merge_request.head_pipeline) = render_pipeline_status(merge_request.head_pipeline)
- if merge_request.open? && merge_request.broken? - if merge_request.open? && merge_request.broken?
%li %li
= link_to merge_request_path(merge_request), class: "has-tooltip", title: "Cannot be merged automatically", data: { container: 'body' } do = link_to merge_request_path(merge_request), class: "has-tooltip", title: "Cannot be merged automatically", data: { container: 'body' } do
= icon('exclamation-triangle') = icon('exclamation-triangle')
- if merge_request.assignee - if merge_request.assignee
%li %li
= link_to_member(merge_request.source_project, merge_request.assignee, name: false, title: "Assigned to :name") = link_to_member(merge_request.source_project, merge_request.assignee, name: false, title: "Assigned to :name")
- upvotes, downvotes = merge_request.upvotes, merge_request.downvotes - upvotes, downvotes = merge_request.upvotes, merge_request.downvotes
- if upvotes > 0 - if upvotes > 0
%li %li
= icon('thumbs-up') = icon('thumbs-up')
= upvotes = upvotes
- if downvotes > 0 - if downvotes > 0
%li %li
= icon('thumbs-down') = icon('thumbs-down')
= downvotes = downvotes
- note_count = merge_request.related_notes.user.count - note_count = merge_request.related_notes.user.count
%li %li
= link_to merge_request_path(merge_request, anchor: 'notes'), class: ('no-comments' if note_count.zero?) do = link_to merge_request_path(merge_request, anchor: 'notes'), class: ('no-comments' if note_count.zero?) do
= icon('comments') = icon('comments')
= note_count = note_count
.merge-request-info .merge-request-info
#{issuable_reference(merge_request)} · #{issuable_reference(merge_request)} ·
opened #{time_ago_with_tooltip(merge_request.created_at, placement: 'bottom')} opened #{time_ago_with_tooltip(merge_request.created_at, placement: 'bottom')}
by #{link_to_member(@project, merge_request.author, avatar: false)} by #{link_to_member(@project, merge_request.author, avatar: false)}
- if merge_request.target_project.default_branch != merge_request.target_branch - 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 = link_to namespace_project_commits_path(merge_request.project.namespace, merge_request.project, merge_request.target_branch) do
= icon('code-fork') = icon('code-fork')
= merge_request.target_branch = merge_request.target_branch
- if merge_request.milestone - 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 = link_to namespace_project_merge_requests_path(merge_request.project.namespace, merge_request.project, milestone_title: merge_request.milestone.title) do
= icon('clock-o') = icon('clock-o')
= merge_request.milestone.title = merge_request.milestone.title
- if merge_request.labels.any? - if merge_request.labels.any?
   
- merge_request.labels.each do |label| - merge_request.labels.each do |label|
= link_to_label(label, subject: merge_request.project, type: :merge_request, css_class: 'label-link') = link_to_label(label, subject: merge_request.project, type: :merge_request, css_class: 'label-link')
- if merge_request.tasks? - if merge_request.tasks?
   
%span.task-status %span.task-status
= merge_request.task_status = merge_request.task_status
.pull-right.hidden-xs .pull-right.hidden-xs
%span updated #{time_ago_with_tooltip(merge_request.updated_at, placement: 'bottom', html_class: 'merge_request_updated_ago')} %span updated #{time_ago_with_tooltip(merge_request.updated_at, placement: 'bottom', html_class: 'merge_request_updated_ago')}
changelogs/unreleased/27610-issue-number-alignment.yml 0 → 100644
View file @ 088096cd
---
title: fixes issue number alignment problem in MR and issue list
merge_request: 9020
author:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7