File tree Expand file tree Collapse file tree 7 files changed +76
-15
lines changed
code/Magento/Tax/view/adminhtml/templates/rate
design/adminhtml/Magento/backend/web Expand file tree Collapse file tree 7 files changed +76
-15
lines changed Original file line number Diff line number Diff line change @@ -60,7 +60,14 @@ module.exports = function (grunt) {
60
60
'less:luma' ,
61
61
'less:backend'
62
62
] ,
63
-
63
+ /**
64
+ * Styles for backend theme
65
+ */
66
+ backend : [
67
+ 'less:backend' ,
68
+ 'replace:example' ,
69
+ 'less:override'
70
+ ] ,
64
71
/**
65
72
* Documentation
66
73
*/
Original file line number Diff line number Diff line change 7
7
// @codingStandardsIgnoreFile
8
8
9
9
?>
10
- <div class="entry-edit">
10
+ <div class="entry-edit form-inline ">
11
11
<?php echo $ block ->getFormHtml () ?>
12
12
</div>
13
13
<?php echo $ block ->getChildHtml ('form_after ' );?>
Original file line number Diff line number Diff line change @@ -373,6 +373,7 @@ nav ol {
373
373
.page-layout-admin-login .admin__field [class]:not (.admin__field-option )._required > .admin__field-label span :after {
374
374
left : 0 ;
375
375
margin-left : 30px ;
376
+ top : .2rem ;
376
377
}
377
378
.admin__control-text {
378
379
line-height : 3.3rem ;
@@ -644,12 +645,13 @@ option:empty {
644
645
._required > .admin__field-label span :after {
645
646
color : #eb5202 ;
646
647
content : ' *' ;
647
- display : inline ;
648
+ display : inline-block ;
648
649
font-size : 1.6rem ;
649
650
font-weight : 500 ;
651
+ line-height : 1 ;
650
652
margin-left : 10px ;
651
- margin-top : 2px ;
652
653
position : absolute ;
654
+ top : 1.2rem ;
653
655
z-index : 1 ;
654
656
}
655
657
._disabled > .admin__field-label {
Original file line number Diff line number Diff line change 60
60
& :after {
61
61
left : 0 ;
62
62
margin-left : @temp_gutter ; // @todo ui: update after finalizing Form Grid mixing css/source/forms/_temp.less:10
63
+ top : .2rem ;
63
64
}
64
65
}
65
66
}
Original file line number Diff line number Diff line change 87
87
span :after {
88
88
color : @field-label__required__color ;
89
89
content : ' *' ;
90
- display : inline ;
90
+ display : inline-block ;
91
91
font-size : @font-size__l ;
92
92
font-weight : @font-weight__heavier ;
93
+ line-height : 1 ;
93
94
margin-left : 10px ;
94
- margin-top : 2px ;
95
95
position : absolute ;
96
+ top : 1.2rem ;
96
97
z-index : 1 ;
97
98
}
98
99
}
Original file line number Diff line number Diff line change @@ -1078,14 +1078,61 @@ input.mage-error ~ .addafter {
1078
1078
padding-top : 0 ;
1079
1079
}
1080
1080
1081
- .field.required > .label :after {
1082
- color : #e22626 ;
1083
- font-size : 16px ;
1084
- font-weight : 500 ;
1085
- position : absolute ;
1086
- margin-left : 10px ;
1081
+ .form-inline div :not ([class*= ' fields-group' ]) > .field > .label ,
1082
+ .form-inline .fieldset > .field > .label {
1083
+ color : #303030 ;
1084
+ font-size : 14px ;
1085
+ font-weight : 600 ;
1086
+ line-height : 3.2rem ;
1087
+ padding : 0 30px 0 0 ;
1088
+ white-space : nowrap ;
1089
+
1090
+ & :before {
1091
+ content : ' .' ;
1092
+ margin-left : -7px ;
1093
+ overflow : hidden ;
1094
+ visibility : hidden ;
1095
+ width : 0 ;
1096
+ }
1097
+
1098
+ span {
1099
+ display : inline-block ;
1100
+ line-height : 1.33 ;
1101
+ vertical-align : middle ;
1102
+ white-space : normal ;
1103
+ }
1087
1104
}
1088
1105
1106
+ .fieldset > .field.required > .label {
1107
+ & :after {
1108
+ content :' ' ;
1109
+ }
1110
+ padding-left : 1.5rem ;
1111
+ .form-inline & {
1112
+ padding-left : 0 ;
1113
+ }
1114
+ span {
1115
+ & :after {
1116
+ color : #e22626 ;
1117
+ content : ' *' ;
1118
+ display : inline-block ;
1119
+ font-size : 1.6rem ;
1120
+ font-weight : 500 ;
1121
+ left : 0 ;
1122
+ line-height : 1 ;
1123
+ position : absolute ;
1124
+ top : .2rem ;
1125
+ z-index : 1 ;
1126
+ .form-inline & {
1127
+ left : auto ;
1128
+ margin-left : 10px ;
1129
+ top : 1.2rem ;
1130
+ }
1131
+ }
1132
+ }
1133
+ }
1134
+
1135
+
1089
1136
.with-addon .textarea {
1090
1137
margin : 0 0 6px ;
1091
1138
}
@@ -1094,7 +1141,7 @@ input.mage-error ~ .addafter {
1094
1141
.fieldset .control .addon .textarea {
1095
1142
width : 100% ;
1096
1143
}
1097
-
1144
+ .details-content > .field > input [type = " checkbox " ],
1098
1145
.fieldset > .field > input [type= " checkbox" ] {
1099
1146
margin-top : 9px ;
1100
1147
}
@@ -2695,7 +2742,10 @@ tr.dynamic-grid input.input-text {
2695
2742
}
2696
2743
2697
2744
.attribute-popup #edit_form {
2698
- padding-bottom : 80px ;
2745
+ display : block ;
2746
+ > div :last-of-type {
2747
+ margin-bottom : 150px ;
2748
+ }
2699
2749
}
2700
2750
2701
2751
.attribute-popup #edit_form > .fieldset > .legend {
Original file line number Diff line number Diff line change @@ -1208,7 +1208,7 @@ table.loading:after {
1208
1208
}
1209
1209
1210
1210
.field > .label {
1211
- margin : 0 0 6px 6 px ;
1211
+ margin : 0 0 6px ;
1212
1212
}
1213
1213
1214
1214
.field > .control {
You can’t perform that action at this time.
0 commit comments