jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理界面布局优化

Browse Source
This commit is contained in:
yuxianghui
2023-08-17 11:20:31 +08:00
parent 8b88f31672 23b11fce15
commit 21bfad2f95
3 changed files with 258 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mrp_workorder/static/src/scss/table_custom.scss Normal file
View File

@@ -0,0 +1,28 @@
.o_form_view.o_xxl_form_view {
flex-flow: column !important;
}
.o_form_view_container {
width: 100% !important;
}
html .o_web_client > .o_action_manager > .o_action {
height: unset !important;
overflow: scroll !important;
}
.o_FormRenderer_chatterContainer.o-aside {
width: 100% !important;
max-width: 1320px !important;
background-color: #fff !important;
padding-left: 32px !important;
padding-right: 32px !important;
box-sizing: border-box !important;
border: 1px solid #dee2e6;
//margin-bottom: 12px;
}
.o_form_view {
background-color: unset !important;
min-height: unset !important;
}

26
mrp_workorder/static/src/scss/tablet_view.scss
View File

@@ -162,14 +162,17 @@
> div.o_workorder_lot {
width: 100%;
justify-content: center;
> .o_lot_number {
width: 50%;
&:not(.o_with_button) button.o_external_button {
display: block !important;
visibility: hidden;
}
}
}
> div {
display: inline-flex;
align-items: baseline;
@@ -225,27 +228,4 @@
}
}
.o_form_view.o_xxl_form_view {
flex-flow:column !important;
}
.o_form_view_container {
width:100% !important;
}
html .o_web_client > .o_action_manager > .o_action {
overflow:scroll !important;
}
.o_FormRenderer_chatterContainer.o-aside {
width:100% !important;
max-width: 1320px !important;
background-color:#ccc !important;
}
.o_form_view {
background-color:unset !important;
border: 1px solid #C9CCD2 !important;
border-left-color:unset !important;
box-shadow: 0 5px 20px -15px rgb(0 0 0 / 40%) !important;
}

9
sf_base/static/src/scss/test.scss
View File

@@ -1,15 +1,22 @@
.test_model {
display: flex !important;
}
.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;
vertical-align: top !important;
font-size: 1.5rem !important;
display: inline !important;
}
.o_required_modifier {
display: flex !important;
}