summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/stylesheets/pages/milestone.scss20
-rw-r--r--app/views/projects/milestones/_issue.html.haml11
-rw-r--r--app/views/projects/milestones/_issues.html.haml5
3 files changed, 28 insertions, 8 deletions
diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss
index f3ff00855c6..88fb70b07bf 100644
--- a/app/assets/stylesheets/pages/milestone.scss
+++ b/app/assets/stylesheets/pages/milestone.scss
@@ -42,3 +42,23 @@ li.milestone {
float: right;
width: 105px;
}
+
+.issues-sortable-list {
+ .issue-detail {
+ display: block;
+
+ .issue-number{
+ color: #D1D1D1;
+ margin-right: 5px;
+ }
+ .color-label {
+ padding: 8px;
+ margin-right: 7px;
+ margin-top: 10px;
+ }
+
+ .avatar {
+ float: none;
+ }
+ }
+}
diff --git a/app/views/projects/milestones/_issue.html.haml b/app/views/projects/milestones/_issue.html.haml
index 599fb7ef5aa..ca51b8c745d 100644
--- a/app/views/projects/milestones/_issue.html.haml
+++ b/app/views/projects/milestones/_issue.html.haml
@@ -1,11 +1,10 @@
%li{ id: dom_id(issue, 'sortable'), class: 'issue-row', 'data-iid' => issue.iid, 'data-url' => issue_path(issue) }
- .pull-right.assignee-icon
+ %span
+ = link_to_gfm issue.title, [@project.namespace.becomes(Namespace), @project, issue], title: issue.title
+ .issue-detail
+ = link_to [@project.namespace.becomes(Namespace), @project, issue] do
+ %span.issue-number ##{issue.iid}
- issue.labels.each do |label|
= render_colored_label(label)
- if issue.assignee
= image_tag avatar_icon(issue.assignee, 16), class: "avatar s24", alt: ''
- %span
- = link_to [@project.namespace.becomes(Namespace), @project, issue] do
- %span.cgray ##{issue.iid}
- = link_to_gfm issue.title, [@project.namespace.becomes(Namespace), @project, issue], title: issue.title
-
diff --git a/app/views/projects/milestones/_issues.html.haml b/app/views/projects/milestones/_issues.html.haml
index 6e4df75a3df..e0c9aa0548c 100644
--- a/app/views/projects/milestones/_issues.html.haml
+++ b/app/views/projects/milestones/_issues.html.haml
@@ -1,6 +1,7 @@
.panel.panel-default
- .panel-heading= title
+ .panel-heading
+ %strong= title
+ %strong.pull-right= issues.size
%ul{ class: "well-list issues-sortable-list", id: "issues-list-#{id}", "data-state" => id }
- issues.sort_by(&:position).each do |issue|
= render 'issue', issue: issue
- %li.light.ui-sort-disabled Drag and drop available