Merge remote-tracking branch 'origin/main' into feature/v1.3_主agent_rxd
# Conflicts: # src/styles/lib/reset.scss # src/views/creative-generation-workshop/explore/detail/index.vue # src/views/creative-generation-workshop/explore/detail/style.scss # src/views/creative-generation-workshop/explore/list/index.vue # src/views/creative-generation-workshop/manuscript-writer/detail/index.vue # src/views/creative-generation-workshop/manuscript/detail/index.vue
This commit is contained in:
@ -3,6 +3,7 @@
|
||||
.arco-pagination-item {
|
||||
border-radius: 4px;
|
||||
border: 1px solid var(--BG-300, #e6e6e8);
|
||||
font-family: $font-family-manrope-regular;
|
||||
&-ellipsis {
|
||||
border: none;
|
||||
}
|
||||
@ -26,9 +27,9 @@
|
||||
border: 1px solid var(--BG-300, #e6e6e8);
|
||||
}
|
||||
&-prepend {
|
||||
color: var(--Text-2, #3c4043);
|
||||
color: var(--Text-2, #55585f);
|
||||
text-align: right;
|
||||
font-family: $font-family-medium;
|
||||
font-family: $font-family-regular;
|
||||
font-size: 14px;
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
@ -38,4 +39,12 @@
|
||||
background-color: transparent;
|
||||
}
|
||||
}
|
||||
.arco-pagination-total {
|
||||
color: var(--Text-2, #55585f);
|
||||
font-family: $font-family-regular;
|
||||
font-size: 14px;
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
line-height: 22px;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
.arco-table {
|
||||
@mixin table-cell-text {
|
||||
color: var(--Text-1, #3C4043);
|
||||
color: var(--Text-1, #211F24);
|
||||
font-family: $font-family-regular;
|
||||
font-size: 14px;
|
||||
font-style: normal;
|
||||
@ -22,6 +22,18 @@
|
||||
@include table-cell-text;
|
||||
font-family: 'PingFangSC-Medium';
|
||||
}
|
||||
.arco-table-sorter {
|
||||
.arco-table-sorter-icon {
|
||||
.arco-icon {
|
||||
color: #939499;
|
||||
}
|
||||
&-active {
|
||||
.arco-icon {
|
||||
color: $color-primary;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -40,5 +52,15 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
.arco-scrollbar {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
.arco-table-element {
|
||||
height: 100%;
|
||||
}
|
||||
.arco-scrollbar-container{
|
||||
flex: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user