Skip to content

Commit cf69b82

Browse files
author
Bogdan Plieshka
committed
MAGETWO-32254: Footer
- Applied footer to migration and old styles - Some improvements and cleanup
1 parent cb845b2 commit cf69b82

File tree

18 files changed

+143
-107
lines changed

18 files changed

+143
-107
lines changed

‎app/code/Magento/Backend/Block/Page/Locale.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function getLocaleSelect()
8282
->setName('locale')
8383
->setId('footer_interface_locale')
8484
->setTitle(__('Interface Language'))
85-
->setClass('form-el-select')
85+
->setClass('admin__control-select')
8686
->setValue($this->_localeResolver->getLocale()->__toString())
8787
->setOptions($this->_localeLists->getTranslatedOptionLocales())
8888
->getHtml();

‎app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// @codingStandardsIgnoreFile
88

99
?>
10-
<div class="copyright">
11-
<a class="link-copyright" href="http://magento.com" target="_blank"><?php echo __('Magento') ?></a>
10+
<p class="copyright">
11+
<a class="link-copyright" href="http://magento.com" target="_blank" title="<?php echo __('Magento') ?>"></a>
1212
<?php echo __('Copyright &copy; %1 Magento, Inc. All rights reserved.', date('Y')) ?>
13-
</div>
13+
</p>

‎app/code/Magento/Backend/view/adminhtml/templates/page/footer.phtml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// @codingStandardsIgnoreFile
88

99
?>
10-
<div class="magento-version">
11-
<b><?php echo __('Magento'); ?></b>
10+
<p class="magento-version">
11+
<strong><?php echo __('Magento'); ?></strong>
1212
<?php echo __('ver. %1', \Magento\Framework\AppInterface::VERSION) ?>
13-
</div>
13+
</p>

‎app/code/Magento/Backend/view/adminhtml/templates/page/locale.phtml

+2-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88

