Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d75a4b3c
Commit
d75a4b3c
authored
Apr 08, 2021
by
David O'Regan
Committed by
Natalia Tepluhina
Apr 08, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update label container background and border
parent
bf7589ad
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
4 deletions
+8
-4
app/assets/stylesheets/pages/labels.scss
app/assets/stylesheets/pages/labels.scss
+0
-1
app/views/admin/labels/index.html.haml
app/views/admin/labels/index.html.haml
+1
-1
app/views/groups/labels/index.html.haml
app/views/groups/labels/index.html.haml
+1
-1
app/views/projects/labels/index.html.haml
app/views/projects/labels/index.html.haml
+1
-1
changelogs/unreleased/label-background-colour.yml
changelogs/unreleased/label-background-colour.yml
+5
-0
No files found.
app/assets/stylesheets/pages/labels.scss
View file @
d75a4b3c
...
@@ -120,7 +120,6 @@
...
@@ -120,7 +120,6 @@
}
}
.labels-container
{
.labels-container
{
background-color
:
$gray-100
;
border-radius
:
$border-radius-default
;
border-radius
:
$border-radius-default
;
padding
:
$gl-padding
$gl-padding-8
;
padding
:
$gl-padding
$gl-padding-8
;
}
}
...
...
app/views/admin/labels/index.html.haml
View file @
d75a4b3c
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
=
_
(
'Labels'
)
=
_
(
'Labels'
)
%hr
%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?
-
if
@labels
.
present?
%ul
.manage-labels-list
%ul
.manage-labels-list
=
render
@labels
=
render
@labels
...
...
app/views/groups/labels/index.html.haml
View file @
d75a4b3c
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
#js-promote-label-modal
#js-promote-label-modal
=
render
'shared/labels/nav'
,
labels_or_filters:
labels_or_filters
,
can_admin_label:
can_admin_label
=
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?
-
if
@labels
.
any?
.text-muted
.text-muted
=
_
(
'Labels can be applied to %{features}. Group labels are available for any project within the group.'
)
%
{
features:
issuable_types
.
to_sentence
}
=
_
(
'Labels can be applied to %{features}. Group labels are available for any project within the group.'
)
%
{
features:
issuable_types
.
to_sentence
}
...
...
app/views/projects/labels/index.html.haml
View file @
d75a4b3c
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
#js-promote-label-modal
#js-promote-label-modal
=
render
'shared/labels/nav'
,
labels_or_filters:
labels_or_filters
,
can_admin_label:
can_admin_label
=
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?
-
if
can_admin_label
&&
search
.
blank?
%p
.text-muted
%p
.text-muted
=
_
(
'Labels can be applied to issues and merge requests.'
)
=
_
(
'Labels can be applied to issues and merge requests.'
)
...
...
changelogs/unreleased/label-background-colour.yml
0 → 100644
View file @
d75a4b3c
---
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment