diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-18 17:11:51 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-23 10:37:33 +0000 |
| commit | 6d40eee5ea5b37689e97eb26900f06ba51cf5715 (patch) | |
| tree | 6a91a0df2070b60101a5aa4eb9950c4e087bf6d5 | |
| parent | 8d147219cdee7eb7f698f0330576f854e0bd0a04 (diff) | |
| download | gitlab-ce-6d40eee5ea5b37689e97eb26900f06ba51cf5715.tar.gz | |
Added label color box in dropdown
| -rw-r--r-- | app/assets/javascripts/labels_select.js.coffee | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 14 |
2 files changed, 10 insertions, 7 deletions
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee index f3cb1e3bc09..684ad56cdb4 100644 --- a/app/assets/javascripts/labels_select.js.coffee +++ b/app/assets/javascripts/labels_select.js.coffee @@ -78,8 +78,11 @@ class @LabelsSelect else selected = if label.title is selectedLabel then 'is-active' else '' + color = if label.color? then "<span class='dropdown-label-box' style='background-color: #{label.color}'></span>" else "" + "<li> <a href='#' class='#{selected}'> + #{color} #{label.title} </a> </li>" diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index fbead004ade..0fb7d94d0dd 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -354,11 +354,11 @@ } } -.dropdown-menu-labels { - .label { - position: relative; - width: 30px; - margin-right: 5px; - text-indent: -99999px; - } +.dropdown-label-box { + position: relative; + top: 3px; + display: inline-block; + width: 20px; + height: 16px; + border-radius: 3px; } |