Explorar o código

修复框架样式,支持白标签项目

vbea %!s(int64=2) %!d(string=hai) anos
pai
achega
0e2964663d

+ 22 - 25
Strides-Admin/src/components/Pagination.vue

@@ -91,32 +91,29 @@ export default {
 </script>
 <style lang="scss" scoped="scoped">
   @import '../styles/element-ui.scss';
+  @import '../styles/variables.scss';
   .pagination-container ::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
+    color: $buttonText;
     background-color: $--color-primary;
   }
-</style>
-<style scoped="scoped">
-.pagination-container {
-  background: #fff;
-  padding: 32px 16px;
-}
-.pagination-container.hidden {
-  display: none;
-}
-.pagination-container >>> .el-pagination.is-background .el-pager li:not(.disabled) {
-  color: #333;
-  border: 1px solid #eee;
-  background-color: white;
-}
-.pagination-container >>> .el-pagination.is-background .el-pager li:not(.disabled).active {
-  color: #fff;
-}
-.pagination-container >>> .btn-prev,
-.pagination-container >>> .btn-next {
-  border: 1px solid #eee;
-  background-color: white;
-}
-.pagination-container >>> .el-pagination__total {
-  color: #333;
-}
+  .pagination-container {
+    background: #fff;
+    padding: 32px 16px;
+  }
+  .pagination-container.hidden {
+    display: none;
+  }
+  .pagination-container ::v-deep .el-pagination.is-background .el-pager li:not(.disabled) {
+    color: #333;
+    border: 1px solid #eee;
+    background-color: white;
+  }
+  .pagination-container ::v-deep .btn-prev,
+  .pagination-container ::v-deep .btn-next {
+    border: 1px solid #eee;
+    background-color: white;
+  }
+  .pagination-container ::v-deep .el-pagination__total {
+    color: #333;
+  }
 </style>

+ 2 - 41
Strides-Admin/src/icons/svg/sidebar-submenu-item.svg

@@ -1,42 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="5"
-   height="5"
-   viewBox="0 0 5 5"
-   fill="none"
-   version="1.1"
-   id="svg1124"
-   sodipodi:docname="sidebar-submenu-item.svg"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs1128" />
-  <sodipodi:namedview
-     id="namedview1126"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="162.4"
-     inkscape:cx="2.4969212"
-     inkscape:cy="2.4969212"
-     inkscape:window-width="1920"
-     inkscape:window-height="1001"
-     inkscape:window-x="-9"
-     inkscape:window-y="41"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg1124" />
-  <circle
-     cx="2.5"
-     cy="2.5"
-     r="2.5"
-     fill="#333333"
-     id="circle1122"
-     style="fill:#333333;fill-opacity:1" />
+<svg width="5" height="5" viewBox="0 0 5 5" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="2.5" cy="2.5" r="2.5" fill="#000"/>
 </svg>

+ 8 - 1
Strides-Admin/src/styles/btn.scss

@@ -102,6 +102,13 @@
   color: #232323;
 }
 
+button.el-button.el-button--primary {
+  color: $buttonText;
+  &:hover {
+    color: rgba($buttonText, .7);
+  }
+}
+
 .el-button.el-button--accent {
   color: $buttonText;
   border-color: $--color-accent;
@@ -112,7 +119,7 @@
     background: rgba($--color-accent, .5);
   }
   &:not(.is-disabled):hover {
-    color: $buttonText;
+    color: rgba($buttonText, .7);
     border-color: rgba($--color-accent, 0);
     background: rgba($--color-accent, .7);
   }

+ 0 - 4
Strides-Admin/src/styles/element-ui.scss

@@ -8,10 +8,6 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts';
 @import "~element-ui/packages/theme-chalk/src/index";
 // cover some element-ui styles
 
