Commit 87765223 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'label-background-colour' into 'master'

Update label container background and border

See merge request gitlab-org/gitlab!58279
parents cdfddc41 d75a4b3c
......@@ -120,7 +120,6 @@
}
.labels-container {
background-color: $gray-100;
border-radius: $border-radius-default;
padding: $gl-padding $gl-padding-8;
}
......
......@@ -7,7 +7,7 @@
= _('Labels')
%hr
.labels.labels-container.admin-labels
.labels.labels-container.admin-labels.gl-bg-gray-10.gl-border-solid.gl-border-1.gl-border-gray-100
- if @labels.present?
%ul.manage-labels-list
= render @labels
......
......@@ -8,7 +8,7 @@
#js-promote-label-modal
= render 'shared/labels/nav', labels_or_filters: labels_or_filters, can_admin_label: can_admin_label
.labels-container.gl-mt-2
.labels-container.gl-mt-2.gl-bg-gray-10.gl-border-solid.gl-border-1.gl-border-gray-100
- if @labels.any?
.text-muted
= _('Labels can be applied to %{features}. Group labels are available for any project within the group.') % { features: issuable_types.to_sentence }
......
......@@ -8,7 +8,7 @@
#js-promote-label-modal
= render 'shared/labels/nav', labels_or_filters: labels_or_filters, can_admin_label: can_admin_label
.labels-container.gl-mt-3
.labels-container.gl-mt-3.gl-bg-gray-10.gl-border-solid.gl-border-1.gl-border-gray-100
- if can_admin_label && search.blank?
%p.text-muted
= _('Labels can be applied to issues and merge requests.')
......
---
title: Update label container background and border colour from dark grey to use the same light grey as the board's containers
merge_request: 58279
author:
type: changed
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