Преглед изворни кода

Merge pull request #2956 from weseek/imprv/re-gw3897-bordercolor-redesign

Imprv/re gw3897 bordercolor redesign
Yuki Takei пре 5 година
родитељ
комит
b066935a17

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

@@ -39,7 +39,7 @@
   }
   }
 
 
   .admin-setting-header {
   .admin-setting-header {
-    border-bottom: 1px solid #dee2e6;
+    border-bottom: 1px solid $border-color;
   }
   }
 
 
   .admin-security {
   .admin-security {
@@ -141,7 +141,7 @@
     // style
     // style
     .theme-option-container a {
     .theme-option-container a {
       background-color: $gray-50;
       background-color: $gray-50;
-      border: 1px solid $gray-300;
+      border: 1px solid $border-color;
     }
     }
     .theme-option-name {
     .theme-option-name {
       opacity: 0.3;
       opacity: 0.3;

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

@@ -16,7 +16,7 @@ body {
 
 
 .grw-modal-head {
 .grw-modal-head {
   font-size: 1em;
   font-size: 1em;
-  border-bottom: 1px solid $gray-500;
+  border-bottom: 1px solid $border-color;
 }
 }
 
 
 // padding settings for GrowiNavbarBottom
 // padding settings for GrowiNavbarBottom

+ 3 - 1
src/client/styles/scss/_override-bootstrap-variables.scss

@@ -25,6 +25,8 @@ $gray-900: darken($dark, 5%) !default;
 $grays: ("50": $gray-50) !default;
 $grays: ("50": $gray-50) !default;
 $red: #ff0a54 !default;
 $red: #ff0a54 !default;
 
 
+$border-color: $gray-300 !default;
+
 //== Typography
 //== Typography
 //
 //
 //## Font, line-height, and color for body text, headings, and more.
 //## Font, line-height, and color for body text, headings, and more.
@@ -54,7 +56,7 @@ $btn-link-disabled-color: $gray-500;
 
 
 //== Forms
 //== Forms
 //
 //
-$input-border-color: $gray-300;
+$input-border-color: $border-color;
 
 
 $input-border-radius: $border-radius-sm;
 $input-border-radius: $border-radius-sm;
 $input-border-radius-sm: $border-radius-sm;
 $input-border-radius-sm: $border-radius-sm;

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

@@ -16,7 +16,6 @@ $color-tags: $gray-500 !default;
 $bgcolor-tags: $gray-200 !default;
 $bgcolor-tags: $gray-200 !default;
 
 
 // override bootstrap variables
 // override bootstrap variables
-$border-color: $gray-200;
 $table-color: $color-table;
 $table-color: $color-table;
 $table-bg: $bgcolor-table;
 $table-bg: $bgcolor-table;
 $table-border-color: $border-color-table;
 $table-border-color: $border-color-table;
@@ -51,7 +50,7 @@ $table-hover-bg: $bgcolor-table-hover;
  */
  */
 .card.card-disabled {
 .card.card-disabled {
   background-color: darken($bgcolor-card, 5%);
   background-color: darken($bgcolor-card, 5%);
-  border-color: $gray-200;
+  border-color: $border-color;
 }
 }
 
 
 /*
 /*
@@ -282,3 +281,15 @@ $table-hover-bg: $bgcolor-table-hover;
     background-color: $bgcolor-tags;
     background-color: $bgcolor-tags;
   }
   }
 }
 }
+
+.revision-toc {
+  .top-of-table-contents {
+    border-color: $border-color;
+
+    .grw-seen-user-list {
+      &:before {
+        border-color: $border-color;
+      }
+    }
+  }
+}

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

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

+ 1 - 0
src/client/styles/scss/theme/mixins/_list-group.scss

@@ -3,6 +3,7 @@
     .list-group-item {
     .list-group-item {
       color: $color;
       color: $color;
       background-color: $bgcolor;
       background-color: $bgcolor;
+      border-color: $border-color;
 
 
       &.list-group-item-action {
       &.list-group-item-action {
         &:hover {
         &:hover {