Merge pull request #3844 from weseek/imprv/GW-6127-overall-colors

Imprv/gw 6127 overall colors

src/client/styles/scss/theme/hufflepuff.scss

@@ -1,5 +1,3 @@
-// ↓spring's copy↓
-
 @import '../variables';
 @import '../override-bootstrap-variables';
 
@@ -15,33 +13,33 @@
 // $light: #;
 // $dark: #;
 
-$themecolor: #eaab20; // changed to confirm　refrection
-$themelight: #fff0f5;
-$subthemecolor: #67a856;
-$third-main-color: antiquewhite;
-$accentcolor: #e08dbc;
-
-.grw-navbar {
-  border-bottom: $accentcolor 4px solid;
-}
+// .grw-navbar {
+//   border-bottom: $accentcolor 4px solid;
+// }
 
 //== Light Mode
 //
-html[light],
-html[dark] {
+html[light] {
+  // Theme colors
+  $themecolor: #eaab20;
+  $themelight: #efe2cf;
+  $subthemecolor: #231e1d;
+  $accentcolor: #993439;
+
   $primary: $themecolor;
-  $secondary: $accentcolor;
+  $secondary: $subthemecolor;
 
   // Background colors
-  $bgcolor-global: rgb(255, 0, 0); // changed to confirm　refrection
+  $bgcolor-global: lighten($themelight, 10%);
   $bgcolor-inline-code: $gray-100; //optional
+  // ↓spring's copy↓
   $bgcolor-card: $gray-50;
   $bgcolor-highlighted: rgba($primary, 0.5);
 
   // Font colors
   $color-global: black;
   $color-reversal: white;
-  $color-link: $subthemecolor;
+  $color-link: $accentcolor;
   $color-link-hover: lighten($subthemecolor, 10%);
   $color-link-wiki: $subthemecolor;
   $color-link-wiki-hover: lighten($color-link-wiki, 10%);
@@ -57,9 +55,9 @@ html[dark] {
   $bgcolor-list-active: $accentcolor;
 
   // Navbar
-  $bgcolor-navbar: #d3687c;
+  $bgcolor-navbar: #f0c05a;
   $bgcolor-search-top-dropdown: $themecolor;
-  $border-image-navbar: linear-gradient(to right, #cbe682 0%, #4ad6e8 50%, #ea42f0 100%);
+  $border-image-navbar: linear-gradient(to right, #90a555 0%, #a84be6 50%, #eaab20 100%);
 
   // Logo colors
   $bgcolor-logo: $bgcolor-navbar;
@@ -73,10 +71,10 @@ html[dark] {
   $color-resize-button-hover: $color-reversal;
   $bgcolor-resize-button-hover: lighten($bgcolor-resize-button, 5%);
   // Sidebar contents
-  $color-sidebar-context: $subthemecolor;
-  $bgcolor-sidebar-context: #f4f6fc;
+  $color-sidebar-context: $accentcolor;
+  $bgcolor-sidebar-context: $themelight;
   // Sidebar list group
-  $bgcolor-sidebar-list-group: #fafbff; // optional
+  $bgcolor-sidebar-list-group: $themelight;
 
   // Icon colors
   $color-editor-icons: $color-global;
@@ -91,7 +89,7 @@ html[dark] {
   $color-dropdown-link-hover: $color-global;
 
   // admin theme box
-  $color-theme-color-box: darken($primary, 20%);
+  $color-theme-color-box: $primary;
 
   @import 'apply-colors';
   @import 'apply-colors-light';
@@ -147,7 +145,8 @@ html[dark] {
   }
 
   .card-timeline > .card-header {
-    background-color: $third-main-color;
+    //for now
+    background-color: $themecolor;
   }
 
   h1,
@@ -165,3 +164,114 @@ html[dark] {
     }
   }
 }
+
+html[dark] {
+  // Theme colors
+  $themecolor: #eaab20;
+  $themedark: rgb(36, 36, 0);
+  $subthemecolor: #231e1d;
+  $accentcolor: #993439;
+
+  $primary: $themecolor;
+  $secondary: $subthemecolor;
+  $dark: #031018;
+
+  // Background colors
+  $bgcolor-global: $themedark;
+  // ↓mono-blue's copy↓
+  $bgcolor-navbar: #27343b;
+  $bgcolor-inline-code: $subthemecolor;
+  $bgcolor-card: darken($themedark, 5%);
+  $bgcolor-highlighted: rgba($primary, 0.5);
+
+  // Font colors
+  $color-global: #d3d4d4;
+  $color-reversal: $gray-100;
+  $color-link: #f0e397;
+  $color-link-hover: darken($color-link, 12%);
+  $color-link-wiki: lighten($primary, 20%);
+  $color-link-wiki-hover: lighten($color-link-wiki, 20%);
+  $color-link-nabvar: $color-reversal;
+  $color-inline-code: $themecolor;
+  // $color-inline-code: #c7254e; // optional
+  $color-search: #000102;
+
+  // List Group colors
+  // $color-list: $color-global;
+  $bgcolor-list: transparent;
+  $color-list-hover: $accentcolor;
+  // $bgcolor-list-hover: lighten($bgcolor-global, 3%);
+  // $color-list-active: $color-reversal;
+  // $bgcolor-list-active: $primary;
+
+  // Navbar
+  $bgcolor-navbar: #967224;
+  $bgcolor-search-top-dropdown: $themecolor;
+  $border-image-navbar: linear-gradient(to right, #90a555 0%, #3d98a3 50%, #eaab20 100%);
+
+  // Logo colors
+  $bgcolor-logo: #13191c;
+  $fillcolor-logo-mark: white;
+
+  // Sidebar
+  $bgcolor-sidebar: $themecolor;
+  // $bgcolor-sidebar-nav-item-active: rgba(#, 0.3); // optional
+  $text-shadow-sidebar-nav-item-active: 0px 0px 10px #0099ff; // optional
+  // Sidebar resize button
+  $color-resize-button: $color-global;
+  $bgcolor-resize-button: $subthemecolor;
+  $color-resize-button-hover: $color-global;
+  $bgcolor-resize-button-hover: darken($bgcolor-resize-button, 5%);
+  // Sidebar contents
+  // $bgcolor-sidebar-context: $subthemecolor;
+  $bgcolor-sidebar-context: lighten($themedark, 5%);
+  $color-sidebar-context: $color-global;
+  // Sidebar list group
+  // $bgcolor-sidebar-list-group: #; // optional
+
+  // Icon colors
+  $color-editor-icons: $color-global;
+
+  // Border colors
+  $border-color-theme: #146aa0;
+  $bordercolor-inline-code: #4d4d4d; // optional
+
+  // Dropdown colors
+  $bgcolor-dropdown-link-active: $primary;
+  $color-dropdown-link-active: $color-global;
+  $color-dropdown-link-hover: $color-reversal;
+
+  // admin theme box
+  $color-theme-color-box: $primary;
+
+  @import 'apply-colors';
+  @import 'apply-colors-dark';
+
+  // Navs
+  .nav-tabs {
+    border-bottom: $border-color-theme 1px solid;
+    .nav-link {
+      &:hover {
+        border-color: lighten($border-color-theme, 10%);
+        border-bottom: none;
+      }
+      &.active {
+        color: $color-link;
+        background-color: transparent;
+        border-color: $border-color-theme;
+      }
+    }
+  }
+
+  // Table
+  .table {
+    color: white;
+  }
+
+  // Button
+  .btn-group.grw-page-editor-mode-manager {
+    .btn.btn-outline-primary {
+      @include btn-page-editor-mode-manager(lighten($primary, 30%), $primary, darken($primary, 10%), darken($primary, 20%));
+    }
+  }
+}