Skip to content

Commit 5893608

Browse files
author
Oleg Zinoviev
committed
MAGETWO-37680: "Choose Variation" buttons lost alignment on "create Configurable Product" Backend page
1 parent 7ad03d2 commit 5893608

File tree

3 files changed

+50
-50
lines changed

3 files changed

+50
-50
lines changed

app/code/Magento/ConfigurableProduct/view/adminhtml/web/product/product.css

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,6 @@
160160
#product-variations-matrix .action-choose:hover,
161161
#product-variations-matrix .action-choose[disabled] {
162162
color: #b8b3a7;
163-
float: right;
164-
margin: 2px 0 0 5px;
165163
}
166164

167165
#product-variations-matrix .action-choose:hover {
@@ -187,28 +185,15 @@
187185
color: #a09a8c;
188186
}
189187

190-
#product-variations-matrix .col-name > input {
191-
width: 88%;
188+
#product-variations-matrix .col-name > input,
189+
#product-variations-matrix .col-sku > input {
190+
width: 90%;
192191
}
193192

194193
#product-variations-matrix .col-actions {
195194
width: 60px;
196195
}
197196

198-
#product-variations-matrix .col-name {
199-
width: 29%;
200-
}
201-
202-
#product-variations-matrix .col-sku {
203-
width: 20%;
204-
}
205-
206-
#product-variations-matrix .col-display,
207-
#product-variations-matrix .col-qty,
208-
#product-variations-matrix .col-weight {
209-
width: 5%;
210-
}
211-
212197
/* Select Associated Product popup window */
213198
#configurable_associated_products_grid .filter-actions,
214199
#configurable_associated_products_grid .filter {

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

Lines changed: 47 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -45,43 +45,63 @@
4545
}
4646
}
4747

48-
#product-variations-matrix .actions-image-uploader {
49-
.dropdown-split(
48+
#product-variations-matrix {
49+
.actions-image-uploader {
50+
.dropdown-split(
5051
@_dropdown-split-list-pointer: false
51-
);
52-
display: block;
53-
width: 50px;
52+
);
5453

55-
.action.toggle {
56-
padding: 0 2px;
57-
border: 1px solid #b7b2a7;
58-
background: #fff;
59-
border-radius: 0 4px 4px 0;
60-
border-left: none;
61-
height: 33px;
54+
display: block;
55+
width: 50px;
56+
57+
.action.toggle {
58+
padding: 0 3px;
59+
border: 1px solid #b7b2a7;
60+
background: #fff;
61+
border-radius: 0 1px 1px 0;
62+
border-left: none;
63+
height: 31px;
6264

63-
&.no-display {
64-
display: none;
65+
&.no-display {
66+
display: none;
67+
}
68+
69+
&:after {
70+
width: 12px;
71+
text-indent: -5px;
72+
}
6573
}
6674

67-
&:after {
68-
width: 12px;
69-
text-indent: -5px;
75+
ul.dropdown {
76+
left: 0;
77+
margin-left: 0;
78+
width: 100px;
79+
80+
li:hover {
81+
background: #eef8fc;
82+
}
83+
84+
a {
85+
color: #333;
86+
text-decoration: none;
87+
}
7088
}
7189
}
7290

73-
ul.dropdown {
74-
left: 0;
75-
margin-left: 0;
76-
width: 100px;
91+
.col-name {
92+
position: relative;
93+
}
7794

78-
li:hover {
79-
background: #eef8fc;
80-
}
95+
.action-choose {
96+
margin-left: 5px;
97+
position: absolute;
98+
top: 17px;
99+
}
81100

82-
a {
83-
color: #333;
84-
text-decoration: none;
101+
.col-qty,
102+
.col-weight {
103+
> input {
104+
width: 5.5rem;
85105
}
86106
}
87107
}

app/design/adminhtml/Magento/backend/web/css/styles-old.less

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -345,10 +345,6 @@ input.no-display,
345345
.data-table .action-locked.active,
346346
.data-table .action-locked[disabled],
347347
#product-variations-matrix .action-choose,
348-
#product-variations-matrix .action-choose:hover,
349-
#product-variations-matrix .action-choose:active,
350-
#product-variations-matrix .action-choose.active,
351-
#product-variations-matrix .action-choose[disabled],
352348
.action-manage-images,
353349
.action-manage-images:hover,
354350
.action-manage-images:active,
@@ -406,7 +402,6 @@ input.no-display,
406402
.data-table .action-.delete[disabled],
407403
.data-table .action-delete[disabled],
408404
.data-table .action-locked[disabled],
409-
#product-variations-matrix .action-choose[disabled],
410405
.image-panel .action-close[disabled],
411406
.image-panel-controls .action-remove[disabled],
412407
.suggest-expandable .action-show-all[disabled],

0 commit comments

Comments
 (0)