diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-01-24 15:06:46 -0800 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-24 15:06:46 -0800 |
| commit | 2e911721d2d288a4b2015a55dedd19b2313a452f (patch) | |
| tree | 7ae39e2e0da31570522371bb50089e405e6f1746 /app/helpers/labels_helper.rb | |
| parent | 07ee83932fb755f4e0c89ba3bf172a6ae728d601 (diff) | |
| download | gitlab-ce-2e911721d2d288a4b2015a55dedd19b2313a452f.tar.gz | |
Update text_color_for_bg helper to support RGB triplet color codesrs-issue-12677
Closes #12677
Diffstat (limited to 'app/helpers/labels_helper.rb')
| -rw-r--r-- | app/helpers/labels_helper.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb index a2c3d4d2f32..92eac0560bd 100644 --- a/app/helpers/labels_helper.rb +++ b/app/helpers/labels_helper.rb @@ -83,7 +83,11 @@ module LabelsHelper end def text_color_for_bg(bg_color) - r, g, b = bg_color.slice(1,7).scan(/.{2}/).map(&:hex) + if bg_color.length == 4 + r, g, b = bg_color[1, 4].scan(/./).map { |v| (v * 2).hex } + else + r, g, b = bg_color[1, 7].scan(/.{2}/).map(&:hex) + end if (r + g + b) > 500 '#333333' |