Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug

# Conflicts:
#	sf_base/static/src/scss/test.scss
This commit is contained in:
qihao.gong@jikimo.com
2023-08-17 10:13:19 +08:00
3 changed files with 257 additions and 242 deletions

View File

@@ -1,12 +1,14 @@
.test_model {
display: flex !important;
}
.test_model>.o_form_label {
.test_model > .o_form_label {
margin-left: 20px;
margin-right: 0px !important;
white-space: nowrap;
}
.o_form_label.o_field_invalid::after {
div:has(.o_required_modifier)>label::before {
content: '*' !important;
color: red !important;
padding: 0 4px !important;
@@ -29,4 +31,9 @@
}
.o_kanban_renderer .o_kanban_record .o_kanban_record_bottom {
margin-top: 5px;
display: inline !important;
}
.o_required_modifier {
display: flex !important;
}