diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2016-08-04 10:09:13 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2016-08-04 12:30:38 -0500 |
| commit | 5b5150301725fd192c328ee811facf2c89ffb528 (patch) | |
| tree | 181411721cf772aa46a22d8e2937153026bc2333 | |
| parent | 4e457100cffe4128523c32ca073c8353fd9fa3d1 (diff) | |
| download | gitlab-ce-5b5150301725fd192c328ee811facf2c89ffb528.tar.gz | |
Fix filter label tooltip HTML rendering
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/labels.scss | 11 | ||||
| -rw-r--r-- | app/views/shared/_labels_row.html.haml | 6 |
3 files changed, 13 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG index 77bcea54cf9..2edebcc2110 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,7 @@ v 8.11.0 (unreleased) - Add support for relative links starting with ./ or / to RelativeLinkFilter (winniehell) - Fix CI status icon link underline (ClemMakesApps) - The Repository class is now instrumented + - Fix filter label tooltip HTML rendering (ClemMakesApps) - Cache the commit author in RequestStore to avoid extra lookups in PostReceive - Expand commit message width in repo view (ClemMakesApps) - Cache highlighted diff lines for merge requests diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss index 3b1e38fc07d..606459f82cd 100644 --- a/app/assets/stylesheets/pages/labels.scss +++ b/app/assets/stylesheets/pages/labels.scss @@ -182,6 +182,17 @@ .btn { color: inherit; } + + a.btn { + padding: 0; + + .has-tooltip { + top: 0; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + line-height: 1.1; + } + } } .label-options-toggle { diff --git a/app/views/shared/_labels_row.html.haml b/app/views/shared/_labels_row.html.haml index dce492352ac..e324d0e5203 100644 --- a/app/views/shared/_labels_row.html.haml +++ b/app/views/shared/_labels_row.html.haml @@ -1,9 +1,5 @@ - labels.each do |label| %span.label-row.btn-group{ role: "group", aria: { label: label.name }, style: "color: #{text_color_for_bg(label.color)}" } - = link_to label.name, label_filter_path(@project, label, type: controller.controller_name), - class: "btn btn-transparent has-tooltip", - style: "background-color: #{label.color};", - title: escape_once(label.description), - data: { container: "body" } + = link_to_label(label, css_class: 'btn btn-transparent') %button.btn.btn-transparent.label-remove.js-label-filter-remove{ type: "button", style: "background-color: #{label.color};", data: { label: label.title } } = icon("times") |