diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-05-05 18:10:38 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-05-05 18:10:38 +0000 |
| commit | 1bf9f012ccd744f415ffcb32c6af36dc04d7e07a (patch) | |
| tree | c2f073a0369dd08ee246522bab31fae512595417 | |
| parent | 4c7a794a00cc684a9c4e03fcef0968e769d302f6 (diff) | |
| parent | 505e883fc09f344a326437a0f457b1be6106a2b5 (diff) | |
| download | gitlab-ce-1bf9f012ccd744f415ffcb32c6af36dc04d7e07a.tar.gz | |
Merge branch 'fix-milestone-label-layout' into 'master'
Fixed labels layout on labels milestone tab
See merge request !11120
| -rw-r--r-- | app/assets/stylesheets/pages/labels.scss | 2 | ||||
| -rw-r--r-- | app/views/shared/milestones/_labels_tab.html.haml | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss index e1ef0b029a5..c10588ac58e 100644 --- a/app/assets/stylesheets/pages/labels.scss +++ b/app/assets/stylesheets/pages/labels.scss @@ -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; diff --git a/app/views/shared/milestones/_labels_tab.html.haml b/app/views/shared/milestones/_labels_tab.html.haml index 33f93dccd3c..a26b3b8009e 100644 --- a/app/views/shared/milestones/_labels_tab.html.haml +++ b/app/views/shared/milestones/_labels_tab.html.haml @@ -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' |