diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-05-07 20:50:51 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-05-07 20:50:51 +0300 |
| commit | 7fd5d950659f7073d988d87a0c1163e1eb3a7955 (patch) | |
| tree | a617e9058bd360745a35ce403ee98277b9ec972f | |
| parent | ecc821a981984b8c1c7b29deab7c98a6958f4534 (diff) | |
| parent | f08f55093b906f98089ebf4af320a37e37101972 (diff) | |
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
| -rw-r--r-- | app/views/shared/boards/components/_board.html.haml | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/36983-osw-heading-labels-color-fix.yml | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/views/shared/boards/components/_board.html.haml b/app/views/shared/boards/components/_board.html.haml index 149bf8da4b9..4bff6468bb0 100644 --- a/app/views/shared/boards/components/_board.html.haml +++ b/app/views/shared/boards/components/_board.html.haml @@ -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", diff --git a/changelogs/unreleased/36983-osw-heading-labels-color-fix.yml b/changelogs/unreleased/36983-osw-heading-labels-color-fix.yml new file mode 100644 index 00000000000..082e0544dea --- /dev/null +++ b/changelogs/unreleased/36983-osw-heading-labels-color-fix.yml @@ -0,0 +1,5 @@ +--- +title: Adjust issue boards list header label text color +merge_request: +author: +type: fixed |