Start redesign of group labels page
This commit is contained in:
parent
1f309b69df
commit
bb8490b018
3 changed files with 41 additions and 27 deletions
|
@ -64,7 +64,6 @@
|
||||||
.label {
|
.label {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
vertical-align: middle;
|
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -86,14 +85,17 @@
|
||||||
.label-description {
|
.label-description {
|
||||||
display: block;
|
display: block;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
margin-left: 50px;
|
|
||||||
|
a {
|
||||||
|
color: $blue-600;
|
||||||
|
}
|
||||||
|
|
||||||
@media (min-width: $screen-sm-min) {
|
@media (min-width: $screen-sm-min) {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
width: 30%;
|
max-width: 50%;
|
||||||
margin-left: 10px;
|
margin-left: 10px;
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
vertical-align: middle;
|
vertical-align: top;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -116,6 +118,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.manage-labels-list {
|
.manage-labels-list {
|
||||||
|
&.content-list li {
|
||||||
|
padding: $gl-padding 0;
|
||||||
|
}
|
||||||
|
|
||||||
> li:not(.empty-message):not(.is-not-draggable) {
|
> li:not(.empty-message):not(.is-not-draggable) {
|
||||||
background-color: $white-light;
|
background-color: $white-light;
|
||||||
cursor: move;
|
cursor: move;
|
||||||
|
@ -133,8 +139,6 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn-action {
|
.btn-action {
|
||||||
color: $gl-text-color;
|
|
||||||
|
|
||||||
.fa {
|
.fa {
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
|
@ -155,6 +159,12 @@
|
||||||
float: right;
|
float: right;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media (max-width: $screen-sm-max) {
|
||||||
|
.dropdown-menu {
|
||||||
|
min-width: 100%;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.draggable-handler {
|
.draggable-handler {
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
%li{ id: label_css_id, data: { id: label.id } }
|
%li{ id: label_css_id, data: { id: label.id } }
|
||||||
= render "shared/label_row", label: label
|
= render "shared/label_row", label: label
|
||||||
|
|
||||||
.visible-xs.visible-sm-inline-block.visible-md-inline-block.dropdown
|
.visible-xs.visible-sm-inline-block.dropdown
|
||||||
%button.btn.btn-default.label-options-toggle{ type: 'button', data: { toggle: "dropdown" } }
|
%button.btn.btn-default.label-options-toggle{ type: 'button', data: { toggle: "dropdown" } }
|
||||||
Options
|
Options
|
||||||
= icon('caret-down')
|
= icon('caret-down')
|
||||||
|
@ -46,14 +46,18 @@
|
||||||
data: {confirm: 'Remove this label? Are you sure?'},
|
data: {confirm: 'Remove this label? Are you sure?'},
|
||||||
class: 'text-danger'
|
class: 'text-danger'
|
||||||
|
|
||||||
.pull-right.hidden-xs.hidden-sm.hidden-md
|
.pull-right.hidden-xs.hidden-sm
|
||||||
- if show_label_merge_requests_link
|
- if label.is_a?(ProjectLabel) && label.project.group && can?(current_user, :admin_label, label.project.group)
|
||||||
= link_to_label(label, subject: subject, type: :merge_request, css_class: 'btn btn-transparent btn-action btn-link') do
|
= link_to promote_project_label_path(label.project, label), title: "Promote to Group Label", class: 'btn btn-transparent btn-action', data: {confirm: "You are about to promote #{label.title} to a group level. This will make this milestone available to all projects inside #{label.project.group.name}. The existing project label will be merged into the group level. This action cannot be reversed.", toggle: "tooltip"}, method: :post do
|
||||||
view merge requests
|
%span.sr-only Promote to Group
|
||||||
- if show_label_issues_link
|
= icon('level-up')
|
||||||
= link_to_label(label, subject: subject, css_class: 'btn btn-transparent btn-action btn-link') do
|
- if can?(current_user, :admin_label, label)
|
||||||
view open issues
|
= link_to edit_label_path(label), title: "Edit", class: 'btn btn-transparent btn-action', data: {toggle: "tooltip"} do
|
||||||
|
%span.sr-only Edit
|
||||||
|
= sprite_icon('pencil')
|
||||||
|
= link_to destroy_label_path(label), title: "Delete", class: 'btn btn-transparent btn-action remove-row', method: :delete, data: {confirm: label_deletion_confirm_text(label), toggle: "tooltip"} do
|
||||||
|
%span.sr-only Delete
|
||||||
|
= sprite_icon('remove')
|
||||||
- if current_user
|
- if current_user
|
||||||
.label-subscription.inline
|
.label-subscription.inline
|
||||||
- if can_subscribe_to_label_in_different_levels?(label)
|
- if can_subscribe_to_label_in_different_levels?(label)
|
||||||
|
@ -75,15 +79,3 @@
|
||||||
%button.js-subscribe-button.label-subscribe-button.btn.btn-default{ type: 'button', data: { status: status, url: toggle_subscription_path } }
|
%button.js-subscribe-button.label-subscribe-button.btn.btn-default{ type: 'button', data: { status: status, url: toggle_subscription_path } }
|
||||||
%span= label_subscription_toggle_button_text(label, @project)
|
%span= label_subscription_toggle_button_text(label, @project)
|
||||||
= icon('spinner spin', class: 'label-subscribe-button-loading')
|
= icon('spinner spin', class: 'label-subscribe-button-loading')
|
||||||
|
|
||||||
- if label.is_a?(ProjectLabel) && label.project.group && can?(current_user, :admin_label, label.project.group)
|
|
||||||
= link_to promote_project_label_path(label.project, label), title: "Promote to Group Label", class: 'btn btn-transparent btn-action', data: {confirm: "You are about to promote #{label.title} to a group level. This will make this milestone available to all projects inside #{label.project.group.name}. The existing project label will be merged into the group level. This action cannot be reversed.", toggle: "tooltip"}, method: :post do
|
|
||||||
%span.sr-only Promote to Group
|
|
||||||
= icon('level-up')
|
|
||||||
- if can?(current_user, :admin_label, label)
|
|
||||||
= link_to edit_label_path(label), title: "Edit", class: 'btn btn-transparent btn-action', data: {toggle: "tooltip"} do
|
|
||||||
%span.sr-only Edit
|
|
||||||
= icon('pencil-square-o')
|
|
||||||
= link_to destroy_label_path(label), title: "Delete", class: 'btn btn-transparent btn-action remove-row', method: :delete, data: {confirm: label_deletion_confirm_text(label), toggle: "tooltip"} do
|
|
||||||
%span.sr-only Delete
|
|
||||||
= icon('trash-o')
|
|
||||||
|
|
|
@ -1,3 +1,7 @@
|
||||||
|
- subject = local_assigns[:subject]
|
||||||
|
- 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)
|
||||||
|
|
||||||
%span.label-row
|
%span.label-row
|
||||||
- if can?(current_user, :admin_label, @project)
|
- if can?(current_user, :admin_label, @project)
|
||||||
.draggable-handler
|
.draggable-handler
|
||||||
|
@ -16,3 +20,11 @@
|
||||||
- if label.description
|
- if label.description
|
||||||
%span.label-description
|
%span.label-description
|
||||||
= markdown_field(label, :description)
|
= markdown_field(label, :description)
|
||||||
|
.hidden-xs.hidden-sm
|
||||||
|
- if show_label_issues_link
|
||||||
|
= link_to_label(label, subject: subject) do
|
||||||
|
Issues
|
||||||
|
- if show_label_merge_requests_link
|
||||||
|
·
|
||||||
|
= link_to_label(label, subject: subject, type: :merge_request) do
|
||||||
|
Merge requests
|
||||||
|
|
Loading…
Reference in a new issue