Skip to content

Commit a2a2a5d

Browse files
🔃 [EngCom] Public Pull Requests - 2.2-develop
Accepted Public Pull Requests: - #15431: typo correction (by @AnshuMishra17) - #15398: Fixed set template syntax issue (by @vgelani) - #15353: Responsive Design Footers bottom of screen on mobile devices #15118 (by @chirag-wagento) Fixed GitHub Issues: - #15118: Responsive Design, Footers do not snap to bottom of screen on mobile devices (reported by @gwharton) has been fixed in #15353 by @chirag-wagento in 2.2-develop branch Related commits: 1. eef111f
2 parents 67b5fe7 + a86e302 commit a2a2a5d

File tree

12 files changed

+23
-13
lines changed

12 files changed

+23
-13
lines changed

app/code/Magento/Backend/Block/Dashboard.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Dashboard extends \Magento\Backend\Block\Template
2020
/**
2121
* @var string
2222
*/
23-
protected $_template = 'dashboard/index.phtml';
23+
protected $_template = 'Magento_Backend::dashboard/index.phtml';
2424

2525
/**
2626
* @return void

app/code/Magento/Backend/Block/Dashboard/Graph.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
9090
/**
9191
* @var string
9292
*/
93-
protected $_template = 'dashboard/graph.phtml';
93+
protected $_template = 'Magento_Backend::dashboard/graph.phtml';
9494

9595
/**
9696
* Adminhtml dashboard data

app/code/Magento/Backend/Block/Dashboard/Grid.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
1717
/**
1818
* @var string
1919
*/
20-
protected $_template = 'dashboard/grid.phtml';
20+
protected $_template = 'Magento_Backend::dashboard/grid.phtml';
2121

2222
/**
2323
* Setting default for every grid on dashboard

app/code/Magento/Backend/Block/Dashboard/Sales.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Sales extends \Magento\Backend\Block\Dashboard\Bar
1515
/**
1616
* @var string
1717
*/
18-
protected $_template = 'dashboard/salebar.phtml';
18+
protected $_template = 'Magento_Backend::dashboard/salebar.phtml';
1919

2020
/**
2121
* @var \Magento\Framework\Module\Manager

app/code/Magento/Backend/Block/Dashboard/Totals.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Totals extends \Magento\Backend\Block\Dashboard\Bar
1616
/**
1717
* @var string
1818
*/
19-
protected $_template = 'dashboard/totalbar.phtml';
19+
protected $_template = 'Magento_Backend::dashboard/totalbar.phtml';
2020

2121
/**
2222
* @var \Magento\Framework\Module\Manager

app/code/Magento/Backend/Block/Page/Copyright.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ class Copyright extends \Magento\Backend\Block\Template
1818
*
1919
* @var string
2020
*/
21-
protected $_template = 'page/copyright.phtml';
21+
protected $_template = 'Magento_Backend::page/copyright.phtml';
2222
}

app/code/Magento/Backend/Block/Page/Footer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Footer extends \Magento\Backend\Block\Template
1717
/**
1818
* @var string
1919
*/
20-
protected $_template = 'page/footer.phtml';
20+
protected $_template = 'Magento_Backend::page/footer.phtml';
2121

2222
/**
2323
* @var \Magento\Framework\App\ProductMetadataInterface

app/code/Magento/Backend/Block/Page/Header.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Header extends \Magento\Backend\Block\Template
1818
/**
1919
* @var string
2020
*/
21-
protected $_template = 'page/header.phtml';
21+
protected $_template = 'Magento_Backend::page/header.phtml';
2222

2323
/**
2424
* Backend data

app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class Fieldset extends \Magento\Backend\Block\Template implements RendererInterf
2525
/**
2626
* @var string
2727
*/
28-
protected $_template = 'store/switcher/form/renderer/fieldset.phtml';
28+
protected $_template = 'Magento_Backend::store/switcher/form/renderer/fieldset.phtml';
2929

3030
/**
3131
* Retrieve an element

app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset/Element.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Eleme
2323
/**
2424
* @var string
2525
*/
26-
protected $_template = 'store/switcher/form/renderer/fieldset/element.phtml';
26+
protected $_template = 'Magento_Backend::store/switcher/form/renderer/fieldset/element.phtml';
2727

2828
/**
2929
* Retrieve an element

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1569,7 +1569,7 @@ protected function getEntityPkName(\Magento\Eav\Model\Entity\AbstractEntity $ent
15691569
}
15701570

15711571
/**
1572-
* Add requere tax percent flag for product collection
1572+
* Add require tax percent flag for product collection
15731573
*
15741574
* @return $this
15751575
*/

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@
262262
.copyright {
263263
.lib-css(background-color, @copyright__background-color);
264264
.lib-css(color, @color-white);
265+
box-sizing: border-box;
265266
display: block;
266267
padding: @indent__s;
267268
text-align: center;
@@ -313,13 +314,14 @@
313314
//
314315
// Widgets
315316
// ---------------------------------------------
316-
317+
// @codingStandardsIgnoreStart caused by bug in CodeSniffer implementation
317318
.sidebar {
318319
.widget.block:not(:last-child),
319320
.widget:not(:last-child) {
320321
margin-bottom: @indent__xl;
321322
}
322323
}
324+
// @codingStandardsIgnoreEnd
323325

324326
.widget {
325327
clear: both;
@@ -333,7 +335,9 @@
333335
.widget.block {
334336
.lib-css(margin, @indent__base 0);
335337
}
336-
.links .widget.block { margin: 0; }
338+
.links .widget.block {
339+
margin: 0;
340+
}
337341
}
338342

339343
.no-display:extend(.abs-no-display all) {
@@ -415,6 +419,12 @@
415419
}
416420
}
417421
}
422+
.page-footer,
423+
.copyright {
424+
bottom: 0;
425+
position: absolute;
426+
width: 100%;
427+
}
418428
}
419429

420430
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {

0 commit comments

Comments
 (0)