Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
zhutianqi
2021-08-13 17:31:04 +08:00
@@ -2530,6 +2530,14 @@
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
/deep/.highlight-class {
color: red !important;
}
/deep/.pagination{
position: static !important;
border-bottom-right-radius: 20px;
border-bottom-left-radius: 20px;
}
.standard-search { .standard-search {
padding: 6px 26px; padding: 6px 26px;
@borderColor: #BFBFBF; @borderColor: #BFBFBF;
@@ -2548,9 +2556,6 @@
&:last-child { &:last-child {
margin-bottom: 20px; margin-bottom: 20px;
} }
/deep/.highlight-class {
color: red;
}
.AllBoxTitle { .AllBoxTitle {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
@@ -2849,11 +2854,6 @@
} }
} }
} }
.pagination{
position: static;
border-bottom-right-radius: 20px;
border-bottom-left-radius: 20px;
}
} }
} }
.content-right{ .content-right{