-.el-button.el-button--primary {
-  color: #f0f0f0;
-}
-
 .el-breadcrumb__inner,
 .el-breadcrumb__inner a {
   font-weight: 400 !important;

+ 1 - 1
Strides-Admin/src/styles/index.scss

@@ -23,7 +23,7 @@ label {
   font-weight: 700;
 }
 ::selection {
-  color: #FFFFFF;
+  color: $buttonText;
   background-color: rgba($--color-primary, 0.8);
 }
 ::-webkit-scrollbar-track-piece {

+ 6 - 1
Strides-Admin/src/views/dashboard/Dashboard.vue

@@ -300,7 +300,9 @@
   }
 </script>
 
-<style scoped="scoped">
+<style scoped="scoped" lang="scss">
+  @import '../../styles/variables.scss';
+  
   .dash-container {
     width: 100%;
     padding: 1px 20px 20px;
@@ -454,6 +456,9 @@
   .radio-group {
     padding-top: 5px;
     text-align: center;
+    ::v-deep .el-radio-button.is-active .el-radio-button__inner {
+      color: $buttonText;
+    }
   }
   .barView {
     padding-bottom: 10px;

+ 4 - 1
Strides-Admin/src/views/dashboard/index.vue

@@ -106,7 +106,7 @@ export default {
 </script>
 
 <style scoped lang='scss'>
-  /*@import '../../styles/variables.scss';*/
+  @import '../../styles/variables.scss';
   @import '../../styles/element-ui.scss';
   .dashboard-container {
     padding: 10px 20px;
@@ -133,6 +133,9 @@ export default {
           border-radius: 4px;
           border: 1px solid $--color-primary;
         }
+        &.is-active .el-radio-button__inner {
+          color: $buttonText;
+        }
       }
     }
   }

+ 4 - 1
Strides-Admin/src/views/dashboard/index2.vue

@@ -192,7 +192,7 @@ export default {
 </script>
 
 <style scoped lang='scss'>
-  /*@import '../../styles/variables.scss';*/
+  @import '../../styles/variables.scss';
   @import '../../styles/element-ui.scss';
   .dashboard-container {
     padding: 10px 20px;
@@ -219,6 +219,9 @@ export default {
           border-radius: 4px;
           border: 1px solid $--color-primary;
         }
+        &.is-active .el-radio-button__inner {
+          color: $buttonText;
+        }
       }
     }
   }

+ 0 - 8
Strides-Admin/src/views/incident/connectivity.vue

@@ -36,14 +36,6 @@
             @change="toSearch"
             clearable/>
         </div>
-        <div>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            @click="toSearch">
-            Search
-          </el-button>
-        </div>
       </div>
     </div>
     <el-table

+ 4 - 0
Strides-Admin/src/views/site2/detail.vue

@@ -1088,9 +1088,13 @@ export default {
       padding-bottom: 5px;
     }
     ::v-deep .el-checkbox__label {
+      color: #000;
       word-break: break-all;
       white-space: normal;
     }
+    ::v-deep .el-checkbox__input.is-checked .el-checkbox__inner::after {
+      border-color: $buttonText;
+    }
   }
   
 </style>

+ 1 - 3
Strides-Admin/src/views/zetting/Administrator.vue

@@ -387,8 +387,6 @@
     overflow-x: auto;
     background-color: #F0F5FC;
   }
-</style>
-<style scoped="scoped">
   .card-content {
     flex: 1;
     min-width: 500px;
@@ -467,7 +465,7 @@
     color: #333;
   }
   ::v-deep .el-checkbox__input.is-checked .el-checkbox__inner::after {
-    border-color: #fff;
+    border-color: $buttonText;
   }
   .el-checkbox + .el-checkbox {
     margin: 12px 0;

+ 0 - 6
Strides-Admin/src/views/zetting/ChargeType.vue

@@ -278,7 +278,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  @import '../../styles/element-ui.scss';
   @import '../../styles/variables.scss';
   
   .view-container {
@@ -358,11 +357,6 @@ export default {
   .confirm-button {
     width: 94px;
     height: 40px;
-    margin-left: 20px;
-    background: $--color-primary;
-    border: 1px solid $--color-primary;
-    box-sizing: border-box;
-    border-radius: 4px;
   }
   
   @media screen and (max-width: 1000px) {