Skip to content

Commit 0085ba0

Browse files
author
Evgeniy Kolesov
committed
MAGETWO-32277: Login
- CR changes
1 parent 438ca9d commit 0085ba0

File tree

11 files changed

+99
-45
lines changed

11 files changed

+99
-45
lines changed

‎app/code/Magento/Backend/view/adminhtml/layout/admin_login.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-login" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
99
<update handle="styles" />
1010
<body>
11-
<!-- ToDo: delete after bugfix -->
11+
<!-- @todo ui: - delete after bugfix -->
1212
<remove name="legal"/>
1313
<remove name="page.menu"/>
1414
<remove name="header"/>
@@ -18,7 +18,7 @@
1818

1919
<remove name="global.search"/>
2020
<remove name="notification.messages"/>
21-
<!-- ToDo: end -->
21+
<!-- @todo ui: - end -->
2222

2323
<move element="messages" destination="login.content" before="-"/>
2424
<move element="copyright" destination="login.footer" before="-"/>

‎app/code/Magento/Backend/view/adminhtml/templates/admin/login_buttons.phtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<button
99
<?php $block->getUiId(); ?>
1010
class="action-login action-primary"
11-
title="<?php echo __('Log in')?>" type="submit">
1211
<span><?php echo __('Sign in')?></span>
1312
</button>
1413
</div>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
?>
1111
<?php switch ($block->getShowPart()):
1212
case 'logo': ?>
13-
<?php $edition = $block->getEdition() ? 'data-edition="' . $block->getEdition() . '"' : ''; ?>
13+
<?php $edition = $block->hasEdition() ? 'data-edition="' . $block->escapeHtml($block->getEdition()) . '"' : ''; ?>
1414
<?php $logoSrc = ($block->hasLogoImageSrc()) ? $block->escapeHtml($block->getLogoImageSrc()) : 'images/magento-logo.svg' ?>
1515
<a
1616
href="<?php echo $block->getHomeLink() ?>"
1717
<?php echo $edition; ?>
18-
class="logo"
19-
title="<?php echo $block->escapeHtml(__('Magento Admin Panel')) ?>">
20-
<img class="logo-img" src="<?php echo $block->getViewFileUrl($logoSrc) ?>" alt="<?php echo __('Magento Admin Panel') ?>"/>
18+
class="logo">
19+
<img class="logo-img" src="<?php echo $block->getViewFileUrl($logoSrc) ?>"
20+
alt="<?php echo $block->escapeHtml(__('Magento Admin Panel')) ?>"/>
2121
</a>
2222
<?php break; ?>
2323
<?php case 'user': ?>

‎app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</fieldset>
3030
<div class="actions-toolbar">
3131
<div class="primary">
32-
<button type="submit" title="<?php echo __('Reset a Password'); ?>" class="action submit primary"><span><?php echo __('Reset a Password'); ?></span></button>
32+
<button type="submit" class="action submit primary"><span><?php echo __('Reset a Password'); ?></span></button>
3333
</div>
3434
</div>
3535
</form>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd">
9-
<container name="root" htmlTag="div" htmlClass="page-wrapper">
9+
<container name="root" htmlTag="section" htmlClass="page-wrapper">
1010
<container name="login.header" htmlTag="header" htmlClass="login-header"/>
1111
<container name="login.content" htmlTag="div" htmlClass="login-content"/>
1212
<container name="login.footer" htmlTag="footer" htmlClass="login-footer"/>

‎app/code/Magento/Ui/view/base/web/templates/form/components/collection.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<!-- ko foreach: { data: element.elems, as: 'element' } -->
1111
<li class="address-list-item" data-bind="css: { 'ui-state-active': element.active }, click: activate">
1212
<div class="address-list-item-actions">
13-
<button class="action-delete" type="button" data-bind="attr: { title: $parent.removeLabel }, click: $parent.removeChild(element)">
13+
<button class="action-delete" type="button" data-bind="click: $parent.removeChild(element)">
1414
<span data-bind="text: $parent.removeLabel"></span>
1515
</button>
1616
</div>
@@ -22,7 +22,7 @@
2222
<!-- /ko -->
2323

