Remove unneeded inlines and remove hand where needed

This commit is contained in:
Luke Bennett 2018-04-19 01:17:29 +01:00
parent d0d521f362
commit c9f23ffe5b
No known key found for this signature in database
GPG key ID: A738E9C68D3BF31A
3 changed files with 11 additions and 6 deletions

View file

@ -79,10 +79,9 @@
.label-description {
display: block;
margin-bottom: 10px;
.description-text {
margin-bottom: $gl-padding;
margin: 0 $gl-padding 10px 0;
}
a {
@ -135,6 +134,10 @@
.prioritized-labels & {
box-shadow: 0 1px 2px $issue-boards-card-shadow;
}
&.no-hand {
cursor: auto;
}
}
.btn-action {
@ -286,6 +289,7 @@
.label-actions-list {
list-style: none;
flex-shrink: 0;
padding: 0;
}
.label-badge {
@ -305,7 +309,7 @@
.label-links {
list-style: none;
padding: 0;
padding: 0 $gl-padding 0 0;
white-space: nowrap;
}

View file

@ -5,9 +5,9 @@
- show_label_merge_requests_link = show_label_issuables_link?(label, :merge_requests, project: @project)
- show_label_issues_link = show_label_issuables_link?(label, :issues, project: @project)
%li.label-list-item{ id: label_css_id, data: { id: label.id } }
%li.label-list-item{ class: label.priorities.present? ? '' : 'no-hand', id: label_css_id, data: { id: label.id } }
= render "shared/label_row", label: label
%ul.label-actions-list.inline
%ul.label-actions-list
%li.inline
.label-badge.label-badge-gray= label.model_name.human.titleize
- if can?(current_user, :admin_label, @project)
@ -53,5 +53,6 @@
%span Subscribe at group level
- else
%button.js-subscribe-button.label-subscribe-button.btn.btn-default{ data: { status: status, url: toggle_subscription_path } }
%span= label_subscription_toggle_button_text(label, @project)
= render 'shared/delete_label_modal', label: label

View file

@ -2,7 +2,7 @@
- show_label_issues_link = show_label_issuables_link?(label, :issues, project: @project)
- show_label_merge_requests_link = show_label_issuables_link?(label, :merge_requests, project: @project)
.label-row.inline
.label-row
.label-name
= link_to_label(label, subject: @project, tooltip: false)
.label-description