Commit dc6ab436 authored by Dennis Tang's avatar Dennis Tang Committed by Rémy Coutable

Resolve "Re-arrange help-related user menu items into new Help menu"

parent 054d900e
...@@ -530,8 +530,6 @@ ...@@ -530,8 +530,6 @@
.header-user { .header-user {
&.show .dropdown-menu { &.show .dropdown-menu {
width: auto;
min-width: unset;
max-height: 323px; max-height: 323px;
margin-top: 4px; margin-top: 4px;
color: $gl-text-color; color: $gl-text-color;
...@@ -548,7 +546,7 @@ ...@@ -548,7 +546,7 @@
margin-right: 0; margin-right: 0;
display: block; display: block;
vertical-align: text-top; vertical-align: text-top;
max-width: 148px; max-width: 240px;
font-size: 12px; font-size: 12px;
gl-emoji { gl-emoji {
......
...@@ -19,12 +19,7 @@ ...@@ -19,12 +19,7 @@
- if current_user_menu?(:settings) - if current_user_menu?(:settings)
%li %li
= link_to s_("CurrentUser|Settings"), profile_path = link_to s_("CurrentUser|Settings"), profile_path
- if current_user_menu?(:help)
%li
= link_to _("Help"), help_path
- if current_user_menu?(:help) || current_user_menu?(:settings) || current_user_menu?(:profile)
%li.divider
= render 'shared/user_dropdown_contributing_link'
- if current_user_menu?(:sign_out) - if current_user_menu?(:sign_out)
%li.divider
%li %li
= link_to _("Sign out"), destroy_user_session_path, class: "sign-out-link" = link_to _("Sign out"), destroy_user_session_path, class: "sign-out-link"
...@@ -53,6 +53,12 @@ ...@@ -53,6 +53,12 @@
= sprite_icon('todo-done', size: 16) = sprite_icon('todo-done', size: 16)
%span.badge.badge-pill.todos-count{ class: ('hidden' if todos_pending_count.zero?) } %span.badge.badge-pill.todos-count{ class: ('hidden' if todos_pending_count.zero?) }
= todos_count_format(todos_pending_count) = todos_count_format(todos_pending_count)
%li.nav-item.header-help.dropdown
= link_to help_path, class: 'header-help-dropdown-toggle', data: { toggle: "dropdown" } do
= sprite_icon('question', size: 16)
= sprite_icon('angle-down', css_class: 'caret-down')
.dropdown-menu.dropdown-menu-right
= render 'layouts/header/help_dropdown'
- if header_link?(:user_dropdown) - if header_link?(:user_dropdown)
%li.nav-item.header-user.dropdown %li.nav-item.header-user.dropdown
= link_to current_user, class: user_dropdown_class, data: { toggle: "dropdown" } do = link_to current_user, class: user_dropdown_class, data: { toggle: "dropdown" } do
......
%ul
- if current_user_menu?(:help)
%li
= link_to _("Help"), help_path
- if current_user_menu?(:help) || current_user_menu?(:settings) || current_user_menu?(:profile)
= render 'shared/user_dropdown_contributing_link'
%li %li
= link_to "https://about.gitlab.com/contributing", target: '_blank', class: 'text-nowrap' do = link_to "https://about.gitlab.com/contributing", target: '_blank', class: 'text-nowrap' do
= _("Contribute to GitLab") = _("Contribute to GitLab")
= sprite_icon('external-link', size: 16)
%li.divider
---
title: Re-arrange help-related user menu items into new Help menu
merge_request: 22195
author:
type: added
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