Commit 7fd5d950 authored by Filipa Lacerda's avatar Filipa Lacerda

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
parents ecc821a9 f08f5509
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
":title" => '(list.label ? list.label.description : "")', ":title" => '(list.label ? list.label.description : "")',
data: { container: "body", placement: "bottom" }, data: { container: "body", placement: "bottom" },
class: "label color-label title board-title-text", 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 }} {{ list.title }}
- if can?(current_user, :admin_list, current_board_parent) - if can?(current_user, :admin_list, current_board_parent)
%board-delete{ "inline-template" => true, %board-delete{ "inline-template" => true,
":list" => "list", ":list" => "list",
......
---
title: Adjust issue boards list header label text color
merge_request:
author:
type: fixed
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