kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
Fixed labels layout on labels milestone tab

See merge request !11120
This commit is contained in:
Filipa Lacerda 2017-05-05 18:10:38 +00:00
commit 1bf9f012cc
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/pages/labels.scss
View file

@ -116,7 +116,7 @@
}
.manage-labels-list {
> li:not(.empty-message) {
> li:not(.empty-message):not(.is-not-draggable) {
background-color: $white-light;
cursor: move;
cursor: -webkit-grab;

14
app/views/shared/milestones/_labels_tab.html.haml
View file

@ -2,7 +2,7 @@
- labels.each do |label|
- options = { milestone_title: @milestone.title, label_name: label.title }
%li
%li.is-not-draggable
%span.label-row
%span.label-name
= link_to milestones_label_path(options) do
@ -10,10 +10,8 @@
%span.prepend-description-left
= markdown_field(label, :description)
.pull-info-right
%span.append-right-20
= link_to milestones_label_path(options.merge(state: 'opened')) do
- pluralize milestone_issues_by_label_count(@milestone, label, state: :opened), 'open issue'
%span.append-right-20
= link_to milestones_label_path(options.merge(state: 'closed')) do
- pluralize milestone_issues_by_label_count(@milestone, label, state: :closed), 'closed issue'
.pull-right.hidden-xs.hidden-sm.hidden-md
= link_to milestones_label_path(options.merge(state: 'opened')), class: 'btn btn-transparent btn-action' do
- 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
- pluralize milestone_issues_by_label_count(@milestone, label, state: :closed), 'closed issue'