99
?>
1010
<div class="locale-switcher col-m-5">
11-
<label class="label" for="locale-switcher"><span><?php echo __('Interface Locale'); ?></span></label>
12-
<div class="form-select-label">
13-
<?php echo $block->getLocaleSelect(); ?>
14-
</div>
11+
<label class="label" for="footer_interface_locale"><span><?php echo __('Interface Locale'); ?></span></label>
12+
<?php echo $block->getLocaleSelect(); ?>
1513
<script>
1614
(function () {
1715
'use strict';

‎app/code/Magento/DesignEditor/view/adminhtml/web/css/fonts/MUI-Icons.woff2

8.37 KB
Binary file not shown.

‎app/code/Magento/Theme/view/adminhtml/page_layout/admin-1column.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@
3333
</container>
3434
</container>
3535
<container name="js" as="js" label="JavaScript"/>
36-
<container name="page.footer.wrapper" as="page_footer_wrapper" after="page.content" htmlTag="footer" htmlClass="page-footer">
37-
<container name="footer" htmlTag="div" htmlClass="page-footer-content row" />
36+
<container name="page.footer.wrapper" after="page.content" as="page_footer_wrapper" htmlTag="div" htmlClass="admin__scope">
37+
<container htmlTag="footer" htmlClass="page-footer">
38+
<container name="footer" htmlTag="div" htmlClass="page-footer-content row" />
39+
</container>
3840
</container>
3941
</container>
4042
<container name="before.body.end" as="before_body_end" label="Before Body End" after="-"/>

‎app/code/Magento/Theme/view/adminhtml/page_layout/admin-2columns-left.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@
3838
</container>
3939
</container>
4040
<container name="js" as="js" label="JavaScript"/>
41-
<container name="page.footer.wrapper" as="page_footer_wrapper" after="page.content" htmlTag="footer" htmlClass="page-footer">
42-
<container name="footer" htmlTag="div" htmlClass="page-footer-content row" />
41+
<container name="page.footer.wrapper" after="page.content" as="page_footer_wrapper" htmlTag="div" htmlClass="admin__scope">
42+
<container htmlTag="footer" htmlClass="page-footer">
43+
<container name="footer" htmlTag="div" htmlClass="page-footer-content row" />
44+
</container>
4345
</container>
4446
</container>
4547
<container name="before.body.end" as="before_body_end" label="Before Body End" after="-"/>

‎app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
<body>
1818
<referenceContainer name="page.wrapper">
19-
2019
<container name="menu.wrapper.scope" htmlClass="admin__scope" before="-" htmlTag="div">
2120
<container name="menu.wrapper" htmlClass="menu-wrapper" before="-" htmlTag="div"/>
2221
</container>
@@ -25,5 +24,5 @@
2524
<move element="page.menu" destination="menu.wrapper" />
2625
<move element="logo" before="-" destination="menu.wrapper" />
2726

28-
</body>
27+
</body>
2928
</page>

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

+29-21
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// Page footer
88
// _____________________________________________
99

10-
@footer__background-color: @color-white-smoke;
10+
@footer__background-color: @body__background-color;
1111
@footer__border-color: @color-light-gray;
1212
@footer__border-width: .1rem;
1313
@footer__color: @color-very-dark-gray1;
@@ -21,51 +21,59 @@
2121
@footer-link__hover__text-decoration: underline;
2222

2323
.page-footer {
24-
background: @footer__background-color;
24+
background-color: @footer__background-color;
2525
border-top: @footer__border-width solid @footer__border-color;
2626
color: @footer__color;
2727
margin-top: auto;
2828
padding: 2.6rem 2rem 6rem 3rem;
2929
a {
3030
.link(
31-
@_link-color: @footer-link__color,
32-
@_link-text-decoration: @footer-link__text-decoration,
33-
@_link-color-visited: false,
34-
@_link-text-decoration-visited: false,
35-
@_link-color-hover: @footer-link__color,
36-
@_link-text-decoration-hover: false,
37-
@_link-color-active: false,
38-
@_link-text-decoration-active: false
31+
@_link-color: @footer-link__color,
32+
@_link-text-decoration: @footer-link__text-decoration,
33+
@_link-color-visited: false,
34+
@_link-text-decoration-visited: false,
35+
@_link-color-hover: @footer-link__color,
36+
@_link-text-decoration-hover: false,
37+
@_link-color-active: false,
38+
@_link-text-decoration-active: false
3939
);
4040
}
4141
}
4242

4343
.magento-version {
44-
margin-top: 1rem;
45-
b {
44+
margin-bottom: .5rem;
45+
strong {
4646
color: @footer-version__color;
4747
}
4848
}
4949

5050
// Copyright
5151
.copyright {
52-
margin: .6rem 0;
52+
margin-bottom: 0;
5353
position: relative;
5454
.link-copyright {
55-
background: url('@{baseDir}images/logo-admin.svg') no-repeat 0 0;
56-
background-size: 88px 56px;
5755
display: inline-block;
58-
height: 2.5rem;
59-
margin-right: .2rem;
60-
overflow: hidden;
56+
margin-right: .5rem;
6157
text-decoration: none;
62-
text-indent: 2.5rem;
63-
vertical-align: middle;
64-
width: 2.5rem;
58+
vertical-align: top;
59+
&:hover {
60+
&:before {
61+
color: lighten(@primary__color, 10%);
62+
}
63+
}
64+
&:before {
65+
&:extend(.abs-icon all);
66+
color: @primary__color;
67+
content: @icon-logo__content;
68+
font-size: 2.5rem;
69+
position: relative;
70+
top: -.2rem;
71+
}
6572
}
6673
}
6774

6875
.footer-legal {
76+
padding-top: 1rem;
6977
text-align: right;
7078
}
7179

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

-10
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,3 @@
66
//
77
// Page header
88
// _____________________________________________
9-
10-
.page-wrapper {
11-
display: flex;
12-
flex-direction: column;
13-
min-height: 100%;
14-
}
15-
16-
.page-content {
17-
margin-bottom: 5rem;
18-
}

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

+10-41
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ body {
2727
line-height: @baseLineHeight;
2828
font-weight: @baseFontWeight;
2929
.font-size(@baseFontSize);
30-
background: @primary7;
30+
background: #f5f5f5;
3131
.vendor-prefix-display(flex);
3232
.vendor-prefix-flex-direction(column);
3333
& > * {
@@ -38,18 +38,19 @@ body {
3838
}
3939

4040
.page-wrapper {
41-
.vendor-prefix-display(flex);
42-
.vendor-prefix-flex-direction(column);
43-
min-height: 100%;
41+
// .vendor-prefix-display(flex);
42+
// .vendor-prefix-flex-direction(column);
43+
// min-height: 100%;
4444
max-width: 100%;
4545
min-width: @layout__min-width + 2 * @layout-indent__width;
4646
margin-left: 8.8rem; // migration styles -> @menu__width
47+
background-color: #F2EBDE;
4748
box-sizing: border-box;
48-
& > * {
49-
.vendor-prefix-flex-grow(0);
50-
.vendor-prefix-flex-shrink(0);
51-
.vendor-prefix-flex-basis(auto);
52-
}
49+
// & > * {
50+
// .vendor-prefix-flex-grow(0);
51+
// .vendor-prefix-flex-shrink(0);
52+
// .vendor-prefix-flex-basis(auto);
53+
// }
5354
}
5455

5556
.page-header {
@@ -488,38 +489,6 @@ button {
488489
margin-bottom: 20px;
489490
}
490491

491-
.page-footer {
492-
background-color: @color-light;
493-
margin-top: auto;
494-
&-content {
495-
padding: 15px 0;
496-
&:extend(._layout-width all);
497-
.clearer();
498-
}
499-
}
500-
501-
.footer-legal {
502-
float: right;
503-
width: 550px;
504-
.link-report,
505-
.magento-version,
506-
.copyright {
507-
font-size: 13px;
508-
}
509-
&:before {
510-
content:"";
511-
display: inline-block;
512-
vertical-align: middle;
513-
position: absolute;
514-
z-index: 1;
515-
margin-top: 2px;
516-
margin-left: -35px;
517-
width: 30px;
518-
height: 35px;
519-
background-size: 109px 70px;
520-
background: url("@{baseDir}images/logo-admin.svg") no-repeat 0 -21px;
521-
}
522-
}
523492

524493
//
525494
// Icons

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

+37-15
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ button.tertiary:active {
939939
border-bottom-left-radius: 0;
940940
}
941941
.actions-split .action-toggle {
942-
padding: 4px 0.25rem;
942+
padding: 4px 0.5rem;
943943
display: inline-block;
944944
text-decoration: none;
945945
}
@@ -1026,7 +1026,7 @@ button.tertiary:active {
10261026
}
10271027
.actions-split .dropdown-menu li {
10281028
margin: 0;
1029-
padding: 3px 0.25rem;
1029+
padding: 3px 0.5rem;
10301030
}
10311031
.actions-split .dropdown-menu li:hover {
10321032
background: #e8e8e8;
@@ -1337,11 +1337,20 @@ table tbody tr:last-child td {
13371337
.col-xs-offset-0 {
13381338
margin-left: 0%;
13391339
}
1340+
.row-gutter {
1341+
margin-left: -1.5rem;
1342+
margin-right: -1.5rem;
1343+
}
1344+
.row-gutter .col-gutter {
1345+
padding-left: 1.5rem;
1346+
padding-right: 1.5rem;
1347+
}
13401348
.abs-icon,
13411349
[class^='icon-']:before,
13421350
[class*=' icon-']:before,
13431351
.admin__menu .level-0 > a:before,
1344-
.admin__menu .submenu-close:before {
1352+
.admin__menu .submenu-close:before,
1353+
.copyright .link-copyright:before {
13451354
font-family: 'Icons';
13461355
-webkit-font-smoothing: antialiased;
13471356
font-style: normal;
@@ -1439,8 +1448,16 @@ table th.required:after {
14391448
margin-top: -0.1rem;
14401449
padding: 2rem;
14411450
}
1451+
body {
1452+
background-color: #f5f5f5;
1453+
}
14421454
.page-wrapper {
14431455
padding-left: 8.8rem;
1456+
background-color: #ffffff;
1457+
}
1458+
.page-content {
1459+
padding-left: 3rem;
1460+
padding-right: 3rem;
14441461
}
14451462
/**
14461463
* @category design
@@ -1833,7 +1850,7 @@ table th.required:after {
18331850
z-index: 500;
18341851
}
18351852
.page-footer {
1836-
background: #f5f5f5;
1853+
background-color: #f5f5f5;
18371854
border-top: 0.1rem solid #dddddd;
18381855
color: #777777;
18391856
margin-top: auto;
@@ -1847,28 +1864,33 @@ table th.required:after {
18471864
color: #ef672f;
18481865
}
18491866
.magento-version {
1850-
margin-top: 1rem;
1867+
margin-bottom: .5rem;
18511868
}
1852-
.magento-version b {
1869+
.magento-version strong {
18531870
color: #666666;
18541871
}
18551872
.copyright {
1856-
margin: .6rem 0;
1873+
margin-bottom: 0;
18571874
position: relative;
18581875
}
18591876
.copyright .link-copyright {
1860-
background: url('../images/logo-admin.svg') no-repeat 0 0;
1861-
background-size: 88px 56px;
18621877
display: inline-block;
1863-
height: 2.5rem;
1864-
margin-right: .2rem;
1865-
overflow: hidden;
1878+
margin-right: .5rem;
18661879
text-decoration: none;
1867-
text-indent: 2.5rem;
1868-
vertical-align: middle;
1869-
width: 2.5rem;
1880+
vertical-align: top;
1881+
}
1882+
.copyright .link-copyright:hover:before {
1883+
color: #fd6e23;
1884+
}
1885+
.copyright .link-copyright:before {
1886+
color: #eb5202;
1887+
content: '\e606';
1888+
font-size: 2.5rem;
1889+
position: relative;
1890+
top: -0.2rem;
18701891
}
18711892
.footer-legal {
1893+
padding-top: 1rem;
18721894
text-align: right;
18731895
}
18741896
.locale-switcher .label {

‎app/design/adminhtml/Magento/backend/web/css/source/_buttons.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
@button__background-color__base: @color-gray89;
1818

1919
@button-primary__color: @color-white;
20-
@button-primary__background-color: @color-phoenix;
20+
@button-primary__background-color: @primary__color;
2121

2222
@button-secondary__color: @color-white;
2323
@button-secondary__background-color: @color-brownie;

0 commit comments

Comments
 (0)