合并冲突

This commit is contained in:
zhoumengru
2025-09-12 16:37:27 +08:00
36 changed files with 734 additions and 870 deletions

View File

@@ -18,8 +18,14 @@ $page-border: #cad2dd;
.ant-switch {
background: #b1c4c4;
}
.ant-switch.ant-switch-checked{
background: #00fffb
.ant-switch.ant-switch-checked {
background: #00fffb;
}
.ant-select .ant-select-arrow {
background: transparent !important;
}
.ant-select .ant-select-clear {
background: transparent !important;
}
.ant-switch .ant-switch-handle::before {
@@ -58,9 +64,8 @@ $page-border: #cad2dd;
.ant-picker-input input::placeholder {
color: #ffffff3b !important;
}
.ant-picker-suffix{
.ant-picker-suffix {
color: #ffffff !important;
}
}
.ant-input-affix-wrapper {
@@ -163,3 +168,38 @@ $page-border: #cad2dd;
color: #fff !important;
}
}
// 添加统一布局的样式
.text_Cur {
border-bottom: 1px solid transparent;
border-top: 1px solid transparent;
border-image: linear-gradient(to right, transparent, #1d8a7b, transparent) 1;
padding: 0px 15px;
font-size: 12px;
margin: 3px 0px;
height: 40px;
display: flex;
justify-content: space-between;
align-items: center;
& > div:last-child {
display: flex;
flex-direction: column;
justify-content: center;
align-items: end;
}
.mark {
font-size: 16px;
margin-right: 2px;
}
background: linear-gradient(
90deg,
rgba(0, 186, 173, 0.15) 0%,
rgba(61, 254, 250, 0.15) 49.2%,
rgba(61, 254, 250, 0) 100%
);
.d {
margin-left: 1px;
font-size: 12px;
}
}