Skip to content

Commit 95833f9

Browse files
zanileezanilee
committed
MAGETWO-43339: "Account Dashboard" menu is overlapped with Orders counter in Customer's "My Orders" Storefront page
1 parent 12955b1 commit 95833f9

File tree

3 files changed

+153
-138
lines changed
  • app/design/frontend/Magento

3 files changed

+153
-138
lines changed

‎app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,11 @@
144144
padding-left: @indent__l;
145145
}
146146
}
147+
.payments {
148+
.legend {
149+
&:extend(.abs-visually-hidden all);
150+
}
151+
}
147152
}
148153
}
149154

‎app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,11 @@
144144
padding-left: @indent__l;
145145
}
146146
}
147+
.payments {
148+
.legend {
149+
&:extend(.abs-visually-hidden all);
150+
}
151+
}
147152
}
148153
}
149154

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

Lines changed: 143 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -13,195 +13,200 @@
1313

1414
& when (@media-common = true) {
1515

16-
.login-container {
17-
.block {
18-
&-new-customer {
19-
.actions-toolbar {
20-
margin-top: 25px;
16+
.login-container {
17+
.block {
18+
&-new-customer {
19+
.actions-toolbar {
20+
margin-top: 25px;
21+
}
22+
}
23+
.block-title {
24+
&:extend(.abs-login-block-title all);
25+
.lib-font-size(18);
2126
}
2227
}
23-
.block-title {
24-
&:extend(.abs-login-block-title all);
25-
.lib-font-size(18);
26-
}
27-
}
28-
.fieldset {
29-
.lib-form-hasrequired(bottom);
30-
&:after {
31-
margin-top: 35px;
28+
.fieldset {
29+
.lib-form-hasrequired(bottom);
30+
&:after {
31+
margin-top: 35px;
32+
}
3233
}
3334
}
34-
}
3535

36-
.block-addresses-list {
37-
.items.addresses {
38-
> .item {
39-
margin-bottom: @indent__base;
40-
&:last-child {
41-
margin-bottom: 0;
36+
.block-addresses-list {
37+
.items.addresses {
38+
> .item {
39+
margin-bottom: @indent__base;
40+
&:last-child {
41+
margin-bottom: 0;
42+
}
4243
}
43-
}
44-
.item.actions {
45-
margin-top: @indent__xs;
46-
.action {
47-
&:extend(.abs-account-actions all);
44+
.item.actions {
45+
margin-top: @indent__xs;
46+
.action {
47+
&:extend(.abs-account-actions all);
48+
}
4849
}
4950
}
51+
address {
52+
&:extend(.abs-account-block-line-height all);
53+
}
5054
}
51-
address {
52-
&:extend(.abs-account-block-line-height all);
53-
}
54-
}
5555

56-
.form-address-edit {
57-
#region_id {
58-
display: none;
59-
}
60-
.actions-toolbar .action.primary {
61-
&:extend(.abs-button-l all);
56+
.form-address-edit {
57+
#region_id {
58+
display: none;
59+
}
60+
.actions-toolbar .action.primary {
61+
&:extend(.abs-button-l all);
62+
}
6263
}
63-
}
6464

65-
.form-edit-account {
66-
.fieldset.password {
67-
display: none;
65+
.form-edit-account {
66+
.fieldset.password {
67+
display: none;
68+
}
6869
}
69-
}
7070

71-
.form-create-account {
72-
.fieldset-fullname {
73-
.fields {
74-
.field {
75-
float: none;
71+
.form-create-account {
72+
.fieldset-fullname {
73+
.fields {
74+
.field {
75+
float: none;
76+
}
7677
}
7778
}
7879
}
79-
}
8080

81-
.box-billing-address,
82-
.box-shipping-address,
83-
.box-information,
84-
.box-newsletter {
85-
.box-content {
86-
&:extend(.abs-account-block-line-height all);
81+
.box-billing-address,
82+
.box-shipping-address,
83+
.box-information,
84+
.box-newsletter {
85+
.box-content {
86+
&:extend(.abs-account-block-line-height all);
87+
}
8788
}
88-
}
8989

90-
// My account
91-
.account {
92-
.page-title-wrapper {
93-
.page-title {
94-
display: inline-block;
90+
// My account
91+
.account {
92+
.page-title-wrapper {
93+
.page-title {
94+
display: inline-block;
95+
}
9596
}
96-
}
97-
.messages {
98-
margin-bottom: @indent__base;
99-
}
100-
.column.main {
101-
margin-bottom: @indent__l;
102-
h2 {
103-
margin-top: 0;
97+
.messages {
98+
margin-bottom: @indent__base;
10499
}
105-
.block:not(.widget) {
106-
&:extend(.abs-account-blocks all);
100+
.column.main {
101+
margin-bottom: @indent__l;
102+
h2 {
103+
margin-top: 0;
104+
}
105+
.block:not(.widget) {
106+
&:extend(.abs-account-blocks all);
107+
}
108+
}
109+
.sidebar-additional {
110+
margin-top: @indent__xl;
107111
}
108-
}
109-
.sidebar-additional {
110-
margin-top: @indent__xl;
111-
}
112112

113-
.table-wrapper {
114-
.lib-css(margin-bottom, @indent__base);
115-
border-bottom: 1px solid @account-table-border-bottom-color;
116-
&:last-child {
117-
margin-bottom: 0;
113+
.table-wrapper {
114+
.lib-css(margin-bottom, @indent__base);
115+
border-bottom: 1px solid @account-table-border-bottom-color;
116+
&:last-child {
117+
margin-bottom: 0;
118+
}
119+
}
120+
.legend {
121+
&:extend(.abs-account-title all);
118122
}
119123
}
120-
.legend {
121-
&:extend(.abs-account-title all);
122-
}
123-
}
124124

125-
.account,
126-
[class^="sales-guest-"],
127-
.sales-guest-view {
128-
.column.main {
129-
.order-details-items {
130-
.table-wrapper {
131-
.data.table {
132-
&:extend(.abs-table-striped all);
125+
.account,
126+
[class^="sales-guest-"],
127+
.sales-guest-view {
128+
.column.main {
129+
.order-details-items {
130+
.table-wrapper {
131+
.data.table {
132+
&:extend(.abs-table-striped all);
133+
}
133134
}
134135
}
135136
}
136-
}
137-
.data.table {
138-
.col.actions {
139-
.action {
140-
&:extend(.abs-account-actions all);
141-
&.delete {
142-
.lib-css(color, @account-table-action-delete);
137+
.data.table {
138+
.col.actions {
139+
.action {
140+
&:extend(.abs-account-actions all);
141+
&.delete {
142+
.lib-css(color, @account-table-action-delete);
143+
}
143144
}
144145
}
145146
}
146147
}
147-
}
148148

149-
// Checkout address (create shipping address)
150-
.field.street {
151-
.field.additional {
152-
.label {
153-
&:extend(.abs-visually-hidden all);
149+
// Checkout address (create shipping address)
150+
.field.street {
151+
.field.additional {
152+
.label {
153+
&:extend(.abs-visually-hidden all);
154+
}
154155
}
155156
}
156-
}
157157

158-
//
159-
// Blocks & Widgets
160-
// ---------------------------------------------
158+
//
159+
// Blocks & Widgets
160+
// ---------------------------------------------
161161

162-
.block {
163-
&:extend(.abs-margin-for-blocks-and-widgets all);
164-
.column.main & {
165-
&:last-child {
166-
margin-bottom: 0;
162+
.block {
163+
&:extend(.abs-margin-for-blocks-and-widgets all);
164+
.column.main & {
165+
&:last-child {
166+
margin-bottom: 0;
167+
}
167168
}
168-
}
169-
.title {
170-
strong {
171-
.lib-heading(h4);
172-
.column.main & {
169+
.title {
170+
strong {
171+
.lib-heading(h4);
172+
.column.main & {
173+
}
173174
}
175+
margin-bottom: @indent__s;
174176
}
175-
margin-bottom: @indent__s;
176-
}
177-
p:last-child {
178-
margin: 0;
179-
}
180-
.box-actions {
181-
margin-top: @indent__xs;
182-
.action {
183-
&:extend(.abs-account-actions all);
177+
p {
178+
&:last-child {
179+
margin: 0;
180+
}
181+
}
182+
.box-actions {
183+
margin-top: @indent__xs;
184+
.action {
185+
&:extend(.abs-account-actions all);
186+
}
184187
}
185188
}
186-
}
187189

188-
.control.captcha-image {
189-
.lib-css(margin-top, @indent__s);
190-
.captcha-img {
191-
vertical-align: middle;
190+
.control.captcha-image {
191+
.lib-css(margin-top, @indent__s);
192+
.captcha-img {
193+
vertical-align: middle;
194+
}
192195
}
193-
}
194196

195-
.account {
196-
.data.table-return-items {
197-
.qty {
198-
.input-text {
199-
&:extend(.abs-input-qty all);
197+
.account {
198+
.data.table-return-items {
199+
.qty {
200+
.input-text {
201+
&:extend(.abs-input-qty all);
202+
}
200203
}
201204
}
202205
}
203-
}
204206

207+
.order-products-toolbar {
208+
position: relative;
209+
}
205210
}
206211

207212
//

0 commit comments

Comments
 (0)