diff options
| author | winh <winnie@gitlab.com> | 2017-05-24 15:37:55 +0300 |
|---|---|---|
| committer | winh <winnie@gitlab.com> | 2017-05-25 20:08:37 +0300 |
| commit | f565c4393efe1cadd05b22ae2fa7e36cee4d2793 (patch) | |
| tree | b3315a3bcf1e9e1f05346ea69036ba3277804d8f /app/helpers/labels_helper.rb | |
| parent | e63d27d83bdf9c07776c18ebc297d75728aa7e29 (diff) | |
Provide default for calculating label text color (!11681)
Diffstat (limited to 'app/helpers/labels_helper.rb')
| -rw-r--r-- | app/helpers/labels_helper.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb index e5b1e6e8bc7..4e6e6805920 100644 --- a/app/helpers/labels_helper.rb +++ b/app/helpers/labels_helper.rb @@ -69,13 +69,12 @@ module LabelsHelper end def render_colored_label(label, label_suffix = '', tooltip: true) - label_color = label.color || Label::DEFAULT_COLOR - text_color = text_color_for_bg(label_color) + text_color = text_color_for_bg(label.color) # Intentionally not using content_tag here so that this method can be called # by LabelReferenceFilter span = %(<span class="label color-label #{"has-tooltip" if tooltip}" ) + - %(style="background-color: #{label_color}; color: #{text_color}" ) + + %(style="background-color: #{label.color}; color: #{text_color}" ) + %(title="#{escape_once(label.description)}" data-container="body">) + %(#{escape_once(label.name)}#{label_suffix}</span>) |