Skip to content

Commit 85c56cb

Browse files
author
Bogdan Plieshka
committed
MAGETWO-32250: Header
- QA changes. Fixed header user action text overflow
1 parent c77b730 commit 85c56cb

File tree

2 files changed

+10
-10
lines changed
  • app/design/adminhtml/Magento/backend

2 files changed

+10
-10
lines changed

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_user.less

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
// ---------------------------------------------
1313

1414
@user__font-size: round(@font-size__base - .1rem, 1);
15-
@user-account__padding-bottom: (@page-header-action__height - @user__font-size) / 2 - .05rem;
15+
@user-account__padding-bottom: .4rem;
1616
@user-account__padding-left: 4rem;
17-
@user-account__padding-top: (@page-header-action__height - @user__font-size) / 2 + .05rem;
17+
@user-account__padding-top: .7rem;
1818
@user-account__padding-right: 2.8rem;
1919
@user-menu__min-width: 20rem;
2020

2121
//
2222

2323
.admin-user {
2424
float: right;
25-
line-height: 1;
25+
line-height: @line-height__base; // ToDo UI: Delete with admin scope
2626
margin-left: .3rem;
2727
position: relative;
2828
z-index: @user-account-menu__z-index;
@@ -52,10 +52,10 @@
5252
.admin-user-account {
5353
&:extend(.abs-page-header-action all);
5454
.dropdown-triangle(
55-
@_dropdown__padding-right: @user-account__padding-right;
56-
@_triangle__color: @page-header-action__color;
57-
@_triangle__hover__color: @page-header-action__hover__color;
58-
@_triangle__right: 1.3rem;
55+
@_dropdown__padding-right: @user-account__padding-right;
56+
@_triangle__color: @page-header-action__color;
57+
@_triangle__hover__color: @page-header-action__hover__color;
58+
@_triangle__right: 1.3rem;
5959
);
6060
font-size: @user__font-size;
6161
letter-spacing: .05em;

app/design/adminhtml/Magento/backend/web/css/override.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2531,7 +2531,7 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
25312531
}
25322532
.admin-user {
25332533
float: right;
2534-
line-height: 1;
2534+
line-height: 1.4;
25352535
margin-left: .3rem;
25362536
position: relative;
25372537
z-index: 300;
@@ -2557,9 +2557,9 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
25572557
padding-right: 2.8rem;
25582558
font-size: 1.3rem;
25592559
letter-spacing: .05em;
2560-
padding-bottom: 1rem;
2560+
padding-bottom: 0.4rem;
25612561
padding-left: 4rem;
2562-
padding-top: 1.1rem;
2562+
padding-top: 0.7rem;
25632563
z-index: 2;
25642564
}
25652565
.admin-user-account._active:after,

0 commit comments

Comments
 (0)