Commit 1bf9f012 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'fix-milestone-label-layout' into 'master'

Fixed labels layout on labels milestone tab

See merge request !11120
parents 4c7a794a 505e883f
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
} }
.manage-labels-list { .manage-labels-list {
> li:not(.empty-message) { > li:not(.empty-message):not(.is-not-draggable) {
background-color: $white-light; background-color: $white-light;
cursor: move; cursor: move;
cursor: -webkit-grab; cursor: -webkit-grab;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- labels.each do |label| - labels.each do |label|
- options = { milestone_title: @milestone.title, label_name: label.title } - options = { milestone_title: @milestone.title, label_name: label.title }
%li %li.is-not-draggable
%span.label-row %span.label-row
%span.label-name %span.label-name
= link_to milestones_label_path(options) do = link_to milestones_label_path(options) do
...@@ -10,10 +10,8 @@ ...@@ -10,10 +10,8 @@
%span.prepend-description-left %span.prepend-description-left
= markdown_field(label, :description) = markdown_field(label, :description)
.pull-info-right .pull-right.hidden-xs.hidden-sm.hidden-md
%span.append-right-20 = link_to milestones_label_path(options.merge(state: 'opened')), class: 'btn btn-transparent btn-action' do
= link_to milestones_label_path(options.merge(state: 'opened')) do - pluralize milestone_issues_by_label_count(@milestone, label, state: :opened), 'open issue'
- pluralize milestone_issues_by_label_count(@milestone, label, state: :opened), 'open issue' = link_to milestones_label_path(options.merge(state: 'closed')), class: 'btn btn-transparent btn-action' do
%span.append-right-20 - pluralize milestone_issues_by_label_count(@milestone, label, state: :closed), 'closed issue'
= link_to milestones_label_path(options.merge(state: 'closed')) do
- pluralize milestone_issues_by_label_count(@milestone, label, state: :closed), 'closed issue'
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