summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-01-22 14:20:34 -0700
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-01-29 14:38:36 -0700
commitaf6aaf39f996e888ecfc536a42f25610623f6e02 (patch)
tree9cffe137933cb1b2147d0780624adfa04799dd97 /app
parentbb8490b018bda7327a82e8ed38d3f1d60c9b4c39 (diff)
downloadgitlab-ce-af6aaf39f996e888ecfc536a42f25610623f6e02.tar.gz
Change delete notice; update mobile styles
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/pages/labels.scss24
-rw-r--r--app/controllers/groups/labels_controller.rb2
-rw-r--r--app/views/shared/_label_row.html.haml22
3 files changed, 31 insertions, 17 deletions
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index 91aa6648d41..9c4f51fc0d9 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -58,6 +58,7 @@
@media (min-width: $screen-sm-min) {
width: 200px;
+ margin-left: $gl-padding * 2;
margin-bottom: 0;
}
@@ -78,7 +79,7 @@
width: 100px;
margin-left: 10px;
margin-bottom: 0;
- vertical-align: middle;
+ vertical-align: top;
}
}
@@ -86,6 +87,10 @@
display: block;
margin-bottom: 10px;
+ .description-text {
+ margin-bottom: $gl-padding;
+ }
+
a {
color: $blue-600;
}
@@ -118,8 +123,10 @@
}
.manage-labels-list {
- &.content-list li {
- padding: $gl-padding 0;
+ @media(min-width: $screen-md-min) {
+ &.content-list li {
+ padding: $gl-padding 0;
+ }
}
> li:not(.empty-message):not(.is-not-draggable) {
@@ -160,7 +167,7 @@
}
}
- @media (max-width: $screen-sm-max) {
+ @media (max-width: $screen-xs-max) {
.dropdown-menu {
min-width: 100%;
}
@@ -169,6 +176,8 @@
.draggable-handler {
display: inline-block;
+ vertical-align: top;
+ margin: 5px 0;
opacity: 0;
transition: opacity .3s;
color: $gray-darkest;
@@ -198,7 +207,7 @@
.toggle-priority {
display: inline-block;
- vertical-align: middle;
+ vertical-align: top;
button {
border-color: transparent;
@@ -265,6 +274,11 @@
}
.label-subscribe-button {
+ @media(min-width: $screen-md-min) {
+ min-width: 105px;
+ margin-left: $gl-padding;
+ }
+
.label-subscribe-button-icon {
&[disabled] {
opacity: 0.5;
diff --git a/app/controllers/groups/labels_controller.rb b/app/controllers/groups/labels_controller.rb
index dda59262483..f3a9e591c3e 100644
--- a/app/controllers/groups/labels_controller.rb
+++ b/app/controllers/groups/labels_controller.rb
@@ -54,7 +54,7 @@ class Groups::LabelsController < Groups::ApplicationController
respond_to do |format|
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
format.js
end
diff --git a/app/views/shared/_label_row.html.haml b/app/views/shared/_label_row.html.haml
index 34da13ca52b..bd4f191502e 100644
--- a/app/views/shared/_label_row.html.haml
+++ b/app/views/shared/_label_row.html.haml
@@ -17,14 +17,14 @@
- if defined?(@project) && @project.group.present?
%span.label-type
= label.model_name.human.titleize
- - if label.description
- %span.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
- &middot;
- = link_to_label(label, subject: subject, type: :merge_request) do
- Merge requests
+
+ %span.label-description
+ - if label.description.present?
+ .description-text
+ = markdown_field(label, :description)
+ .hidden-xs.hidden-sm
+ - if show_label_issues_link
+ = link_to_label(label, subject: subject) { 'Issues' }
+ - if show_label_merge_requests_link
+ &middot;
+ = link_to_label(label, subject: subject, type: :merge_request) { 'Merge requests' }