Commit af6aaf39 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Change delete notice; update mobile styles

parent bb8490b0
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
width: 200px; width: 200px;
margin-left: $gl-padding * 2;
margin-bottom: 0; margin-bottom: 0;
} }
...@@ -78,7 +79,7 @@ ...@@ -78,7 +79,7 @@
width: 100px; width: 100px;
margin-left: 10px; margin-left: 10px;
margin-bottom: 0; margin-bottom: 0;
vertical-align: middle; vertical-align: top;
} }
} }
...@@ -86,6 +87,10 @@ ...@@ -86,6 +87,10 @@
display: block; display: block;
margin-bottom: 10px; margin-bottom: 10px;
.description-text {
margin-bottom: $gl-padding;
}
a { a {
color: $blue-600; color: $blue-600;
} }
...@@ -118,9 +123,11 @@ ...@@ -118,9 +123,11 @@
} }
.manage-labels-list { .manage-labels-list {
@media(min-width: $screen-md-min) {
&.content-list li { &.content-list li {
padding: $gl-padding 0; 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;
...@@ -160,7 +167,7 @@ ...@@ -160,7 +167,7 @@
} }
} }
@media (max-width: $screen-sm-max) { @media (max-width: $screen-xs-max) {
.dropdown-menu { .dropdown-menu {
min-width: 100%; min-width: 100%;
} }
...@@ -169,6 +176,8 @@ ...@@ -169,6 +176,8 @@
.draggable-handler { .draggable-handler {
display: inline-block; display: inline-block;
vertical-align: top;
margin: 5px 0;
opacity: 0; opacity: 0;
transition: opacity .3s; transition: opacity .3s;
color: $gray-darkest; color: $gray-darkest;
...@@ -198,7 +207,7 @@ ...@@ -198,7 +207,7 @@
.toggle-priority { .toggle-priority {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: top;
button { button {
border-color: transparent; border-color: transparent;
...@@ -265,6 +274,11 @@ ...@@ -265,6 +274,11 @@
} }
.label-subscribe-button { .label-subscribe-button {
@media(min-width: $screen-md-min) {
min-width: 105px;
margin-left: $gl-padding;
}
.label-subscribe-button-icon { .label-subscribe-button-icon {
&[disabled] { &[disabled] {
opacity: 0.5; opacity: 0.5;
......
...@@ -54,7 +54,7 @@ class Groups::LabelsController < Groups::ApplicationController ...@@ -54,7 +54,7 @@ class Groups::LabelsController < Groups::ApplicationController
respond_to do |format| respond_to do |format|
format.html do format.html do
redirect_to group_labels_path(@group), status: 302, notice: 'Label was removed' redirect_to group_labels_path(@group), status: 302, notice: "#{@label.name} deleted permanently"
end end
format.js format.js
end end
......
...@@ -17,14 +17,14 @@ ...@@ -17,14 +17,14 @@
- if defined?(@project) && @project.group.present? - if defined?(@project) && @project.group.present?
%span.label-type %span.label-type
= label.model_name.human.titleize = label.model_name.human.titleize
- if label.description
%span.label-description %span.label-description
- if label.description.present?
.description-text
= markdown_field(label, :description) = markdown_field(label, :description)
.hidden-xs.hidden-sm .hidden-xs.hidden-sm
- if show_label_issues_link - if show_label_issues_link
= link_to_label(label, subject: subject) do = link_to_label(label, subject: subject) { 'Issues' }
Issues
- if show_label_merge_requests_link - if show_label_merge_requests_link
&middot; &middot;
= link_to_label(label, subject: subject, type: :merge_request) do = link_to_label(label, subject: subject, type: :merge_request) { 'Merge requests' }
Merge requests
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