kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into 'master' 

Remove margin from user header buttons

Closes #57966

See merge request gitlab-org/gitlab-ce!30878
This commit is contained in:
Paul Slaughter 2019-08-20 20:51:00 +00:00
parent 1349a3d5b3 289576ccba
commit 80c57bf6d1
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/framework/header.scss
View File

@ -131,7 +131,6 @@
> li:not(.d-none) a { > li:not(.d-none) a {
@include media-breakpoint-down(xs) { @include media-breakpoint-down(xs) {
margin-left: 0; margin-left: 0;
min-width: 100%;
} }
} }
} }
@ -233,7 +232,6 @@
.impersonation-btn, .impersonation-btn,
.impersonation-btn:hover { .impersonation-btn:hover {
background-color: $white-light; background-color: $white-light;
margin-left: 0;
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;

7
app/views/layouts/header/_default.html.haml
View File

@ -4,6 +4,7 @@
- search_path_url = search_path(group_id: group.id) - search_path_url = search_path(group_id: group.id)
- else - else
- search_path_url = search_path - search_path_url = search_path
- has_impersonation_link = header_link?(:admin_impersonation)
%header.navbar.navbar-gitlab.navbar-expand-sm.js-navbar{ data: { qa_selector: 'navbar' } } %header.navbar.navbar-gitlab.navbar-expand-sm.js-navbar{ data: { qa_selector: 'navbar' } }
%a.sr-only.gl-accessibility{ href: "#content-body", tabindex: "1" } Skip to content %a.sr-only.gl-accessibility{ href: "#content-body", tabindex: "1" } Skip to content
@ -64,14 +65,14 @@
.dropdown-menu.dropdown-menu-right .dropdown-menu.dropdown-menu-right
= render 'layouts/header/help_dropdown' = render 'layouts/header/help_dropdown'
- if header_link?(:user_dropdown) - if header_link?(:user_dropdown)
%li.nav-item.header-user.dropdown{ data: { track_label: "profile_dropdown", track_event: "click_dropdown", track_value: "", qa_selector: 'user_menu' } } %li.nav-item.header-user.dropdown{ data: { track_label: "profile_dropdown", track_event: "click_dropdown", track_value: "", qa_selector: 'user_menu' }, class: ('mr-0' if has_impersonation_link) }
= link_to current_user, class: user_dropdown_class, data: { toggle: "dropdown" } do = link_to current_user, class: user_dropdown_class, data: { toggle: "dropdown" } do
= image_tag avatar_icon_for_user(current_user, 23), width: 23, height: 23, class: "header-user-avatar qa-user-avatar" = image_tag avatar_icon_for_user(current_user, 23), width: 23, height: 23, class: "header-user-avatar qa-user-avatar"
= sprite_icon('angle-down', css_class: 'caret-down') = sprite_icon('angle-down', css_class: 'caret-down')
.dropdown-menu.dropdown-menu-right .dropdown-menu.dropdown-menu-right
= render 'layouts/header/current_user_dropdown' = render 'layouts/header/current_user_dropdown'
- if header_link?(:admin_impersonation) - if has_impersonation_link
%li.nav-item.impersonation %li.nav-item.impersonation.ml-0
= link_to admin_impersonation_path, class: 'nav-link impersonation-btn', method: :delete, title: _('Stop impersonation'), aria: { label: _('Stop impersonation') }, data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do = link_to admin_impersonation_path, class: 'nav-link impersonation-btn', method: :delete, title: _('Stop impersonation'), aria: { label: _('Stop impersonation') }, data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do
= icon('user-secret') = icon('user-secret')
- if header_link?(:sign_in) - if header_link?(:sign_in)

5
changelogs/unreleased/remove-margin-from-user-header.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Remove margin from user header
merge_request: 30878
author: lucyfox
type: fixed