Skip to content

Commit 226800f

Browse files
author
Natalia Momotenko
committed
MAGETWO-31855: UI improvements
1 parent b2e8df1 commit 226800f

File tree

9 files changed

+25
-23
lines changed

9 files changed

+25
-23
lines changed

app/code/Magento/Customer/view/frontend/templates/account/dashboard/address.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<a class="action edit" href="<?php echo $this->getAddressBookUrl() ?>"><span><?php echo __('Manage Addresses') ?></span></a>
1212
</div>
1313
<div class="block-content">
14-
<div class="box box-address-billing">
14+
<div class="box box-billing-address">
1515
<strong class="box-title">
1616
<span><?php echo __('Default Billing Address') ?></span>
1717
</strong>
@@ -24,7 +24,7 @@
2424
<a class="action edit" href="<?php echo $this->getPrimaryBillingAddressEditUrl() ?>" data-ui-id="default-billing-edit-link"><span><?php echo __('Edit Address') ?></span></a>
2525
</div>
2626
</div>
27-
<div class="box box-address-shipping">
27+
<div class="box box-shipping-address">
2828
<strong class="box-title">
2929
<span><?php echo __('Default Shipping Address') ?></span>
3030
</strong>

app/code/Magento/Customer/view/frontend/templates/address/book.phtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<div class="block-title"><strong><?php echo __('Default Addresses') ?></strong></div>
1414
<div class="block-content">
1515
<?php if ($_pAddsses = $this->getDefaultBilling()): ?>
16-
<div class="box box-address-billing">
16+
<div class="box box-billing-address">
1717
<strong class="box-title">
1818
<span><?php echo __('Default Billing Address') ?></span>
1919
</strong>
@@ -29,7 +29,7 @@
2929
</div>
3030
</div>
3131
<?php else: ?>
32-
<div class="box box-address-billing">
32+
<div class="box box-billing-address">
3333
<strong class="box-title"><span><?php echo __('Default Billing Address') ?></span></strong>
3434
<div class="box-content">
3535
<p><?php echo __('You have no default billing address in your address book.') ?></p>
@@ -38,7 +38,7 @@
3838
<?php endif ?>
3939

4040
<?php if ($_pAddsses = $this->getDefaultShipping()): ?>
41-
<div class="box box-address-shipping">
41+
<div class="box box-shipping-address">
4242
<strong class="box-title">
4343
<span><?php echo __('Default Shipping Address') ?></span>
4444
</strong>
@@ -54,7 +54,7 @@
5454
</div>
5555
</div>
5656
<?php else: ?>
57-
<div class="box box-address-shipping">
57+
<div class="box box-shipping-address">
5858
<strong class="box-title"><span><?php echo __('Default Shipping Address') ?></span></strong>
5959
<div class="box-content">
6060
<p><?php echo __('You have no default shipping address in your address book.') ?></p>

app/design/frontend/Magento/blank/Magento_Cms/web/css/source/widgets.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313
.block-static-block,
1414
.block-cms-link {
1515
&.widget {
16-
display: block;
1716
.css(margin-bottom, @widgets-indent-bottom);
17+
.links & {
18+
margin-bottom: 0;
19+
}
1820
}
19-
2021
}
2122

2223
.block-cms-link-inline {
2324
&.widget {
2425
margin: 0;
2526
}
26-
2727
}
2828

2929
}

app/design/frontend/Magento/blank/Magento_Customer/web/css/source/module.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
}
5555
}
5656

57-
.box-address-billing,
58-
.box-address-shipping,
57+
.box-billing-address,
58+
.box-shipping-address,
5959
.box-information,
6060
.box-newsletter {
6161
.box-content {

app/design/frontend/Magento/blank/Magento_Theme/web/css/source/module.less

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,6 @@ body {
137137
&:extend(.abs-reset-list all);
138138
}
139139
.links {
140-
display: inline-block;
141-
vertical-align: top;
142-
margin-bottom: 20px;
143-
padding: 0 50px 0 0;
144140
> li {
145141
margin: 0 0 8px;
146142
}
@@ -305,6 +301,12 @@ body {
305301
.block {
306302
float: right;
307303
}
304+
.links {
305+
display: inline-block;
306+
vertical-align: top;
307+
margin-bottom: 20px;
308+
padding: 0 50px 0 0;
309+
}
308310
.switcher.store {
309311
display: inline-block;
310312
padding-right: 50px;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@
6767
}
6868
}
6969

70-
.box-address-billing,
71-
.box-address-shipping,
70+
.box-billing-address,
71+
.box-shipping-address,
7272
.box-information,
7373
.box-newsletter {
7474
.box-content {
@@ -280,8 +280,8 @@
280280
}
281281
}
282282

283-
.box-address-billing,
284-
.box-address-shipping,
283+
.box-billing-address,
284+
.box-shipping-address,
285285
.box-information {
286286
.box-content {
287287
&:extend(.abs-account-block-font-size all);

dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesDefault.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class AddressesDefault extends Block
1919
*
2020
* @var string
2121
*/
22-
protected $changeBillingAddressSelector = '.box-address-billing a';
22+
protected $changeBillingAddressSelector = '.box-billing-address a';
2323

2424
/**
2525
* Click on address book menu item

dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/Dashboard/Address.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ class Address extends Block
2525
*
2626
* @var string
2727
*/
28-
protected $shippingAddressBlock = '.box-address-shipping';
28+
protected $shippingAddressBlock = '.box-shipping-address';
2929

3030
/**
3131
* Billing address block selector
3232
*
3333
* @var string
3434
*/
35-
protected $billingAddressBlock = '.box-address-billing';
35+
protected $billingAddressBlock = '.box-billing-address';
3636

3737
/**
3838
* Edit Default Billing Address

dev/tests/functional/tests/app/Magento/Customer/Test/Page/Address/DefaultAddress.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class DefaultAddress extends Page
2626
*
2727
* @var string
2828
*/
29-
protected $defaultAddressesSelector = '.block-addresses-default .box-address-billing';
29+
protected $defaultAddressesSelector = '.block-addresses-default .box-billing-address';
3030

3131
/**
3232
* Get default addresses block

0 commit comments

Comments
 (0)