summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2019-04-19 17:23:00 +0000
committerClement Ho <clemmakesapps@gmail.com>2019-04-19 17:23:00 +0000
commit9c2b37d7c4621f8284530565fa1d361b12502715 (patch)
tree81946b01e54a5bf79ce6ba2b3604a37ef441b4c0 /app/assets/stylesheets
parent1879486daf66141088f2c935c76b38e0a4ce7df1 (diff)
parent0866a47a349cb89bb0d18eb2347055b1cdcba026 (diff)
downloadgitlab-ce-9c2b37d7c4621f8284530565fa1d361b12502715.tar.gz
Merge branch '57247-show-prioritized-labels-to-guests' into 'master'
Show prioritized labels to guests Closes #57247 See merge request gitlab-org/gitlab-ce!27307
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/pages/labels.scss6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index e3d0d0b0fa2..60a840aac1b 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -75,7 +75,7 @@
padding: 0;
margin-bottom: 0;
- > li:not(.empty-message):not(.is-not-draggable) {
+ > li:not(.empty-message):not(.no-border) {
background-color: $white-light;
margin-bottom: 5px;
display: flex;
@@ -92,7 +92,7 @@
opacity: 0.3;
}
- .prioritized-labels & {
+ .prioritized-labels:not(.is-not-draggable) & {
box-shadow: 0 1px 2px $issue-boards-card-shadow;
cursor: move;
cursor: grab;
@@ -353,7 +353,7 @@
@media (max-width: map-get($grid-breakpoints, md)-1) {
.manage-labels-list {
- > li:not(.empty-message):not(.is-not-draggable) {
+ > li:not(.empty-message):not(.no-border) {
flex-wrap: wrap;
}