Skip to content

Commit 47be5d0

Browse files
author
Oleg Zinoviev
committed
MAGETWO-32315: Side Panels
- CR & QA updates
1 parent 2595571 commit 47be5d0

File tree

3 files changed

+30
-20
lines changed

3 files changed

+30
-20
lines changed

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_page-nav.less

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818

1919
@admin__page-nav-item__border-color: @border__color;
2020
@admin__page-nav-item__margin-vertical: 1.3rem;
21+
@admin__page-nav-item__margin-horizontal: .7rem;
2122
@admin__page-nav-item__active__color: @color-phoenix;
23+
@admin__page-nav-item__hover__background-color: darken(@admin__page-nav__background-color, 5%);
2224

2325
@admin__page-nav-link__color: @color-very-dark-gray-black;
2426
@admin__page-nav-link__padding: 2rem 4rem 2rem 1rem;
@@ -37,7 +39,7 @@
3739
@admin__page-nav-tooltip__z-index1: @field-tooltip__z-index;
3840
@admin__page-nav-tooltip__border-color: @color-gray75;
3941

40-
@admin__page-nav-transition: background-color .1s ease-out;
42+
@admin__page-nav-transition: border-color .1s ease-out, background-color .1s ease-out;
4143

4244
//
4345
// Page Nav (can be simple and collapsed)
@@ -109,7 +111,7 @@
109111
font-weight: @font-weight__bold;
110112
position: absolute;
111113
right: 1.8rem;
112-
top: 1.8rem;
114+
top: 2rem;
113115
}
114116

115117
&:hover {
@@ -136,11 +138,20 @@
136138

137139
.admin__page-nav-item {
138140
border-left: 3px solid transparent;
139-
margin-left: .7rem;
141+
margin-left: @admin__page-nav-item__margin-horizontal;
140142
padding: 0;
141143
position: relative;
144+
transition: @admin__page-nav-transition;
145+
146+
&:hover {
147+
border-color: @admin__page-nav-item__hover__background-color;
148+
.admin__page-nav-link {
149+
background: @admin__page-nav-item__hover__background-color;
150+
color: @admin__page-nav-link__hover__color;
151+
text-decoration: none;
152+
}
153+
}
142154

143-
&:hover,
144155
&._active,
145156
&.ui-state-active {
146157
border-color: @admin__page-nav-item__active__color;
@@ -150,9 +161,6 @@
150161
border-right: 1px solid @admin__page-nav-title__collapsible__background-color;
151162
color: @admin__page-nav-link__hover__color;
152163
margin-right: -1px;
153-
&:hover {
154-
text-decoration: none;
155-
}
156164
}
157165
}
158166

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4243,7 +4243,7 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
42434243
cursor: pointer;
42444244
margin: 0;
42454245
padding-right: 3.5rem;
4246-
transition: background-color 0.1s ease-out;
4246+
transition: border-color 0.1s ease-out, background-color 0.1s ease-out;
42474247
}
42484248
.admin__page-nav-title._collapsible + .admin__page-nav-items {
42494249
display: none;
@@ -4255,7 +4255,7 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
42554255
font-weight: 700;
42564256
position: absolute;
42574257
right: 1.8rem;
4258-
top: 1.8rem;
4258+
top: 2rem;
42594259
}
42604260
.admin__page-nav-title._collapsible:hover {
42614261
background: #f1f1f1;
@@ -4276,16 +4276,23 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
42764276
}
42774277
.admin__page-nav-item {
42784278
border-left: 3px solid transparent;
4279-
margin-left: .7rem;
4279+
margin-left: 0.7rem;
42804280
padding: 0;
42814281
position: relative;
4282+
transition: border-color 0.1s ease-out, background-color 0.1s ease-out;
4283+
}
4284+
.admin__page-nav-item:hover {
4285+
border-color: #e4e4e4;
4286+
}
4287+
.admin__page-nav-item:hover .admin__page-nav-link {
4288+
background: #e4e4e4;
4289+
color: #303030;
4290+
text-decoration: none;
42824291
}
4283-
.admin__page-nav-item:hover,
42844292
.admin__page-nav-item._active,
42854293
.admin__page-nav-item.ui-state-active {
42864294
border-color: #eb5202;
42874295
}
4288-
.admin__page-nav-item:hover .admin__page-nav-link,
42894296
.admin__page-nav-item._active .admin__page-nav-link,
42904297
.admin__page-nav-item.ui-state-active .admin__page-nav-link {
42914298
background: #ffffff;
@@ -4294,11 +4301,6 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
42944301
color: #303030;
42954302
margin-right: -1px;
42964303
}
4297-
.admin__page-nav-item:hover .admin__page-nav-link:hover,
4298-
.admin__page-nav-item._active .admin__page-nav-link:hover,
4299-
.admin__page-nav-item.ui-state-active .admin__page-nav-link:hover {
4300-
text-decoration: none;
4301-
}
43024304
.admin__page-nav-item._active .admin__page-nav-link,
43034305
.admin__page-nav-item.ui-state-active .admin__page-nav-link {
43044306
font-weight: 600;
@@ -4323,7 +4325,7 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
43234325
line-height: 1.2;
43244326
margin: 0 0 -1px;
43254327
padding: 2rem 4rem 2rem 1rem;
4326-
transition: background-color 0.1s ease-out;
4328+
transition: border-color 0.1s ease-out, background-color 0.1s ease-out;
43274329
word-break: break-all;
43284330
}
43294331
.admin__page-nav-link._changed .admin__page-nav-item-message._changed {

lib/web/mage/backend/tabs.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@
304304
.appendTo(curItemMessages);
305305
}
306306

307-
curItemMessage = curItemMessages.find('.'+messageType).addClass(activeClass);
307+
curItemMessage = curItemMessages.find('.' + messageType).addClass(activeClass);
308308
},
309309

310310
/**
@@ -315,7 +315,7 @@
315315
_onInvalid: function(e) {
316316
var cssError = '_error';
317317

318-
this.anchors.eq(e.data.index).addClass(cssError).find('.'+cssError).show();
318+
this.anchors.eq(e.data.index).addClass(cssError).find('.' + cssError).show();
319319
this._updateNavTitleMessages(e, cssError);
320320
},
321321

0 commit comments

Comments
 (0)