diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-13 17:19:20 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-04-13 17:19:20 +0000 |
| commit | d7c7f54634ba0abf66408778318d9597d33aaa5c (patch) | |
| tree | 9903b878f1be5caba9edc132cf405fa00b1ba38d | |
| parent | 9c9893dd6d1d1b2e8677ac163ba1ff62362e63ff (diff) | |
| parent | 158bba238f06f43f2988552f02b32feb2bc245e6 (diff) | |
| download | gitlab-ce-d7c7f54634ba0abf66408778318d9597d33aaa5c.tar.gz | |
Merge branch 'issue_15093' into 'master'
Set tooltips for new added labels
Fixes #15093
See merge request !3667
| -rw-r--r-- | app/assets/javascripts/labels_select.js.coffee | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee index 90385621879..bc80980acb7 100644 --- a/app/assets/javascripts/labels_select.js.coffee +++ b/app/assets/javascripts/labels_select.js.coffee @@ -34,7 +34,7 @@ class @LabelsSelect labelHTMLTemplate = _.template( '<% _.each(labels, function(label){ %> <a href="<%= ["",issueURLSplit[1], issueURLSplit[2],""].join("/") %>issues?label_name=<%= label.title %>"> - <span class="label color-label" style="background-color: <%= label.color %>;"> + <span class="label has-tooltip color-label" title="<%= label.description %>" style="background-color: <%= label.color %>;"> <%= label.title %> </span> </a> @@ -165,6 +165,8 @@ class @LabelsSelect .html(template) $sidebarCollapsedValue.text(labelCount) + $('.has-tooltip', $value).tooltip(container: 'body') + $value .find('a') .each((i) -> |