Merge pull request #2243 from weseek/imprv/nature-and-wood

Imprv/nature and wood

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

@@ -65,14 +65,13 @@ $input-focus-color: $color-global;
 }
 
 // Tabs
-.nav.nav-tabs {
-  > li > a {
-    color: $color-link;
+.nav.nav-tabs .nav-link.active {
+  color: $color-link !important;
+  background: transparent;
 
-    &:hover,
-    &:focus {
-      color: $color-link-hover;
-    }
+  &:hover,
+  &:focus {
+    color: $color-link-hover !important;
   }
 }
 

src/client/styles/scss/theme/nature.scss

@@ -31,65 +31,49 @@
   }
 }
 
-$themecolor: #118050;
-$themelight: #fefffd;
+$themecolor: #12b105;
 
 //== Light Mode
 //
 html[light],
 html[dark] {
-  $bgcolor-theme: #460039;
-
-  $bgcolor-navbar: #118050;
-  $bgcolor-global: #fefffd;
-
-  $color-header: #46694e;
-  $color-global: #333333;
-  $linktext: lighten($bgcolor-theme, 5%);
-  $linktext-hover: lighten($linktext, 12%);
-  $sidebar-text: #5c7253;
-
-  $primary: $bgcolor-theme;
-
-  $fillcolor-logo-mark: lighten(desaturate($bgcolor-navbar, 30%), 20%);
-  $color-link-wiki: lighten($bgcolor-theme, 20%);
-  $color-link-wiki-hover: lighten($color-link-wiki, 20%);
-
+  $primary: #460039;
+  $light: #f0f0f0;
+  
   // Background colors
-  $bgcolor-global: $themelight;
-  $bgcolor-inline-code: #f9f2f4;
-  $bgcolor-card: #f5f5f5;
-
+  $bgcolor-global: #fdfdfd;
+  $bgcolor-inline-code: #eaeaea;
+  $bgcolor-card: #f1ffe4;
+  $bgcolor-subnabvar: #fafafa;
+  
   // Font colors
-  $color-global: $bgcolor-theme;
+  $color-global: #460039;
   $color-reversal: #eeeeee;
-  $color-link: lighten($color-global, 20%);
+  $color-link: #7e0044;
   $color-link-hover: lighten($color-link, 20%);
   $color-link-wiki: lighten($primary, 20%);
   $color-link-wiki-hover: lighten($color-link-wiki, 20%);
-  $color-link-nabvar: $color-reversal;
-  $color-inline-code: #c7254e;
-
-  // List Group colors
-  $color-list: $color-global;
-  $bgcolor-list: $bgcolor-global;
-  $color-list-active: $color-reversal;
-  $bgcolor-list-active: $primary;
-  $color-list-hover: $color-reversal;
-
+  $color-link-nabvar: #a7a7a7;
+  $color-inline-code: #890000;
+  $color-search: white;
+  
   // Navbar
-  $bgcolor-navbar: $themecolor;
-  $border-color-navbar-gradient-left: #545fff;
-  $border-color-navbar-gradient-right: #00a6e5;
-
+  $bgcolor-navbar: #234136;
+  $bgcolor-search-top-dropdown: $themecolor;
+  $border-image-navbar: linear-gradient(to right, #5c78ef 0%, #16bc42 50%, #5c78ef 100%);
+  
   // Logo colors
   $bgcolor-logo: $bgcolor-navbar;
   $fillcolor-logo-mark: lighten(desaturate($bgcolor-inline-code, 10%), 15%);
 
   // Sidebar
-  $bgcolor-sidebar: $bgcolor-navbar;
-  $color-sidebar-context: $color-reversal;
-  $bgcolor-sidebar-context: lighten($bgcolor-navbar, 10%);
+  $bgcolor-sidebar: #188f64;
+  // Sidebar contents
+  $color-sidebar-context: #7e0044;
+  $bgcolor-sidebar-context: #fdffeb;
+  // Sidebar resize button
+  $color-resize-button: white;
+  $bgcolor-resize-button: $themecolor;
 
   // Icon colors
   $color-editor-icons: $color-global;
@@ -114,8 +98,24 @@ html[dark] {
   @import 'apply-colors';
   @import 'apply-colors-light';
 
-  .table {
-    background-color: $themelight;
+  // hljs
+  .hljs {
+    background-color: $bgcolor-inline-code;
+  }
+
+  // Search Top
+  .search-top {
+    .btn-secondary.dropdown-toggle {
+      color: $color-search;
+    }
+  }
+
+  // Navs
+  .nav-tabs .nav-link.active {
+    color: $color-link !important;
+    &:hover {
+      color: $color-link-hover !important;
+    }
   }
 }
 

src/client/styles/scss/theme/wood.scss

@@ -31,43 +31,39 @@
   }
 }
 
-$themecolor: #aaa45f;
+$themecolor: #b9b177;
 $themelight: #f5f3ee;
-$accentcolor: #577254;
 
 //== Light Mode
 //
 html[light],
 html[dark] {
-  $primary: $themecolor;
+  $primary: #aaa45f;
 
   // Background colors
-  $bgcolor-global: $themelight;
-  $bgcolor-inline-code: darken($themecolor, 20%);
-  $bgcolor-card: #f5f5f5;
+  $bgcolor-global: #ffffff;
+  $bgcolor-inline-code: #eaeaea;
+  $bgcolor-card: #ece8de;
 
   // Font colors
-  $color-global: black;
+  // $color-global: black;
+  $color-global: #433005;
   $color-reversal: #fffffc;
-  // $color-header: #2b2b2b;
-  $color-link: lighten($color-global, 20%);
+  $color-link: #9d7406;
   $color-link-hover: lighten($color-link, 20%);
   $color-link-wiki: lighten($themecolor, 5%);
   $color-link-wiki-hover: lighten($color-link-wiki, 15%);
-  $color-link-nabvar: $color-reversal;
-  $color-inline-code: lighten($accentcolor, 70%);
+  $color-link-nabvar: #a7a7a7;
+  $color-inline-code: #890000;
+  $color-search: white;
 
   // List Group colors
-  $color-list: $color-global;
-  $bgcolor-list: $bgcolor-global;
-  $color-list-active: $color-reversal;
-  $bgcolor-list-active: $primary;
-  $color-list-hover: $color-reversal;
+  $color-list-hover: #eee;
 
   // Navbar
-  $bgcolor-navbar: $themecolor;
-  $border-color-navbar-gradient-left: #545fff;
-  $border-color-navbar-gradient-right: #00a6e5;
+  $bgcolor-navbar: #2a2929;
+  $bgcolor-search-top-dropdown: $themecolor;
+  $border-image-navbar: linear-gradient(to right, #5c78ef 0%, #16bc42 50%, #5c78ef 100%);
 
   // Logo colors
   $bgcolor-logo: darken($themecolor, 10%);
@@ -76,8 +72,14 @@ html[dark] {
 
   // Sidebar
   $bgcolor-sidebar: $bgcolor-navbar;
-  $color-sidebar-context: $color-reversal;
-  $bgcolor-sidebar-context: lighten($bgcolor-navbar, 10%);
+  // Sidebar contents
+  $color-sidebar-context: #9d7406;
+  $bgcolor-sidebar-context: #f0efe7;
+  // Sidebar list group
+  $bgcolor-sidebar-list-group: #f7f5f1;
+  // Sidebar resize button
+  $color-resize-button: white;
+  $bgcolor-resize-button: $themecolor;
 
   // Border colors
   $border-color-theme: #ccc; // former: `$navbar-border: #ccc;`
@@ -102,13 +104,34 @@ html[dark] {
   @import 'apply-colors';
   @import 'apply-colors-light';
 
-  .table {
-    background-color: $themelight;
+  // hljs
+  .hljs {
+    color: #433005;
+    background-color: $bgcolor-inline-code;
   }
 
-  .grw-navbar {
-    background-image: url('/images/themes/wood/wood-navbar.jpg');
-    border-bottom: $accentcolor 4px solid;
+  // List
+  .list-group .list-group-item {
+    background: transparent;
+  }
+
+  // Search Top
+  .search-top {
+    .btn-secondary.dropdown-toggle {
+      color: $color-search;
+    }
+  }
+
+  // Sidebar
+  .grw-sidebar div[data-testid='GlobalNavigation']{
+    * {
+      background-image: url('/images/themes/wood/wood-navbar.jpg');
+    }
+
+    button,
+    .btn {
+      border: none;
+    }
   }
 }