2424
<li class="address-list-actions last">
25-
<button data-bind="attr: { title: element.addLabel }, click: element.addChild" type="button" class="scalable add">
25+
<button data-bind="click: element.addChild" type="button" class="scalable add">
2626
<span data-bind="text: element.addLabel"></span>
2727
</button>
2828
</li>

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

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,6 @@ nav ol {
363363
}
364364
.address-item-edit-content .admin__field[class]:not(.admin__field-option) > .admin__field-label:before,
365365
.page-layout-admin-login .admin__field[class]:not(.admin__field-option) > .admin__field-label:before {
366-
content: '';
367366
display: none;
368367
}
369368
.address-item-edit-content .admin__field[class]:not(.admin__field-option)._required > .admin__field-label span,
@@ -660,19 +659,19 @@ option:empty {
660659
margin-bottom: 0;
661660
}
662661
.admin__field + .admin__field {
663-
margin-top: 15px;
662+
margin-top: 1.5rem;
664663
}
665664
.admin__field:not(.admin__field-option) ~ .admin__field-option {
666-
margin-top: 5px;
665+
margin-top: .5rem;
667666
}
668667
.admin__field.admin__field-option ~ .admin__field-option {
669-
margin-top: 9px;
668+
margin-top: .9rem;
670669
}
671670
.admin__field ~ .admin__field-option:last-child {
672-
margin-bottom: 8px;
671+
margin-bottom: .8rem;
673672
}
674673
.admin__fieldset > .admin__field {
675-
margin-bottom: 30px;
674+
margin-bottom: 3rem;
676675
position: relative;
677676
z-index: 1;
678677
}
@@ -939,9 +938,36 @@ fieldset[disabled] .address-list .action-delete {
939938
vertical-align: middle;
940939
text-align: center;
941940
}
941+
.address-list .action-delete span {
942+
max-height: 1px;
943+
max-width: 1px;
944+
}
945+
.address-list .action-delete:hover {
946+
position: relative;
947+
z-index: 2;
948+
}
942949
.address-list .action-delete:hover:after {
943950
color: #060504;
944951
}
952+
.address-list .action-delete:hover span {
953+
background-color: #fcfcfc;
954+
border: 1px solid #989287;
955+
border-radius: .4rem;
956+
bottom: 100%;
957+
clip: auto;
958+
font-size: 1.2rem;
959+
height: auto;
960+
left: auto;
961+
margin: 0 auto .1rem;
962+
padding: .5rem;
963+
right: auto;
964+
top: auto;
965+
max-height: 50px;
966+
max-width: 200px;
967+
white-space: nowrap;
968+
width: auto;
969+
transition: all .01s linear .7s;
970+
}
945971
.address-item-edit {
946972
margin-left: 359px;
947973
max-width: 500px;
@@ -2702,8 +2728,8 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
27022728
border: 1px solid #e3e3e3;
27032729
box-shadow: 0 5px 30px 0 #000000;
27042730
margin: auto;
2705-
max-width: 450px;
2706-
min-height: 300px;
2731+
max-width: 45rem;
2732+
min-height: 30rem;
27072733
padding: 40px 80px 50px;
27082734
position: relative;
27092735
width: 100%;

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

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
// Variables
88
// _____________________________________________
99

10-
@login-box__background-color: #fff;
11-
@login-box__border: 1px solid #e3e3e3;
12-
@login-box__max-width: 450px;
13-
@login-box__min-height: 300px;
10+
@login-box__background-color: @color-white;
11+
@login-box__border: 1px solid @color-gray89;
12+
@login-box__max-width: 45rem;
13+
@login-box__min-height: 30rem;
1414
@login-box__shadow: 0 5px 30px 0 rgba(0, 0, 0, 1);
15-
@login-page__background-color: #373330;
15+
@login-page__background-color: @color-very-dark-grayish-orange;
1616

1717

1818
//
@@ -56,7 +56,7 @@
5656
color: @color-phoenix;
5757
font-size: 2.6rem;
5858
font-weight: @font-weight__light;
59-
line-height: 1.2;
59+
line-height: @line-height__s;
6060
margin: -1rem 0 .5rem;
6161
}
6262
.admin__field-info {
@@ -84,7 +84,6 @@
8484
display: none;
8585
}
8686

87-
8887
// Footer
8988
.login-footer {
9089
left: 0;
@@ -97,8 +96,10 @@
9796
font-weight: @font-weight__regular;
9897
margin: 5rem 0 2rem;
9998
text-align: center;
100-
.link-copyright:before {
101-
display: none;
99+
.link-copyright {
100+
&:before {
101+
display: none;
102+
}
102103
}
103104
}
104105
}
@@ -107,13 +108,15 @@
107108
// Login page features
108109
// ---------------------------------------------
109110

110-
.adminhtml-auth-login .form-actions {
111-
display: table;
112-
margin-top: -2rem;
113-
.links {
114-
display: table-header-group;
115-
}
116-
.actions {
117-
padding: 3rem 0 0;
111+
.adminhtml-auth-login {
112+
.form-actions {
113+
display: table;
114+
margin-top: -2rem;
115+
.links {
116+
display: table-header-group;
117+
}
118+
.actions {
119+
padding: 3rem 0 0;
120+
}
118121
}
119122
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
margin-bottom: 1rem - round(( @field-label__line-height - 1 ) * @field-label__font-size / 2 , 2); // Try to Calculate margin offset considering line-height;
5151
margin-top: 0rem - round(( @field-label__line-height - 1 ) * @field-label__font-size / 2, 2);
5252
&:before {
53-
content: '';
5453
display: none;
5554
}
5655
}
@@ -60,7 +59,7 @@
6059
padding-left: 1.5rem;
6160
&:after {
6261
left: 0;
63-
margin-left: 30px;
62+
margin-left: @temp_gutter; // @todo ui: update after finalizing Form Grid mixing css/source/forms/_temp.less:10
6463
}
6564
}
6665
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@field-label__color: @color-very-dark-gray-black;
1212
@field-label__disabled__color: @color-gray65-almost;
1313
@field-label__font-size: @font-size__base;
14-
@field-label__line-height: 1.2;
14+
@field-label__line-height: @line-height__s;
1515
@field-label__required__color: @color-phoenix;
1616
@field-note__color: @color-very-dark-gray-black;
1717
@field-note__font-size: @font-size__s;
@@ -107,23 +107,23 @@
107107
margin-bottom: 0;
108108

109109
& + & {
110-
margin-top: 15px;
110+
margin-top: 1.5rem;
111111
}
112112

113113
&:not(.admin__field-option) ~ .admin__field-option {
114-
margin-top: 5px;
114+
margin-top: .5rem;
115115
}
116116

117117
&.admin__field-option ~ .admin__field-option {
118-
margin-top: 9px;
118+
margin-top: .9rem;
119119
}
120120

121121
& ~ .admin__field-option:last-child {
122-
margin-bottom: 8px;
122+
margin-bottom: .8rem;
123123
}
124124

125125
.admin__fieldset > & {
126-
margin-bottom: 30px;
126+
margin-bottom: 3rem;
127127
position: relative;
128128
z-index: 1;
129129
&:hover {

0 commit comments

Comments
 (0)