oshikishintaro 5 лет назад
Родитель
Сommit
9ee0f3f055

+ 1 - 1
src/client/styles/scss/_admin.scss

@@ -40,7 +40,7 @@
   }
 
   .admin-setting-header {
-    border-bottom: 1px solid $border-color;
+    border-bottom: 1px solid transparent;
   }
 
   .admin-security {

+ 2 - 2
src/client/styles/scss/_override-bootstrap-variables.scss

@@ -25,7 +25,7 @@ $gray-900: darken($dark, 5%) !default;
 $grays: ("50": $gray-50) !default;
 $red: #ff0a54 !default;
 
-$border-color: $gray-300 !default;
+
 
 //== Typography
 //
@@ -56,7 +56,7 @@ $btn-link-disabled-color: $gray-500;
 
 //== Forms
 //
-$input-border-color: $border-color;
+$input-border-color: $gray-300;
 
 $input-border-radius: $border-radius-sm;
 $input-border-radius-sm: $border-radius-sm;

+ 3 - 2
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;
+$border-color-toc: $gray-300 !default;
 
 // override bootstrap variables
 $border-color: $gray-500;
@@ -368,11 +369,11 @@ ul.pagination {
 */
 .grw-side-contents-sticky-container {
   .grw-border-vr {
-    border-color: $border-color;
+    border-color: $border-color-toc;
   }
 
   .revision-toc {
-    border-color: $border-color;
+    border-color: $border-color-toc;
   }
 }
 

+ 11 - 3
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;
+$border-color-toc: $gray-300 !default;
 
 // override bootstrap variables
 $table-color: $color-table;
@@ -56,7 +57,7 @@ $table-hover-bg: $bgcolor-table-hover;
  */
 .card.card-disabled {
   background-color: darken($bgcolor-card, 5%);
-  border-color: $border-color;
+  border-color: $gray-200;
 }
 
 /*
@@ -301,13 +302,20 @@ $table-hover-bg: $bgcolor-table-hover;
 */
 .grw-side-contents-sticky-container {
   .grw-border-vr {
-    border-color: $border-color;
+    border-color: $border-color-toc;
   }
   .revision-toc {
-    border-color: $border-color;
+    border-color: $border-color-toc;
   }
 }
 
+/*
+ * admin settings
+ */
+.admin-setting-header {
+  border-color: $border-color;
+}
+
 /*
  * modal
  */

+ 3 - 3
src/client/styles/scss/theme/_apply-colors.scss

@@ -416,11 +416,11 @@ body.on-edit {
     background-color: darken($bgcolor-global, 2%);
 
     .page-editor-editor-container {
-      border-right-color: $border-color;
+      border-right-color: $border-color-theme;
 
       .navbar-editor {
         background-color: $bgcolor-global; // same color with active tab
-        border-bottom-color: $border-color;
+        border-bottom-color: $border-color-theme;
       }
     }
 
@@ -429,7 +429,7 @@ body.on-edit {
     }
 
     .page-editor-footer {
-      border-top-color: $border-color;
+      border-top-color: $border-color-theme;
     }
   }