Merge branch '36983-osw-heading-labels-color-fix' into 'master'
Resolve "Issue Boards List Heading Label chooses Wrong Text Color" Closes #36983 See merge request gitlab-org/gitlab-ce!18786
This commit is contained in:
commit
7fd5d95065
|
@ -15,8 +15,9 @@
|
|||
":title" => '(list.label ? list.label.description : "")',
|
||||
data: { container: "body", placement: "bottom" },
|
||||
class: "label color-label title board-title-text",
|
||||
":style" => "{ backgroundColor: (list.label && list.label.color ? list.label.color : null), color: (list.label && list.label.color ? list.label.text_color : \"#2e2e2e\") }" }
|
||||
":style" => "{ backgroundColor: (list.label && list.label.color ? list.label.color : null), color: (list.label && list.label.text_color ? list.label.text_color : \"#2e2e2e\") }" }
|
||||
{{ list.title }}
|
||||
|
||||
- if can?(current_user, :admin_list, current_board_parent)
|
||||
%board-delete{ "inline-template" => true,
|
||||
":list" => "list",
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Adjust issue boards list header label text color
|
||||
merge_request:
|
||||
author:
|
||||
type: fixed
|
Loading…
Reference in New Issue