Просмотр исходного кода

Apply `$ border-color` to border color.

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

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

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

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

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

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

@@ -25,6 +25,8 @@ $gray-900: darken($dark, 5%) !default;
 $grays: ("50": $gray-50) !default;
 $red: #ff0a54 !default;
 
+$border-color: red; //glay-200 test
+
 //== Typography
 //
 //## Font, line-height, and color for body text, headings, and more.
@@ -54,7 +56,7 @@ $btn-link-disabled-color: $gray-500;
 
 //== Forms
 //
-$input-border-color: $gray-300;
+$input-border-color: border-color;
 
 $input-border-radius: $border-radius-sm;
 $input-border-radius-sm: $border-radius-sm;
@@ -62,7 +64,7 @@ $input-border-radius-lg: $border-radius;
 
 $input-placeholder-color: $gray-500;
 
-$custom-control-indicator-border-color: $gray-400;
+$custom-control-indicator-border-color: border-color;
 $custom-control-label-disabled-color: $gray-500;
 $custom-select-disabled-color: $gray-500;
 $custom-range-thumb-disabled-bg: $gray-400;

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

@@ -16,7 +16,6 @@ $color-tags: $gray-500 !default;
 $bgcolor-tags: $gray-200 !default;
 
 // override bootstrap variables
-$border-color: $gray-200;
 $table-color: $color-table;
 $table-bg: $bgcolor-table;
 $table-border-color: $border-color-table;
@@ -282,3 +281,20 @@ $table-hover-bg: $bgcolor-table-hover;
     background-color: $bgcolor-tags;
   }
 }
+
+.top-of-table-contents {
+  border-color: $border-color;
+
+  .grw-seen-user-list {
+    border-color: $border-color;
+  }
+}
+
+// override-codemirror day-theme
+
+.CodeMirror {
+  .CodeMirror-gutters {
+    background-color: $gray-50;
+    border-right-color: $border-color;
+  }
+}

+ 1 - 1
src/client/styles/scss/theme/default.scss

@@ -90,7 +90,7 @@ html[light] {
   $color-editor-icons: $color-global;
 
   // Border colors
-  $border-color-theme: $gray-400;
+  $border-color-theme: blue;
   $bordercolor-inline-code: $gray-400; // optional
 
   // Dropdown colors

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

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