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

2021-08-13 17:31:04 +08:00
parent fb7cf36175 500fdb920a
commit 5ff5a585b6
1 changed files with 8 additions and 8 deletions
@@ -2530,6 +2530,14 @@
 <style lang="less" scoped>
    @import '~@/assets/styles/mixins';
    @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 {
        padding: 6px 26px;
        @borderColor: #BFBFBF;
@@ -2548,9 +2556,6 @@
            &:last-child {
                margin-bottom: 20px;
            }
-            /deep/.highlight-class {
-                color: red;
-            }
            .AllBoxTitle {
                position: relative;
                overflow: hidden;
@@ -2849,11 +2854,6 @@
                            }
                        }
                    }
-                    .pagination{
-                        position: static;
-                        border-bottom-right-radius: 20px;
-                        border-bottom-left-radius: 20px;
-                    }
                }
            }
            .content-right{