Explorar o código

Apply border variables.
Changed the border variable to something close to the XD design spec.

oshikishintaro %!s(int64=5) %!d(string=hai) anos
pai
achega
ac34565cf9

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

@@ -16,7 +16,7 @@ $color-tags: #949494 !default;
 $bgcolor-tags: $dark !default;
 
 // override bootstrap variables
-$border-color: $gray-700;
+$border-color: $secondary;
 $table-dark-color: $color-table;
 $table-dark-bg: $bgcolor-table;
 $table-dark-border-color: $border-color-table;
@@ -37,6 +37,7 @@ select.form-control,
 textarea.form-control {
   color: lighten($color-global, 30%);
   background-color: darken($bgcolor-global, 5%);
+  border-color: $border-color;
   &:focus {
     background-color: $bgcolor-global;
   }
@@ -257,6 +258,15 @@ ul.pagination {
  * GROWI on-edit
  */
 body.on-edit {
+  .main {
+    .page-editor-editor-container {
+      border-right-color: $border-color;
+
+      .navbar-editor {
+        border-bottom-color: $border-color;
+      }
+    }
+  }
   .grw-editor-navbar-bottom {
     background-color: $bgcolor-global;
     #slack-mark-black {
@@ -357,3 +367,29 @@ body.on-edit {
     background-color: $bgcolor-tags;
   }
 }
+
+/*
+ * admin settings
+ */
+.admin-setting-header {
+  border-color: $border-color;
+}
+
+/*
+ * modal
+ */
+.grw-modal-head {
+  border-color: $border-color;
+}
+
+.revision-toc {
+  .top-of-table-contents {
+    border-color: $border-color;
+
+    .grw-seen-user-list {
+      &:before {
+        border-color: $border-color;
+      }
+    }
+  }
+}

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

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