Skip to content

Commit 1174eea

Browse files
author
Michail Slabko
committed
Merge remote-tracking branch 'mainline/develop' into configurable_vs_grid
Conflicts: app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_variables.less app/design/adminhtml/Magento/backend/web/css/source/_actions.less
2 parents cd8108a + 03e6a16 commit 1174eea

File tree

155 files changed

+4794
-1417
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+4794
-1417
lines changed

‎app/code/Magento/Checkout/view/frontend/web/template/shipping.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<li id="opc-shipping" data-bind="fadeVisible: visible()">
7+
<li id="opc-shipping" class="checkout-shipping-address" data-bind="fadeVisible: visible()">
88
<div class="step-title" data-bind="text: $t('Shipping Address')" data-role="title"></div>
99
<div id="checkout-step-shipping"
1010
class="step-content"
@@ -48,7 +48,10 @@
4848

4949

5050
<!--Shipping method template-->
51-
<li id="opc-shipping_method" data-bind="fadeVisible: visible(), blockLoader: isLoading" role="presentation">
51+
<li id="opc-shipping_method"
52+
class="checkout-shipping-method"
53+
data-bind="fadeVisible: visible(), blockLoader: isLoading"
54+
role="presentation">
5255
<div class="checkout-shipping-method">
5356
<div class="step-title" data-bind="text: $t('Shipping Methods')" data-role="title"></div>
5457
<!-- ko foreach: getRegion('before-shipping-method-form') -->

‎app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ public function getCountTotals()
303303

304304
$this->_addOrderStatusFilter($totalsCollection, $filterData);
305305

306-
if (count($totalsCollection->getItems()) < 1 || !$filterData->getData('from')) {
306+
if ($totalsCollection->load()->getSize() < 1 || !$filterData->getData('from')) {
307307
$this->setTotals(new \Magento\Framework\Object());
308308
$this->setCountTotals(false);
309309
} else {

‎app/code/Magento/Sales/Model/Resource/Report/Order/Collection.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,16 +102,16 @@ protected function _getSelectedColumns()
102102
}
103103

104104
/**
105-
* Add selected data
105+
* Apply custom columns before load
106106
*
107107
* @return $this
108108
*/
109-
protected function _initSelect()
109+
protected function _beforeLoad()
110110
{
111111
$this->getSelect()->from($this->getResource()->getMainTable(), $this->_getSelectedColumns());
112112
if (!$this->isTotals()) {
113113
$this->getSelect()->group($this->_periodFormat);
114114
}
115-
return parent::_initSelect();
115+
return parent::_beforeLoad();
116116
}
117117
}

‎app/code/Magento/Sales/Model/Resource/Report/Refunded/Collection/Order.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,16 @@ protected function _getSelectedColumns()
8383
}
8484

8585
/**
86-
* Add selected data
86+
* Apply custom columns before load
8787
*
88-
* @return \Magento\Sales\Model\Resource\Report\Refunded\Collection\Order
88+
* @return $this
8989
*/
90-
protected function _initSelect()
90+
protected function _beforeLoad()
9191
{
9292
$this->getSelect()->from($this->getResource()->getMainTable(), $this->_getSelectedColumns());
9393
if (!$this->isTotals()) {
9494
$this->getSelect()->group($this->_periodFormat);
9595
}
96-
return parent::_initSelect();
96+
return parent::_beforeLoad();
9797
}
9898
}

‎app/code/Magento/Sales/Model/Resource/Report/Shipping/Collection/Order.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@ protected function _getSelectedColumns()
8787
}
8888

8989
/**
90-
* Add selected data
90+
* Apply custom columns before load
9191
*
9292
* @return $this
9393
*/
94-
protected function _initSelect()
94+
protected function _beforeLoad()
9595
{
9696
$this->getSelect()->from($this->getResource()->getMainTable(), $this->_getSelectedColumns());
9797

@@ -101,6 +101,6 @@ protected function _initSelect()
101101
if ($this->isSubTotals()) {
102102
$this->getSelect()->group([$this->_periodFormat]);
103103
}
104-
return parent::_initSelect();
104+
return parent::_beforeLoad();
105105
}
106106
}

‎app/code/Magento/Tax/Model/Resource/Report/Collection.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ protected function _getSelectedColumns()
8585
}
8686

8787
/**
88-
* Add selected data
88+
* Apply custom columns before load
8989
*
9090
* @return $this
9191
*/
92-
protected function _initSelect()
92+
protected function _beforeLoad()
9393
{
9494
$this->getSelect()->from($this->getResource()->getMainTable(), $this->_getSelectedColumns());
9595
if (!$this->isTotals() && !$this->isSubTotals()) {
@@ -99,6 +99,6 @@ protected function _initSelect()
9999
if ($this->isSubTotals()) {
100100
$this->getSelect()->group([$this->_periodFormat]);
101101
}
102-
return parent::_initSelect();
102+
return parent::_beforeLoad();
103103
}
104104
}

‎app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less

Lines changed: 43 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323

2424
@menu-item__color: @color-gray65-lighten;
2525
@menu-item__font-size: 1rem;
26-
@menu-item__active__background-color: @color-brownie-almost;
26+
@menu-item__hover__background-color: @color-brownie-almost;
27+
@menu-item__active__background-color: darken(@menu-item__hover__background-color, 3%);
2728
@menu-item__active__color: @color-ivory;
2829
@menu-item-icon__height: 2.2rem;
2930

@@ -47,6 +48,37 @@
4748
@submenu-heading-group__indent-bottom: 3.8rem;
4849
@submenu-action-close__indent-right: 2.8rem;
4950

51+
//
52+
// Utilities
53+
// ---------------------------------------------
54+
55+
.admin__menu-link() {
56+
color: @menu-item__color;
57+
display: block;
58+
font-size: @menu-item__font-size;
59+
letter-spacing: .025em;
60+
min-height: 6.2rem;
61+
padding: 1.2rem .5rem .5rem;
62+
position: relative;
63+
text-align: center;
64+
text-decoration: none;
65+
text-transform: uppercase;
66+
transition: background-color .1s linear;
67+
word-wrap: break-word;
68+
z-index: @menu__z-index;
69+
&:focus {
70+
box-shadow: none;
71+
}
72+
&:before {
73+
&:extend(.abs-icon all);
74+
content: @icon-menu-item__content;
75+
display: block;
76+
font-size: 2.2rem;
77+
height: @menu-item-icon__height;
78+
margin-bottom: .3rem;
79+
}
80+
}
81+
5082
//
5183
// Menu wrapper
5284
// ---------------------------------------------
@@ -160,37 +192,22 @@
160192
&._active,
161193
&:hover {
162194
> a {
163-
background-color: @menu-item__active__background-color;
164195
color: @menu-item__active__color;
165196
}
166197
}
167-
> a {
168-
color: @menu-item__color;
169-
display: block;
170-
font-size: @menu-item__font-size;
171-
letter-spacing: .025em;
172-
min-height: 6.2rem;
173-
padding: 1.2rem .5rem .5rem;
174-
position: relative;
175-
text-align: center;
176-
text-decoration: none;
177-
text-transform: uppercase;
178-
transition: background-color .1s linear;
179-
word-wrap: break-word;
180-
z-index: @menu__z-index;
181-
&:focus {
182-
box-shadow: none;
198+
&._active {
199+
> a {
200+
background-color: @menu-item__hover__background-color;
183201
}
184-
&:before {
185-
&:extend(.abs-icon all);
186-
content: @icon-menu-item__content;
187-
display: block;
188-
font-family: @icons-admin__font-name;
189-
font-size: 2.2rem;
190-
height: @menu-item-icon__height;
191-
margin-bottom: .3rem;
202+
}
203+
&:hover {
204+
> a {
205+
background-color: @menu-item__active__background-color;
192206
}
193207
}
208+
> a {
209+
.admin__menu-link();
210+
}
194211
}
195212

196213
//

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
}
6565

6666
.notifications-action {
67+
color: @notifications-action__color;
6768
height: @page-header-action__height;
6869
padding: @notifications-action__padding-top @notifications-action__padding-side @notifications-action__padding-bottom;
6970
&:after {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
@search-global-input__active__padding-right: @search-global-icon__height + 2rem;
2626
@search-global-input__active__width: 25rem;
2727

28+
@search-global-label-icon__color: @text__color;
2829
@search-global-icon__height: 2rem;
2930
@search-global-icon__width: 2.2rem;
3031

@@ -128,6 +129,7 @@
128129
}
129130
&:before {
130131
&:extend(.abs-icon all);
132+
color: @search-global-label-icon__color;
131133
content: @icon-search__content;
132134
font-size: @search-global-icon__height;
133135
}

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
@user-account-menu__hover__background-color: @action__hover__background-color;
2222
@user-account-menu__active__background-color: darken(@color-blue-clear-sky, 5%);
2323

24+
@user-account-action__color: @text__color;
25+
@user-account-action__hover__color: @text__color;
26+
2427
//
2528

2629
.admin-user {
@@ -40,7 +43,7 @@
4043
.admin__action-dropdown {
4144
.action-toggle-triangle(
4245
@_dropdown__padding-right: @user-account__padding-right;
43-
@_triangle__color: @action-dropdown__color;
46+
@_triangle__color: @user-account-action__color;
4447
@_triangle__hover__color: @action-dropdown__hover__color;
4548
@_triangle__right: 1.3rem;
4649
);
@@ -52,13 +55,19 @@
5255
@_icon-user__size: 2rem;
5356

5457
&:extend(.abs-icon all);
58+
color: @user-account-action__color;
5559
content: @icon-account__content;
5660
font-size: @_icon-user__size;
5761
left: 1.1rem;
5862
margin-top: -(@_icon-user__size / 2) - .1rem;
5963
position: absolute;
6064
top: 50%;
6165
}
66+
&:hover {
67+
&:before {
68+
color: @user-account-action__hover__color;
69+
}
70+
}
6271
}
6372
// User account menu
6473
.admin__action-dropdown-menu {

0 commit comments

Comments
 (0)