Skip to content

Commit 5f0c95f

Browse files
committed
Merge branch 'ENGCOM-3324-magento-magento2-18922' of github.com:magento-engcom/magento2ce into HEAD
2 parents 011e31f + 4f3d55e commit 5f0c95f

File tree

1 file changed

+11
-16
lines changed
  • app/design/adminhtml/Magento/backend/web/css/source/forms

1 file changed

+11
-16
lines changed

app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,7 @@
5959
}
6060

6161
.abs-field-no-label {
62-
/**
63-
* @codingStandardsIgnoreStart
64-
*/
6562
#mix-grid .return_length(@field-label-grid__column, @field-grid__columns, '+');
66-
//@codingStandardsIgnoreEnd
6763
margin-left: @_length;
6864
}
6965

@@ -170,13 +166,6 @@
170166
.admin__control-text,
171167
.admin__control-textarea {
172168
width: 100%;
173-
&.disabled {
174-
background-color: #e9e9e9;
175-
border-color: #adadad;
176-
color: #303030;
177-
cursor: not-allowed;
178-
opacity: .5;
179-
}
180169
}
181170
}
182171

@@ -194,13 +183,10 @@
194183

195184
.admin__field-label {
196185
color: @field-label__color;
186+
cursor: pointer;
197187
margin: 0;
198188
text-align: right;
199189

200-
label {
201-
cursor: pointer;
202-
}
203-
204190
+ br {
205191
display: none;
206192
}
@@ -224,7 +210,7 @@
224210
span {
225211
display: inline-block;
226212
line-height: @field-label__line-height;
227-
vertical-align: top;
213+
vertical-align: middle;
228214
white-space: normal;
229215

230216
&[data-config-scope] {
@@ -251,6 +237,7 @@
251237
margin-top: .2rem;
252238
position: absolute;
253239
z-index: 1;
240+
254241
}
255242
}
256243
}
@@ -296,6 +283,14 @@
296283
opacity: 1;
297284
}
298285
}
286+
287+
legend.admin__field-label{
288+
span {
289+
&:after {
290+
display: none;
291+
}
292+
}
293+
}
299294

300295
// ToDo UI: Scope Labels must be moved from right side of each control to the place under the label of the control.
301296
// This code must be removed after Scope Labels are moved completely.

0 commit comments

Comments
 (0)