diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-05-25 18:50:02 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-05-25 18:50:02 +0000 |
| commit | 3ba9702d74c1a89defbfad5fb8193023a3475c99 (patch) | |
| tree | 7aee556300e94aa128c19e87e029963c65c0ddc2 /app/helpers | |
| parent | b3b6c78112c97df32c406f7dd18031e540df3297 (diff) | |
| parent | f565c4393efe1cadd05b22ae2fa7e36cee4d2793 (diff) | |
| download | gitlab-ce-3ba9702d74c1a89defbfad5fb8193023a3475c99.tar.gz | |
Merge branch 'winh-label-textcolor-default' into 'master'
Provide default for calculating label text color
Closes #32728
See merge request !11681
Diffstat (limited to 'app/helpers')
| -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>) |