Skip to content

Commit acf7795

Browse files
author
Natalia Momotenko
committed
MAGETWO-42256: Marketing Admin page lost its styles
1 parent 9d1ac2d commit acf7795

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,15 @@ option:empty {
176176
}
177177
}
178178

179+
//
180+
// Service text or control. Can be used to add text or "Use Default Value" checkbox
181+
// ---------------------------------------------
182+
183+
.admin__control-service {
184+
float: left;
185+
margin: .8rem 0 0 3rem;
186+
}
187+
179188
//
180189
// Textarea
181190
// ---------------------------------------------

lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,20 +194,20 @@ protected function _optionToHtml($option)
194194
{
195195
$id = $this->getHtmlId() . '_' . $this->_escape($option['value']);
196196

197-
$html = '<div class="field choice"><input id="' . $id . '"';
197+
$html = '<div class="field choice admin__field admin__field-option"><input id="' . $id . '"';
198198
foreach ($this->getHtmlAttributes() as $attribute) {
199199
if ($value = $this->getDataUsingMethod($attribute, $option['value'])) {
200-
$html .= ' ' . $attribute . '="' . $value . '"';
200+
$html .= ' ' . $attribute . '="' . $value . '" class="admin__control-checkbox"';
201201
}
202202
}
203203
$html .= ' value="' .
204204
$option['value'] .
205205
'" />' .
206206
' <label for="' .
207207
$id .
208-
'">' .
208+
'" class="admin__field-label"><span>' .
209209
$option['label'] .
210-
'</label></div>' .
210+
'</span></label></div>' .
211211
"\n";
212212
return $html;
213213
}

lib/internal/Magento/Framework/Data/Form/Element/Note.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function getElementHtml()
3939
$html = $this->getBeforeElementHtml()
4040
. '<div id="'
4141
. $this->getHtmlId()
42-
. '" class="control-value">'
42+
. '" class="control-value admin__field-value">'
4343
. $this->getText()
4444
. '</div>'
4545
. $this->getAfterElementHtml();

lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function testGetElementHtml()
6363
$this->_model->setValue('Note Text');
6464
$html = $this->_model->getElementHtml();
6565
$this->assertEquals(
66-
"note_before<div id=\"note_id\" class=\"control-value\"></div>note_after",
66+
"note_before<div id=\"note_id\" class=\"control-value admin__field-value\"></div>note_after",
6767
$html
6868
);
6969
}

0 commit comments

Comments
 (0)