jikimo/jikimo_sf
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 
# Conflicts:
#	jikimo_frontend/static/src/scss/custom_style.scss
This commit is contained in:
mgw
2023-09-26 11:36:59 +08:00
parent 37541fdcd6 8e13d2011c
commit 256d86567e
22 changed files with 797 additions and 989 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
jikimo_frontend/static/src/scss/custom_style.scss
View File

@@ -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;
}
//-----------------------------------------------------------
@@ -262,8 +264,29 @@ div[class="o_content o_component_with_search_panel"] .o_kanban_primary_right > .
}
div[class="o_content o_component_with_search_panel"] .o_kanban_card_content button {
left: -95px;
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;
}