Skip to content

Commit 22aa7f6

Browse files
author
Oleg Zinoviev
committed
MAGETWO-35172: 'Change' check boxes are not displayed on Update Attributes page via Mass Action
1 parent f6d3657 commit 22aa7f6

File tree

3 files changed

+25
-43
lines changed

3 files changed

+25
-43
lines changed

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

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@
5656
padding: 0;
5757
width: auto;
5858
}
59-
.checkbox {
60-
margin-right: 5px;
61-
width: auto;
62-
}
6359
}
6460

6561
.field-price,
@@ -108,31 +104,21 @@
108104
.addafter + .addafter {
109105
border-width: 1px 1px 1px 0;
110106
border-style: solid;
111-
height: 28px;
107+
height: 31px;
112108
right: 0;
113109
position: absolute;
114110
top: 0;
115111
}
116112
.addafter strong {
117-
line-height: 28px;
113+
line-height: 31px;
118114
}
119115
> input:focus + .addafter + .addafter {
120-
box-shadow: 0 0 8px rgba(82, 168, 236, .6);
116+
border-color: #007bdb;
121117
}
122118
}
123119
}
124120
}
125121

126-
.field-gift_message_available,
127-
.field-gift_wrapping_available {
128-
.addon {
129-
> input[type="checkbox"] {
130-
width: auto;
131-
margin-right: 5px;
132-
}
133-
}
134-
}
135-
136122
.fieldset > .addafter {
137123
display: none;
138124
}

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

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1271,16 +1271,16 @@ input.mage-error ~ .addafter {
12711271
// --------------------------------------
12721272

12731273
.addon {
1274-
input {
1275-
border-width: 1px 0 1px 1px;
1274+
input[type="text"] {
1275+
border-width: 1px 1px 1px 0;
12761276
~ .addafter strong {
12771277
.field-price & {
12781278
font-size: 18px;
12791279
}
12801280
display: inline-block;
12811281
background: #fff;
12821282
line-height: 24px;
1283-
margin: 0 3px 0 -2px;
1283+
margin: 0 3px 0 0;
12841284
padding-left: 4px;
12851285
padding-right: 4px;
12861286
position: relative;
@@ -1300,11 +1300,11 @@ input.mage-error ~ .addafter {
13001300
background: none;
13011301
color: #a6a6a6;
13021302
border-width: 1px 1px 1px 0;
1303-
border-radius: 2px 2px 0 0;
1303+
border-radius: 1px 1px 0 0;
13041304
padding: 0;
13051305
border-color: #ada89e;
13061306
}
1307-
input,
1307+
input[type="text"],
13081308
select {
13091309
&[disabled],
13101310
&[readonly] {
@@ -1319,6 +1319,14 @@ input.mage-error ~ .addafter {
13191319
}
13201320
}
13211321

1322+
.field-weight {
1323+
.addon {
1324+
input[type="text"] {
1325+
border-width: 1px 0 1px 1px;
1326+
}
1327+
}
1328+
}
1329+
13221330
.field.type-price .addon,
13231331
.field-price .addon,
13241332
.field-special_price .addon,
@@ -1338,21 +1346,14 @@ input.mage-error ~ .addafter {
13381346
.field-special_price .addon .addafter,
13391347
.field-msrp .addon .addafter {
13401348
border-width: 1px 0 1px 1px;
1341-
border-radius: 2px 0 0 2px;
1342-
}
1343-
1344-
.field.type-price .addon input:first-child,
1345-
.field-price .addon input:first-child,
1346-
.field-special_price .addon input:first-child,
1347-
.field-msrp .addon input:first-child {
1348-
border-radius: 0 2px 2px 0;
1349+
border-radius: 1px 0 0 1px;
13491350
}
13501351

1351-
.field.type-price input,
1352-
.field-price input,
1353-
.field-special_price input,
1354-
.field-msrp input {
1355-
border-width: 1px 1px 1px 0;
1352+
.field.type-price .addon input[type=text]:first-child,
1353+
.field-price .addon input[type=text]:first-child,
1354+
.field-special_price .addon input[type=text]:first-child,
1355+
.field-msrp .addon input[type=text]:first-child {
1356+
border-radius: 0 1px 1px 0;
13561357
}
13571358

13581359
.field.type-price input:focus,

app/design/adminhtml/Magento/backend/web/mui/mui_legacy.css

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1287,14 +1287,14 @@ span.required {
12871287

12881288
.addon textarea:first-child,
12891289
.addon select:first-child,
1290-
.addon input:first-child,
1290+
.addon input[type=text]:first-child,
12911291
.addon .addbefore:first-child {
12921292
border-radius: 0;
12931293
}
12941294

12951295
.addon textarea:last-child,
12961296
.addon select:last-child,
1297-
.addon input:last-child,
1297+
.addon input[type=text]:last-child,
12981298
.addon .addafter:last-child {
12991299
border-radius: 0;
13001300
}
@@ -1350,14 +1350,9 @@ span.required {
13501350

13511351
.field-price .addon .addafter {
13521352
border-width: 1px 0 1px 1px;
1353-
border-radius: 4px 0 0 4px;
1353+
border-radius: 1px 0 0 1px;
13541354
}
13551355

1356-
.field-price .addon textarea:first-child,
1357-
.field-price .addon select:first-child,
1358-
.field-price .addon input:first-child {
1359-
border-radius: 0 4px 4px 0;
1360-
}
13611356

13621357
/*
13631358
Form tooltip

0 commit comments

Comments
 (0)