File tree Expand file tree Collapse file tree 9 files changed +25
-23
lines changed
code/Magento/Customer/view/frontend/templates
Magento_Cms/web/css/source
Magento_Customer/web/css/source
Magento_Theme/web/css/source
luma/Magento_Customer/web/css/source
dev/tests/functional/tests/app/Magento/Customer/Test Expand file tree Collapse file tree 9 files changed +25
-23
lines changed Original file line number Diff line number Diff line change 11
11
<a class="action edit" href="<?php echo $ this ->getAddressBookUrl () ?> "><span><?php echo __ ('Manage Addresses ' ) ?> </span></a>
12
12
</div>
13
13
<div class="block-content">
14
- <div class="box box-address- billing">
14
+ <div class="box box-billing-address ">
15
15
<strong class="box-title">
16
16
<span><?php echo __ ('Default Billing Address ' ) ?> </span>
17
17
</strong>
24
24
<a class="action edit" href="<?php echo $ this ->getPrimaryBillingAddressEditUrl () ?> " data-ui-id="default-billing-edit-link"><span><?php echo __ ('Edit Address ' ) ?> </span></a>
25
25
</div>
26
26
</div>
27
- <div class="box box-address- shipping">
27
+ <div class="box box-shipping-address ">
28
28
<strong class="box-title">
29
29
<span><?php echo __ ('Default Shipping Address ' ) ?> </span>
30
30
</strong>
Original file line number Diff line number Diff line change 13
13
<div class="block-title"><strong><?php echo __ ('Default Addresses ' ) ?> </strong></div>
14
14
<div class="block-content">
15
15
<?php if ($ _pAddsses = $ this ->getDefaultBilling ()): ?>
16
- <div class="box box-address- billing">
16
+ <div class="box box-billing-address ">
17
17
<strong class="box-title">
18
18
<span><?php echo __ ('Default Billing Address ' ) ?> </span>
19
19
</strong>
29
29
</div>
30
30
</div>
31
31
<?php else : ?>
32
- <div class="box box-address- billing">
32
+ <div class="box box-billing-address ">
33
33
<strong class="box-title"><span><?php echo __ ('Default Billing Address ' ) ?> </span></strong>
34
34
<div class="box-content">
35
35
<p><?php echo __ ('You have no default billing address in your address book. ' ) ?> </p>
38
38
<?php endif ?>
39
39
40
40
<?php if ($ _pAddsses = $ this ->getDefaultShipping ()): ?>
41
- <div class="box box-address- shipping">
41
+ <div class="box box-shipping-address ">
42
42
<strong class="box-title">
43
43
<span><?php echo __ ('Default Shipping Address ' ) ?> </span>
44
44
</strong>
54
54
</div>
55
55
</div>
56
56
<?php else : ?>
57
- <div class="box box-address- shipping">
57
+ <div class="box box-shipping-address ">
58
58
<strong class="box-title"><span><?php echo __ ('Default Shipping Address ' ) ?> </span></strong>
59
59
<div class="box-content">
60
60
<p><?php echo __ ('You have no default shipping address in your address book. ' ) ?> </p>
Original file line number Diff line number Diff line change 13
13
.block-static-block ,
14
14
.block-cms-link {
15
15
& .widget {
16
- display : block ;
17
16
.css (margin-bottom , @widgets-indent-bottom );
17
+ .links & {
18
+ margin-bottom : 0 ;
19
+ }
18
20
}
19
-
20
21
}
21
22
22
23
.block-cms-link-inline {
23
24
& .widget {
24
25
margin : 0 ;
25
26
}
26
-
27
27
}
28
28
29
29
}
Original file line number Diff line number Diff line change 54
54
}
55
55
}
56
56
57
- .box-address- billing ,
58
- .box-address- shipping ,
57
+ .box-billing-address ,
58
+ .box-shipping-address ,
59
59
.box-information ,
60
60
.box-newsletter {
61
61
.box-content {
Original file line number Diff line number Diff line change @@ -137,10 +137,6 @@ body {
137
137
& :extend(.abs-reset-list all );
138
138
}
139
139
.links {
140
- display : inline-block ;
141
- vertical-align : top ;
142
- margin-bottom : 20px ;
143
- padding : 0 50px 0 0 ;
144
140
> li {
145
141
margin : 0 0 8px ;
146
142
}
@@ -305,6 +301,12 @@ body {
305
301
.block {
306
302
float : right ;
307
303
}
304
+ .links {
305
+ display : inline-block ;
306
+ vertical-align : top ;
307
+ margin-bottom : 20px ;
308
+ padding : 0 50px 0 0 ;
309
+ }
308
310
.switcher.store {
309
311
display : inline-block ;
310
312
padding-right : 50px ;
Original file line number Diff line number Diff line change 67
67
}
68
68
}
69
69
70
- .box-address- billing ,
71
- .box-address- shipping ,
70
+ .box-billing-address ,
71
+ .box-shipping-address ,
72
72
.box-information ,
73
73
.box-newsletter {
74
74
.box-content {
280
280
}
281
281
}
282
282
283
- .box-address- billing ,
284
- .box-address- shipping ,
283
+ .box-billing-address ,
284
+ .box-shipping-address ,
285
285
.box-information {
286
286
.box-content {
287
287
& :extend(.abs-account-block-font-size all );
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ class AddressesDefault extends Block
19
19
*
20
20
* @var string
21
21
*/
22
- protected $ changeBillingAddressSelector = '.box-address- billing a ' ;
22
+ protected $ changeBillingAddressSelector = '.box-billing-address a ' ;
23
23
24
24
/**
25
25
* Click on address book menu item
Original file line number Diff line number Diff line change @@ -25,14 +25,14 @@ class Address extends Block
25
25
*
26
26
* @var string
27
27
*/
28
- protected $ shippingAddressBlock = '.box-address- shipping ' ;
28
+ protected $ shippingAddressBlock = '.box-shipping-address ' ;
29
29
30
30
/**
31
31
* Billing address block selector
32
32
*
33
33
* @var string
34
34
*/
35
- protected $ billingAddressBlock = '.box-address- billing ' ;
35
+ protected $ billingAddressBlock = '.box-billing-address ' ;
36
36
37
37
/**
38
38
* Edit Default Billing Address
Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ class DefaultAddress extends Page
26
26
*
27
27
* @var string
28
28
*/
29
- protected $ defaultAddressesSelector = '.block-addresses-default .box-address- billing ' ;
29
+ protected $ defaultAddressesSelector = '.block-addresses-default .box-billing-address ' ;
30
30
31
31
/**
32
32
* Get default addresses block
You can’t perform that action at this time.
0 commit comments