Commit 0b7b3ca6 authored by Frédéric Caplette's avatar Frédéric Caplette

Merge branch '332532-change-top-nav-icon-to-hamburger' into 'master'

Change top nav menu icon to 'hamburger'

See merge request gitlab-org/gitlab!63378
parents 4055b8fe d2e7227f
...@@ -22,7 +22,7 @@ export default { ...@@ -22,7 +22,7 @@ export default {
<gl-nav class="navbar-sub-nav"> <gl-nav class="navbar-sub-nav">
<gl-nav-item-dropdown <gl-nav-item-dropdown
:text="navData.activeTitle" :text="navData.activeTitle"
icon="dot-grid" icon="hamburger"
menu-class="gl-mt-3! gl-max-w-none! gl-max-h-none! gl-sm-w-auto! js-top-nav-dropdown-menu" menu-class="gl-mt-3! gl-max-w-none! gl-max-h-none! gl-sm-w-auto! js-top-nav-dropdown-menu"
toggle-class="top-nav-toggle js-top-nav-dropdown-toggle gl-px-3!" toggle-class="top-nav-toggle js-top-nav-dropdown-toggle gl-px-3!"
no-flip no-flip
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
%ul.list-unstyled.navbar-sub-nav#js-top-nav{ data: { view_model: view_model.to_json } } %ul.list-unstyled.navbar-sub-nav#js-top-nav{ data: { view_model: view_model.to_json } }
%li %li
%a.top-nav-toggle{ href: '#', type: 'button', data: { toggle: "dropdown" } } %a.top-nav-toggle{ href: '#', type: 'button', data: { toggle: "dropdown" } }
= sprite_icon('dot-grid', css_class: "dropdown-icon") = sprite_icon('hamburger', css_class: "dropdown-icon")
= view_model[:activeTitle] = view_model[:activeTitle]
= sprite_icon('chevron-down') = sprite_icon('chevron-down')
......
...@@ -30,7 +30,7 @@ describe('~/nav/components/top_nav_app.vue', () => { ...@@ -30,7 +30,7 @@ describe('~/nav/components/top_nav_app.vue', () => {
it('renders nav item dropdown', () => { it('renders nav item dropdown', () => {
expect(findNavItemDropdown().attributes('href')).toBeUndefined(); expect(findNavItemDropdown().attributes('href')).toBeUndefined();
expect(findNavItemDropdown().attributes()).toMatchObject({ expect(findNavItemDropdown().attributes()).toMatchObject({
icon: 'dot-grid', icon: 'hamburger',
text: TEST_NAV_DATA.activeTitle, text: TEST_NAV_DATA.activeTitle,
'no-flip': '', 'no-flip': '',
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment