Skip to content

Commit c502974

Browse files
author
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/MAGETWO-36486' into PR
2 parents 5239b0a + 09625e4 commit c502974

File tree

8 files changed

+120
-65
lines changed

8 files changed

+120
-65
lines changed

‎app/code/Magento/Sales/view/frontend/layout/sales_guest_creditmemo.xml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,17 @@
1010
<update handle="sales_order_item_price"/>
1111
<update handle="sales_order_guest_info_links"/>
1212
<body>
13+
<referenceContainer name="page.main.title">
14+
<block class="Magento\Sales\Block\Order\Info" name="order.status" template="order/order_status.phtml" />
15+
<block class="Magento\Sales\Block\Order\Info" name="order.date" template="order/order_date.phtml" />
16+
<container name="order.actions.container" htmlTag="div" htmlClass="actions-toolbar order-actions-toolbar">
17+
<block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons" cacheable="false">
18+
<block class="Magento\Sales\Block\Order\Info\Buttons\Rss" as="buttons.rss" name="sales.order.info.buttons.rss" cacheable="false"/>
19+
</block>
20+
</container>
21+
</referenceContainer>
1322
<referenceContainer name="content">
14-
<block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info">
15-
<block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons" cacheable="false"/>
16-
</block>
17-
<block class="Magento\Sales\Block\Order\Creditmemo" name="sales.order.creditmemo" after="sales.order.info" cacheable="false">
23+
<block class="Magento\Sales\Block\Order\Creditmemo" name="sales.order.creditmemo" after="sales.order.info.links" cacheable="false">
1824
<block class="Magento\Sales\Block\Order\Creditmemo\Items" name="creditmemo_items" template="order/creditmemo/items.phtml">
1925
<block class="Magento\Framework\View\Element\RendererList" name="sales.order.creditmemo.renderers" as="renderer.list"/>
2026
<block class="Magento\Sales\Block\Order\Creditmemo\Totals" name="creditmemo_totals" template="order/totals.phtml">
@@ -27,9 +33,7 @@
2733
<block class="Magento\Sales\Block\Order\Comments" name="creditmemo_comments" template="order/comments.phtml"/>
2834
</block>
2935
</block>
30-
</referenceContainer>
31-
<referenceContainer name="sales.order.info.buttons">
32-
<block class="Magento\Sales\Block\Order\Info\Buttons\Rss" as="buttons.rss" name="sales.order.info.buttons.rss" cacheable="false"/>
36+
<block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info" after="sales.order.creditmemo"/>
3337
</referenceContainer>
3438
</body>
3539
</page>

‎app/code/Magento/Sales/view/frontend/layout/sales_guest_invoice.xml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,17 @@
1010
<update handle="sales_order_item_price"/>
1111
<update handle="sales_order_guest_info_links"/>
1212
<body>
13+
<referenceContainer name="page.main.title">
14+
<block class="Magento\Sales\Block\Order\Info" name="order.status" template="order/order_status.phtml" />
15+
<block class="Magento\Sales\Block\Order\Info" name="order.date" template="order/order_date.phtml" />
16+
<container name="order.actions.container" htmlTag="div" htmlClass="actions-toolbar order-actions-toolbar">
17+
<block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons" cacheable="false">
18+
<block class="Magento\Sales\Block\Order\Info\Buttons\Rss" as="buttons.rss" name="sales.order.info.buttons.rss" cacheable="false"/>
19+
</block>
20+
</container>
21+
</referenceContainer>
1322
<referenceContainer name="content">
14-
<block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info">
15-
<block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons" cacheable="false"/>
16-
</block>
17-
<block class="Magento\Sales\Block\Order\Invoice" name="sales.order.invoice" after="sales.order.info" cacheable="false">
23+
<block class="Magento\Sales\Block\Order\Invoice" name="sales.order.invoice" after="sales.order.info.links" cacheable="false">
1824
<block class="Magento\Sales\Block\Order\Invoice\Items" name="invoice_items" template="order/invoice/items.phtml">
1925
<block class="Magento\Framework\View\Element\RendererList" name="sales.order.invoice.renderers" as="renderer.list"/>
2026
<block class="Magento\Sales\Block\Order\Invoice\Totals" name="invoice_totals" template="order/totals.phtml">
@@ -27,9 +33,7 @@
2733
<block class="Magento\Sales\Block\Order\Comments" name="invoice_comments" template="order/comments.phtml"/>
2834
</block>
2935
</block>
30-
</referenceContainer>
31-
<referenceContainer name="sales.order.info.buttons">
32-
<block class="Magento\Sales\Block\Order\Info\Buttons\Rss" as="buttons.rss" name="sales.order.info.buttons.rss" cacheable="false"/>
36+
<block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info" after="-"/>
3337
</referenceContainer>
3438
</body>
3539
</page>

‎app/code/Magento/Sales/view/frontend/layout/sales_guest_shipment.xml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,17 @@
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
99
<update handle="sales_order_guest_info_links"/>
1010
<body>
11-
<referenceContainer name="content">
12-
<block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info">
13-
<block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons" cacheable="false"/>
14-
</block>
11+
<referenceContainer name="page.main.title">
12+
<block class="Magento\Sales\Block\Order\Info" name="order.status" template="order/order_status.phtml" />
13+
<block class="Magento\Sales\Block\Order\Info" name="order.date" template="order/order_date.phtml" />
14+
<container name="order.actions.container" htmlTag="div" htmlClass="actions-toolbar order-actions-toolbar">
15+
<block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons" cacheable="false">
16+
<block class="Magento\Sales\Block\Order\Info\Buttons\Rss" as="buttons.rss" name="sales.order.info.buttons.rss" cacheable="false"/>
17+
</block>
18+
</container>
1519
</referenceContainer>
16-
<referenceContainer name="sales.order.info.buttons">
17-
<block class="Magento\Sales\Block\Order\Info\Buttons\Rss" as="buttons.rss" name="sales.order.info.buttons.rss" cacheable="false"/>
20+
<referenceContainer name="content">
21+
<block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info" after="sales.order.shipment"/>
1822
</referenceContainer>
1923
</body>
2024
</page>

‎app/code/Magento/Sales/view/frontend/layout/sales_guest_view.xml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@
1010
<update handle="sales_order_item_price"/>
1111
<update handle="sales_order_guest_info_links"/>
1212
<body>
13-
<referenceContainer name="page.main.title">
13+
<referenceContainer name="page.main.title">
1414
<block class="Magento\Sales\Block\Order\Info" name="order.status" template="order/order_status.phtml" />
1515
<block class="Magento\Sales\Block\Order\Info" name="order.date" template="order/order_date.phtml" />
1616
<container name="order.actions.container" htmlTag="div" htmlClass="actions-toolbar order-actions-toolbar">
17-
<block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons" cacheable="false"/>
17+
<block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons" cacheable="false">
18+
<block class="Magento\Sales\Block\Order\Info\Buttons\Rss" as="buttons.rss" name="sales.order.info.buttons.rss" cacheable="false"/>
19+
</block>
1820
</container>
1921
</referenceContainer>
2022
<referenceContainer name="content">
@@ -30,10 +32,7 @@
3032
</block>
3133
</block>
3234
</block>
33-
<block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info"/>
34-
</referenceContainer>
35-
<referenceContainer name="sales.order.info.buttons">
36-
<block class="Magento\Sales\Block\Order\Info\Buttons\Rss" as="buttons.rss" name="sales.order.info.buttons.rss" cacheable="false"/>
35+
<block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info" />
3736
</referenceContainer>
3837
</body>
3938
</page>

‎app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
// */
55

66
//
7-
// Common
8-
//--------------------------------------
7+
// Common
8+
// ---------------------------------------------
99

1010
& when (@media-common = true) {
1111

@@ -95,6 +95,7 @@
9595
}
9696

9797
.account,
98+
[class^="sales-guest-"],
9899
.sales-guest-view {
99100
.page-title-wrapper {
100101
.page-title {
@@ -188,8 +189,10 @@
188189
}
189190

190191
//
191-
// Guest order view page
192-
//--------------------------------------
192+
// Guest order view page
193+
// ---------------------------------------------
194+
195+
[class^="sales-guest-"],
193196
.sales-guest-view {
194197
.column.main {
195198
.block:not(.widget) {
@@ -201,8 +204,9 @@
201204
}
202205

203206
//
204-
// Mobile
205-
//--------------------------------------
207+
// Mobile
208+
// ---------------------------------------------
209+
206210
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
207211
.account {
208212
.order-details-items {
@@ -232,8 +236,9 @@
232236
}
233237

234238
//
235-
// Desktop
236-
//--------------------------------------
239+
// Desktop
240+
// ---------------------------------------------
241+
237242
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
238243
.table-order-items {
239244
.subtotal,
@@ -269,8 +274,10 @@
269274
}
270275

271276
//
272-
// Guest order view page
273-
//--------------------------------------
277+
// Guest order view page
278+
// ---------------------------------------------
279+
280+
[class^="sales-guest-"],
274281
.sales-guest-view {
275282
.column.main {
276283
.block:not(.widget) {

‎app/design/frontend/Magento/blank/web/css/print.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@
7777
h3 {
7878
page-break-after: avoid;
7979
}
80+
.nav-toggle {
81+
display: none !important;
82+
}
8083
.sidebar,
8184
.nav-sections,
8285
.header.content > *[class],

‎app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
@account-table-action-delete: @color-red12;
99

1010
//
11-
// Common
12-
//--------------------------------------
11+
// Common
12+
// ---------------------------------------------
1313

1414
& when (@media-common = true) {
1515

@@ -77,7 +77,7 @@
7777
}
7878
}
7979

80-
// My account
80+
// My account
8181
.account {
8282
.page-title-wrapper {
8383
.page-title {
@@ -107,8 +107,24 @@
107107
margin-bottom: 0;
108108
}
109109
}
110+
.legend {
111+
&:extend(.abs-account-title all);
112+
}
113+
}
114+
115+
.account,
116+
[class^="sales-guest-"],
117+
.sales-guest-view {
118+
.column.main {
119+
.order-details-items {
120+
.table-wrapper {
121+
.data.table {
122+
&:extend(.abs-table-striped all);
123+
}
124+
}
125+
}
126+
}
110127
.data.table {
111-
&:extend(.abs-table-striped all);
112128
.col.actions {
113129
.action {
114130
&:extend(.abs-account-actions all);
@@ -118,12 +134,9 @@
118134
}
119135
}
120136
}
121-
.legend {
122-
&:extend(.abs-account-title all);
123-
}
124137
}
125138

126-
// Checkout address (create shipping address)
139+
// Checkout address (create shipping address)
127140
.field.street {
128141
.field.additional {
129142
.label {
@@ -133,8 +146,9 @@
133146
}
134147

135148
//
136-
// Blocks & Widgets
137-
//--------------------------------------
149+
// Blocks & Widgets
150+
// ---------------------------------------------
151+
138152
.block {
139153
&:extend(.abs-margin-for-blocks-and-widgets all);
140154
.column.main & {
@@ -181,8 +195,9 @@
181195
}
182196

183197
//
184-
// Desktop
185-
//--------------------------------------
198+
// Desktop
199+
// ---------------------------------------------
200+
186201
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
187202
.login-container {
188203
&:extend(.abs-add-clearfix-desktop all);
@@ -217,7 +232,7 @@
217232
min-width: 600px;
218233
}
219234

220-
// My account
235+
// My account
221236
.account.page-layout-2columns-left {
222237
.sidebar-main,
223238
.sidebar-additional {
@@ -299,8 +314,9 @@
299314
}
300315

301316
//
302-
// Mobile @screen__s
303-
//--------------------------------------
317+
// Mobile @screen__s
318+
// ---------------------------------------------
319+
304320
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
305321
.account {
306322
.column.main,
@@ -314,8 +330,9 @@
314330
}
315331

316332
//
317-
// Mobile @screen__m
318-
//--------------------------------------
333+
// Mobile @screen__m
334+
// ---------------------------------------------
335+
319336
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
320337
.login-container {
321338
.fieldset {

0 commit comments

Comments
 (0)