diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-28 16:33:50 +0000 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-04-03 11:48:48 -0700 |
| commit | c3108c244beda4e07a546e395ab9e04014e3e5fa (patch) | |
| tree | 7a1c5b1c4ea9c10be7f1d003168e27cf109c295c | |
| parent | f9e321fc2bf4d93e6697780b170d5a05ae543b38 (diff) | |
| download | gitlab-ce-c3108c244beda4e07a546e395ab9e04014e3e5fa.tar.gz | |
Merge branch 'issuable-sidebar-collapsed-labels-icon' into 'master'
Fixed labels icon being hidden in collapsed issuable sidebar
Closes #29751
See merge request !10107
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 2 | ||||
| -rw-r--r-- | spec/javascripts/right_sidebar_spec.js | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 25a4aec0a38..6696b988511 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -121,7 +121,7 @@ - selected_labels = issuable.labels .block.labels .sidebar-collapsed-icon.js-sidebar-labels-tooltip{ title: issuable_labels_tooltip(issuable.labels_array), data: { placement: "left", container: "body" } } - = icon('tags', class: 'hidden', 'aria-hidden': 'true') + = icon('tags', 'aria-hidden': 'true') %span = selected_labels.size .title.hide-collapsed diff --git a/spec/javascripts/right_sidebar_spec.js b/spec/javascripts/right_sidebar_spec.js index 4ac7e911740..c5c30fdda90 100644 --- a/spec/javascripts/right_sidebar_spec.js +++ b/spec/javascripts/right_sidebar_spec.js @@ -78,5 +78,11 @@ require('~/extensions/jquery.js'); expect(todoToggleSpy.calls.count()).toEqual(1); }); + + it('should not hide collapsed icons', () => { + [].forEach.call(document.querySelectorAll('.sidebar-collapsed-icon'), (el) => { + expect(el.querySelector('.fa, svg').classList.contains('hidden')).toBeFalsy(); + }); + }); }); }).call(window); |