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:
Filipa Lacerda 2018-05-07 17:50:51 +00:00
commit 7fd5d95065
2 changed files with 7 additions and 1 deletions

View File

@ -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",

View File

@ -0,0 +1,5 @@
---
title: Adjust issue boards list header label text color
merge_request:
author:
type: fixed