Browse Source

modified the color to a variable and made theme spring change it.

白石誠 5 years ago
parent
commit
e8f028723c

+ 2 - 1
src/client/styles/scss/theme/_apply-colors-dark.scss

@@ -14,6 +14,7 @@ $bgcolor-table-hover: lighten($bgcolor-table, 7.5%) !default;
 $bgcolor-sidebar-list-group: $bgcolor-list !default;
 $color-tags: #949494 !default;
 $bgcolor-tags: $dark !default;
+$icon-color: $color-global !default;
 
 // override bootstrap variables
 $border-color: $gray-700;
@@ -371,7 +372,7 @@ body.on-edit {
 .grw-page-list-m {
   .grw-page-list-title-m {
     svg {
-      fill: $color-global;
+      fill: $icon-color;
     }
   }
 }

+ 2 - 1
src/client/styles/scss/theme/_apply-colors-light.scss

@@ -14,6 +14,7 @@ $bgcolor-table-hover: rgba(black, 0.075) !default;
 $bgcolor-sidebar-list-group: $bgcolor-list !default;
 $color-tags: $gray-500 !default;
 $bgcolor-tags: $gray-200 !default;
+$icon-color: $color-global !default;
 
 // override bootstrap variables
 $border-color: $gray-200;
@@ -301,7 +302,7 @@ $table-hover-bg: $bgcolor-table-hover;
 .grw-page-list-m {
   .grw-page-list-title-m {
     svg {
-      fill: $color-global;
+      fill: $icon-color;
     }
   }
 }

+ 3 - 11
src/client/styles/scss/theme/spring.scss

@@ -90,6 +90,9 @@ html[dark] {
   // admin theme box
   $color-theme-color-box: darken($primary, 20%);
 
+  // color of icons
+  $icon-color: $subthemecolor;
+
   @import 'apply-colors';
   @import 'apply-colors-light';
 
@@ -155,15 +158,4 @@ html[dark] {
       }
     }
   }
-
-  /*
-  * GROWI user page
-  */
-  .grw-page-list-m {
-    .grw-page-list-title-m {
-      svg {
-        fill: $subthemecolor;
-      }
-    }
-  }
 }