Skip to content

Commit e7ec037

Browse files
author
Evgeniy Kolesov
committed
MAGETWO-34893: Required marker is displayed on wrong line in Backend
1 parent d1eddc8 commit e7ec037

File tree

5 files changed

+17
-52
lines changed

5 files changed

+17
-52
lines changed

app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
/* @var $block \Magento\Tax\Block\Adminhtml\Rate\Form */
77
?>
8-
<div id="<?php echo $block->getNameInLayout() ?>" style="display:none">
8+
<div class="form-inline" id="<?php echo $block->getNameInLayout() ?>" style="display:none">
99
<?php echo $block->getFormHtml();?>
1010
<?php echo $block->getChildHtml('form_after');?>
1111
</div>

app/design/adminhtml/Magento/backend/web/css/source/_login.less

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
// Login box
2828
.page-layout-admin-login {
29+
align-items: center;
2930
.vendor-prefix-display(flex);
3031
background-color: @login-page__background-color;
3132
padding: 2rem 0 20rem;

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

+7-49
Original file line numberDiff line numberDiff line change
@@ -1102,7 +1102,7 @@ input.mage-error ~ .addafter {
11021102
white-space: normal;
11031103
}
11041104
}
1105-
1105+
.details-content > .field.required > .label,
11061106
.fieldset > .field.required > .label {
11071107
&:after {
11081108
content:'';
@@ -3370,55 +3370,13 @@ tr.dynamic-grid input.input-text {
33703370
/*
33713371
System - Tax
33723372
--------------------------------------*/
3373-
.tax-rate-popup .ui-dialog-content.ui-widget-content {
3374-
padding: 10px 10px 0;
3375-
}
3376-
3377-
.tax-rate-popup .fieldset {
3378-
margin: 0;
3379-
}
3380-
3381-
.tax-rate-popup .field {
3382-
margin-bottom: 20px;
3383-
}
33843373

3385-
.tax-rate-popup .field .label {
3386-
margin: 8px 0 0;
3387-
width: 30%;
3388-
padding: 0 30px 0 0;
3389-
float: left;
3390-
text-align: right;
3391-
box-sizing: content-box;
3392-
}
3393-
3394-
.tax-rate-popup .field .control {
3395-
width: 58%;
3396-
margin: 0;
3397-
float: left;
3398-
}
3399-
3400-
.tax-rate-popup .field .control select,
3401-
.tax-rate-popup .field .control .input-text {
3402-
width: 100%;
3403-
}
3404-
3405-
.tax-rate-popup .field-rate .control .input-text {
3406-
width: 50%;
3407-
}
3408-
3409-
.tax-rate-popup .field-rate label.mage-error {
3410-
display: block;
3411-
}
3412-
3413-
.tax-rate-popup .tax-rate-titles-note-td {
3414-
margin-left: 26%;
3415-
padding-left: 20px;
3416-
}
3417-
3418-
.field-tax_rate,
3419-
.field-tax_customer_class,
3420-
.field-tax_product_class {
3421-
position: relative;
3374+
.tax-rate-popup .form-inline .field {
3375+
position: static;
3376+
&.required .label {
3377+
position: relative;
3378+
z-index: 1;
3379+
}
34223380
}
34233381

34243382
.mselect-hidden + .mage-error {

lib/web/less/config.less.js

+8-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,11 @@
44
*/
55

66
less = {
7-
env: "development"
8-
};
7+
env: "development",
8+
logLevel: 0,
9+
async: true,
10+
fileAsync: true,
11+
poll: 3000,
12+
useFileCache: false,
13+
dumpLineNumbers: "mediaquery"
14+
};

0 commit comments

Comments
 (0)