Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化生成工作日历记录功能

This commit is contained in:
yuxianghui
2023-07-17 10:40:49 +08:00

View File

@@ -12,23 +12,27 @@ body.o_web_client {
.o_list_view { .o_list_view {
.o_content .o_list_renderer.table-responsive { .o_content .o_list_renderer.table-responsive {
overflow-x: initial; overflow-x: initial;
.o_list_table { .o_list_table {
thead, thead tr:nth-child(1) th { thead, thead tr:nth-child(1) th {
position: sticky !important; position: sticky !important;
top: 0; top: 0;
z-index: 1; z-index: 1;
} }
tfoot, tfoot tr:nth-child(1) td { tfoot, tfoot tr:nth-child(1) td {
position: sticky !important; position: sticky !important;
bottom: 8px; bottom: 8px;
z-index: 1; z-index: 1;
} }
thead, tfoot { thead, tfoot {
box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.08) !important; box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.08) !important;
} }
} }
} }
} }
// LIST VIEW STICKY HEADER AND FOOTER END // LIST VIEW STICKY HEADER AND FOOTER END
} }
@@ -41,9 +45,12 @@ body.o_web_client {
.o_list_view { .o_list_view {
.o_content .o_list_renderer.table-responsive { .o_content .o_list_renderer.table-responsive {
.o_list_table { .o_list_table {
table-layout: unset !important;
thead, thead tr:nth-child(1) th, tfoot, tfoot tr:nth-child(1) td { thead, thead tr:nth-child(1) th, tfoot, tfoot tr:nth-child(1) td {
background-color: var(--biz-theme-secondary-color) !important; background-color: var(--biz-theme-secondary-color) !important;
} }
thead, tfoot { thead, tfoot {
border-radius: var(--border-radius-lg) !important; border-radius: var(--border-radius-lg) !important;
@@ -52,6 +59,7 @@ body.o_web_client {
border-top-left-radius: var(--border-radius-lg) !important; border-top-left-radius: var(--border-radius-lg) !important;
border-bottom-left-radius: var(--border-radius-lg) !important; border-bottom-left-radius: var(--border-radius-lg) !important;
} }
&:last-child { &:last-child {
border-top-right-radius: var(--border-radius-lg) !important; border-top-right-radius: var(--border-radius-lg) !important;
border-bottom-right-radius: var(--border-radius-lg) !important; border-bottom-right-radius: var(--border-radius-lg) !important;
@@ -65,14 +73,17 @@ body.o_web_client {
.o_list_renderer { .o_list_renderer {
.o_list_table { .o_list_table {
background-color: unset !important; background-color: unset !important;
thead, tfoot { thead, tfoot {
background-color: unset !important; background-color: unset !important;
color: var(--biz-theme-body-text-color) !important; color: var(--biz-theme-body-text-color) !important;
} }
.dropdown-toggle { .dropdown-toggle {
padding: 0 !important; padding: 0 !important;
border: 0 !important; border: 0 !important;
} }
tbody { tbody {
> tr > td:not(.o_list_record_selector).o_list_button > button { > tr > td:not(.o_list_record_selector).o_list_button > button {
padding: 0 5px !important; padding: 0 5px !important;
@@ -80,6 +91,7 @@ body.o_web_client {
} }
} }
} }
.o_content { .o_content {
.o_list_renderer { .o_list_renderer {
.o_list_table { .o_list_table {
@@ -88,15 +100,18 @@ body.o_web_client {
thead { thead {
color: var(--biz-theme-body-text-color) !important; color: var(--biz-theme-body-text-color) !important;
} }
tbody { tbody {
tr { tr {
&.o_group_header { &.o_group_header {
border-radius: var(--border-radius-md); border-radius: var(--border-radius-md);
th { th {
&:first-child { &:first-child {
border-top-left-radius: var(--border-radius-md); border-top-left-radius: var(--border-radius-md);
border-bottom-left-radius: var(--border-radius-md); border-bottom-left-radius: var(--border-radius-md);
} }
&:last-child { &:last-child {
border-top-right-radius: var(--border-radius-md); border-top-right-radius: var(--border-radius-md);
border-bottom-right-radius: var(--border-radius-md); border-bottom-right-radius: var(--border-radius-md);
@@ -105,6 +120,7 @@ body.o_web_client {
} }
} }
} }
tfoot { tfoot {
background-color: var(--biz-theme-secondary-color) !important; background-color: var(--biz-theme-secondary-color) !important;
color: var(--biz-theme-secondary-text-color) !important; color: var(--biz-theme-secondary-text-color) !important;
@@ -133,10 +149,12 @@ body.o_web_client {
thead { thead {
background-color: transparent !important; background-color: transparent !important;
border: unset; border: unset;
tr { tr {
&:focus-within { &:focus-within {
background-color: unset !important; background-color: unset !important;
} }
th { th {
border-top: 0 !important; border-top: 0 !important;
vertical-align: middle; vertical-align: middle;
@@ -147,11 +165,13 @@ body.o_web_client {
font-size: var(--spiffy-font-size-md); font-size: var(--spiffy-font-size-md);
background-color: unset !important; background-color: unset !important;
box-shadow: none !important; box-shadow: none !important;
&:focus-within { &:focus-within {
background-color: unset !important; background-color: unset !important;
} }
} }
} }
.o_list_controller { .o_list_controller {
.dropdown-toggle { .dropdown-toggle {
border: 0; border: 0;
@@ -191,6 +211,7 @@ body.o_web_client {
border-top-right-radius: var(--border-radius-lg) !important; border-top-right-radius: var(--border-radius-lg) !important;
border-bottom-right-radius: var(--border-radius-lg) !important; border-bottom-right-radius: var(--border-radius-lg) !important;
} }
box-shadow: none !important; box-shadow: none !important;
} }
@@ -203,6 +224,7 @@ body.o_web_client {
} }
} }
} }
&:hover { &:hover {
td, th { td, th {
box-shadow: none !important; box-shadow: none !important;
@@ -225,6 +247,7 @@ body.o_web_client {
height: var(--list-table-height); height: var(--list-table-height);
border: 0; border: 0;
} }
vertical-align: middle; vertical-align: middle;
font-weight: 500 !important; font-weight: 500 !important;
border-top: 0 !important; border-top: 0 !important;
@@ -255,22 +278,26 @@ body.o_web_client {
.biz_attachment_section { .biz_attachment_section {
padding-top: 0 !important; padding-top: 0 !important;
.attachment_box:not(.attachment_box_counter) { .attachment_box:not(.attachment_box_counter) {
.attachment-name { .attachment-name {
width: 150px; width: 150px;
} }
} }
.attachment-name { .attachment-name {
white-space: nowrap !important; white-space: nowrap !important;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
line-height: normal; line-height: normal;
} }
.attachment_box { .attachment_box {
padding: 0.2rem; padding: 0.2rem;
min-height: 36px; min-height: 36px;
border-radius: var(--border-radius-lg) !important; border-radius: var(--border-radius-lg) !important;
} }
.o_image { .o_image {
width: 30px !important; width: 30px !important;
height: 30px !important; height: 30px !important;
@@ -282,13 +309,16 @@ body.o_web_client {
tfoot { tfoot {
background-color: unset !important; background-color: unset !important;
border: 0 !important; border: 0 !important;
tr td { tr td {
border: 0 !important; border: 0 !important;
} }
.o_list_number { .o_list_number {
color: var(--biz-theme-primary-color) !important; color: var(--biz-theme-primary-color) !important;
} }
} }
.o_optional_columns_dropdown_toggle { .o_optional_columns_dropdown_toggle {
top: 10px !important; top: 10px !important;
} }
@@ -304,11 +334,13 @@ body.o_web_client {
.attachment_div { .attachment_div {
height: 30px; height: 30px;
} }
.biz_attachment_section { .biz_attachment_section {
.attachment_box { .attachment_box {
padding-left: 0.5rem !important; padding-left: 0.5rem !important;
min-height: 30px; min-height: 30px;
} }
.o_image { .o_image {
width: 20px !important; width: 20px !important;
height: 20px !important; height: 20px !important;
@@ -354,15 +386,18 @@ body.o_web_client.dark_mode {
} }
} }
} }
thead { thead {
background-color: transparent !important; background-color: transparent !important;
border: unset; border: unset;
} }
tbody { tbody {
> tr.o_group_header { > tr.o_group_header {
background-image: linear-gradient(to bottom, #242424, #343434) !important; background-image: linear-gradient(to bottom, #242424, #343434) !important;
} }
} }
&.table-responsive { &.table-responsive {
.o_list_table { .o_list_table {
background-color: transparent !important; background-color: transparent !important;
@@ -382,6 +417,7 @@ body.o_web_client.dark_mode {
&.o_is_line_section { &.o_is_line_section {
background-color: #161616 !important; background-color: #161616 !important;
} }
td { td {
&:first-child { &:first-child {
border-top-left-radius: var(--border-radius-lg) !important; border-top-left-radius: var(--border-radius-lg) !important;
@@ -498,6 +534,7 @@ body.o_web_client {
border: 1px solid #F4A460 !important; border: 1px solid #F4A460 !important;
} }
} }
.o_badge_cell { .o_badge_cell {
// .o_field_badge { // .o_field_badge {
// background-color: transparent !important; // background-color: transparent !important;
@@ -509,6 +546,7 @@ body.o_web_client {
color: rgba(40, 167, 69, 0.9) !important; color: rgba(40, 167, 69, 0.9) !important;
border: 1px solid #28a745b0 !important; border: 1px solid #28a745b0 !important;
} }
.bg-info-light { .bg-info-light {
background-color: transparent !important; background-color: transparent !important;
color: rgba(23, 162, 184, 0.9) !important; color: rgba(23, 162, 184, 0.9) !important;