Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复

This commit is contained in:
jinling.yang
2023-10-08 17:19:22 +08:00
37 changed files with 79845 additions and 3281 deletions

View File

@@ -3,7 +3,7 @@
}
.test_model > .o_form_label {
margin-left: 20px;
margin-left: 0px !important;
margin-right: 0px !important;
white-space: nowrap;
}
@@ -159,20 +159,22 @@ td.o_required_modifier {
}
.o_list_view .o_list_table thead {
position: sticky;
top: 0;
//z-index: 100000;
position: sticky;
top: 0;
//z-index: 100000;
}
//.o_list_view .o_list_table {
// height: 1799px !important;
//}
.table-responsive {
overflow: unset;
overflow: unset;
}
.o_form_view.o_xxl_form_view .o_form_sheet_bg > .o_form_statusbar {
position: sticky !important;
top: 0;
//z-index: 100000;
position: sticky !important;
top: 0;
//z-index: 100000;
}
//-----------------------------------------------------------
@@ -253,7 +255,7 @@ div[class="o_content o_component_with_search_panel"] .show_state span {
div[class="o_content o_component_with_search_panel"] .o_kanban_primary_right > .row {
position: absolute;
top: 55px;
right: 263px;
right: 43.5%;
}
//------------------------------------------
@@ -262,3 +264,44 @@ div[class="o_content o_component_with_search_panel"] .o_kanban_primary_right > .
line-height: 0 !important;
}
@media screen and (min-width: 1200px) {
div[class="o_content o_component_with_search_panel"] .o_kanban_primary_right > .row {
right: 52%;
}
div[class="o_content o_component_with_search_panel"] .o_kanban_card_content button {
left: -95px;
}
}
//.o_kanban_renderer .o_kanban_record .o_kanban_record_bottom {
// display: flex !important;
// flex-direction: column;
//}
.o_kanban_renderer .o_kanban_record .o_kanban_record_bottom > div:nth-child(1) > span:nth-child(1) {
display: inline-block;
margin-right: 10px;
}
.o_kanban_renderer .o_kanban_record .o_kanban_record_bottom > div:nth-child(1) {
margin-top: -5px;
margin-bottom: 5px;
}
.text-bg-warning {
background-color: #FED300 !important;
}
.test_model>div {
display: flex;
width: 40%;
}
.test_model>div .o_field_widget {
width: 40% !important;
}