summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-09-20 00:09:57 -0300
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-10-19 14:58:24 -0200
commitbdb7bf4b5188ffd68e54cbf671ba9ce1a4ffb1d1 (patch)
tree3f53930ff56ab0cfeceb0ab3af75fe9b75fefebd /app/assets
parentbf9d928b45516e716b0f7f099361ca03aa1454f8 (diff)
downloadgitlab-ce-bdb7bf4b5188ffd68e54cbf671ba9ce1a4ffb1d1.tar.gz
List group labels on project labels page
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/pages/labels.scss10
1 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index 9bac6d46355..cbd009ccd07 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -140,6 +140,10 @@
color: $gray-light;
}
+ .label-type {
+ opacity: 0.3;
+ }
+
li:hover {
.draggable-handler {
display: inline-block;
@@ -148,7 +152,11 @@
}
}
-.other-labels {
+.group-labels + .project-labels {
+ margin-top: 30px;
+}
+
+.group-labels, .project-labels {
.remove-priority {
display: none;
}