fix css slector hierarchy

packages/app/src/components/Theme/ThemeDefault.module.scss

@@ -16,197 +16,201 @@
 
 //== Light Mode
 //
-.theme[data-color-scheme='light'] :global {
-  $primary: #122c55;
-  $accent: #209fd8;
-
-  // Background colors
-  $bgcolor-global: white;
-  $bgcolor-inline-code: $gray-100; //optional
-  $bgcolor-card: $gray-50;
-  $bgcolor-blinked-section: rgba($primary, 0.1);
-  //$bgcolor-keyword-highlighted: $grw-marker-yellow;
-
-  // Font colors
-  $color-global: #112744;
-  $color-reversal: $light;
-  // $color-header: #2b2b2b;
-  $color-link: #1938ba;
-  $color-link-hover: lighten($color-link, 20%);
-  $color-link-wiki: $color-link;
-  $color-link-wiki-hover: lighten($color-link-wiki, 20%);
-  $color-link-nabvar: $gray-500;
-  $color-inline-code: darken($red, 15%); // optional
-
-  // List Group colors
-  // $color-list: $color-global; // optional
-  // $bgcolor-list: $bgcolor-global; // optional
-  // $color-list-hover: $color-global; // optional
-  // $bgcolor-list-hover: darken($bgcolor-global, 3%); // optional
-  // $color-list-active: $color-reversal; // optional
-  // $bgcolor-list-active: $primary; // optional
-
-  // Table colors
-  // $bgcolor-subnav: #; // optional
-  // $color-table: #; // optional
-  // $bgcolor-table: #; // optional
-  // $border-color-table: #; // optional
-  // $color-table-hover: #; // optional
-  // $bgcolor-table-hover: #; // optional
-
-  // Navbar
-  $bgcolor-navbar: $gray-900;
-  $bgcolor-search-top-dropdown: $accent;
-  $border-image-navbar: linear-gradient(to right, #36c9ff 0%, #36c9ff 33%, #7926ff 66%, #ff2eff 100%);
-
-  // Logo colors
-  $bgcolor-logo: $bgcolor-navbar;
-  $fillcolor-logo-mark: lighten(desaturate($bgcolor-navbar, 10%), 15%);
-
-  // Sidebar
-  $bgcolor-sidebar: $primary;
-  $bgcolor-sidebar-nav-item-active: rgba(black, 0.37); // optional
-  $text-shadow-sidebar-nav-item-active: 0px 0px 10px #0099ff; // optional
-  // Sidebar resize button
-  $color-resize-button: $color-reversal;
-  $bgcolor-resize-button: $accent;
-  $color-resize-button-hover: $color-reversal;
-  $bgcolor-resize-button-hover: lighten($bgcolor-resize-button, 5%);
-  // Sidebar contents
-  $color-sidebar-context: $color-global;
-  $bgcolor-sidebar-context: lighten($primary, 77%);
-  // Sidebar list group
-  $bgcolor-sidebar-list-group: $gray-50; // optional
-
-  // Subnavigation
-  // $bgcolor-subnav: #fafafa; // optional
-
-  // Tabs
-  // $color-nav-tabs-link-active: #; //optional
-  // $bordercolor-nav-tabs-hover: # # $bordercolor-nav-tabs; // optional
-  // $bordercolor-nav-tabs-active: # # $bgcolor-global; // optional
-
-  // Tags
-  // $color-tags: #; //optional
-  // $bgcolor-tags: #; //optional
-
-  // Icon colors
-  $color-editor-icons: $color-global;
-
-  // Border colors
-  $border-color-theme: $gray-400;
-  $bordercolor-inline-code: $gray-400; // optional
-
-  // Dropdown colors
-  $bgcolor-dropdown-link-active: $growi-blue;
-
-  // admin theme box
-  $color-theme-color-box: lighten($primary, 20%);
-
-  @import '../../styles/theme/apply-colors';
-  @import '../../styles/theme/apply-colors-light';
-
-  // Button
-  .btn-group.grw-page-editor-mode-manager {
-    .btn.btn-outline-primary {
-      @include page-editor-mode-manager.btn-page-editor-mode-manager($primary, lighten($primary, 65%), lighten($primary, 70%));
+.theme {
+  [data-color-scheme='light'] :global {
+    $primary: #122c55;
+    $accent: #209fd8;
+
+    // Background colors
+    $bgcolor-global: white;
+    $bgcolor-inline-code: $gray-100; //optional
+    $bgcolor-card: $gray-50;
+    $bgcolor-blinked-section: rgba($primary, 0.1);
+    //$bgcolor-keyword-highlighted: $grw-marker-yellow;
+
+    // Font colors
+    $color-global: #112744;
+    $color-reversal: $light;
+    // $color-header: #2b2b2b;
+    $color-link: #1938ba;
+    $color-link-hover: lighten($color-link, 20%);
+    $color-link-wiki: $color-link;
+    $color-link-wiki-hover: lighten($color-link-wiki, 20%);
+    $color-link-nabvar: $gray-500;
+    $color-inline-code: darken($red, 15%); // optional
+
+    // List Group colors
+    // $color-list: $color-global; // optional
+    // $bgcolor-list: $bgcolor-global; // optional
+    // $color-list-hover: $color-global; // optional
+    // $bgcolor-list-hover: darken($bgcolor-global, 3%); // optional
+    // $color-list-active: $color-reversal; // optional
+    // $bgcolor-list-active: $primary; // optional
+
+    // Table colors
+    // $bgcolor-subnav: #; // optional
+    // $color-table: #; // optional
+    // $bgcolor-table: #; // optional
+    // $border-color-table: #; // optional
+    // $color-table-hover: #; // optional
+    // $bgcolor-table-hover: #; // optional
+
+    // Navbar
+    $bgcolor-navbar: $gray-900;
+    $bgcolor-search-top-dropdown: $accent;
+    $border-image-navbar: linear-gradient(to right, #36c9ff 0%, #36c9ff 33%, #7926ff 66%, #ff2eff 100%);
+
+    // Logo colors
+    $bgcolor-logo: $bgcolor-navbar;
+    $fillcolor-logo-mark: lighten(desaturate($bgcolor-navbar, 10%), 15%);
+
+    // Sidebar
+    $bgcolor-sidebar: $primary;
+    $bgcolor-sidebar-nav-item-active: rgba(black, 0.37); // optional
+    $text-shadow-sidebar-nav-item-active: 0px 0px 10px #0099ff; // optional
+    // Sidebar resize button
+    $color-resize-button: $color-reversal;
+    $bgcolor-resize-button: $accent;
+    $color-resize-button-hover: $color-reversal;
+    $bgcolor-resize-button-hover: lighten($bgcolor-resize-button, 5%);
+    // Sidebar contents
+    $color-sidebar-context: $color-global;
+    $bgcolor-sidebar-context: lighten($primary, 77%);
+    // Sidebar list group
+    $bgcolor-sidebar-list-group: $gray-50; // optional
+
+    // Subnavigation
+    // $bgcolor-subnav: #fafafa; // optional
+
+    // Tabs
+    // $color-nav-tabs-link-active: #; //optional
+    // $bordercolor-nav-tabs-hover: # # $bordercolor-nav-tabs; // optional
+    // $bordercolor-nav-tabs-active: # # $bgcolor-global; // optional
+
+    // Tags
+    // $color-tags: #; //optional
+    // $bgcolor-tags: #; //optional
+
+    // Icon colors
+    $color-editor-icons: $color-global;
+
+    // Border colors
+    $border-color-theme: $gray-400;
+    $bordercolor-inline-code: $gray-400; // optional
+
+    // Dropdown colors
+    $bgcolor-dropdown-link-active: $growi-blue;
+
+    // admin theme box
+    $color-theme-color-box: lighten($primary, 20%);
+
+    @import '../../styles/theme/apply-colors';
+    @import '../../styles/theme/apply-colors-light';
+
+    // Button
+    .btn-group.grw-page-editor-mode-manager {
+      .btn.btn-outline-primary {
+        @include page-editor-mode-manager.btn-page-editor-mode-manager($primary, lighten($primary, 65%), lighten($primary, 70%));
+      }
     }
   }
 }
 
 //== Dark Mode
 //
-.theme[data-color-scheme='dark'] :global {
-  $primary: #115cd3;
-  $accent: #db00c2;
-
-  // Background colors
-  $bgcolor-global: #131418;
-  $bgcolor-inline-code: #1f1f22; //optional
-  $bgcolor-card: darken($bgcolor-global, 5%);
-  $bgcolor-blinked-section: rgba($primary, 0.4);
-  $bgcolor-keyword-highlighted: darken($grw-marker-red, 30%);
-
-  // Font colors
-  $color-global: $gray-400;
-  $color-reversal: $gray-900;
-  // $color-header: desaturate($primary, 20%);
-  $color-link: #7b9ad5;
-  $color-link-hover: lighten($color-link, 10%);
-  $color-link-wiki: $color-link;
-  $color-link-wiki-hover: lighten($color-link-wiki, 10%);
-  $color-link-nabvar: #a7a7a7;
-  $color-inline-code: #c7254e; // optional
-
-  // List Group colors
-  // $color-list: $color-global; // optional
-  // $bgcolor-list: $bgcolor-global; // optional
-  // $color-list-hover: $color-global; // optional
-  // $bgcolor-list-hover: lighten($bgcolor-global, 3%); // optional
-  // $color-list-active:white ; // optional
-  // $bgcolor-list-active: $primary; // optional
-
-  // Table colors
-  // $color-table: #; // optional
-  // $bgcolor-table: #; // optional
-  // $border-color-table: #; // optional
-  // $color-table-hover: #; // optional
-  // $bgcolor-table-hover: #; // optional
-
-  // Navbar
-  $bgcolor-navbar: #2a2929;
-  $bgcolor-search-top-dropdown: $accent;
-  $border-image-navbar: linear-gradient(to right, #44bfe3 0%, #b04aff 50%, #ff1794 100%);
-
-  // Logo colors
-  $bgcolor-logo: $bgcolor-navbar;
-  $fillcolor-logo-mark: $gray-700;
-
-  // Sidebar
-  $bgcolor-sidebar: #122c55;
-  $bgcolor-sidebar-nav-item-active: rgba(#969494, 0.3); // optional
-  $text-shadow-sidebar-nav-item-active: 0px 0px 10px #0099ff; // optional
-  // Sidebar resize button
-  $color-resize-button: white;
-  $bgcolor-resize-button: $accent;
-  $color-resize-button-hover: white;
-  $bgcolor-resize-button-hover: darken($bgcolor-resize-button, 5%);
-  // Sidebar contents
-  $bgcolor-sidebar-context: lighten($bgcolor-global, 8%);
-  $color-sidebar-context: $color-global;
-  // Sidebar list group
-  $bgcolor-sidebar-list-group: #1c2a3e; // optional
-
-  // Subnavigation
-  $bgcolor-subnav: lighten($bgcolor-global, 4%); // optional
-
-  // Tabs
-  $bordercolor-nav-tabs: $gray-700; // optional
-  // $color-nav-tabs-link-active: #; //optional
-  $bordercolor-nav-tabs-hover: #666 #666 $bordercolor-nav-tabs; // optional
-  // $bordercolor-nav-tabs-active: # # $bgcolor-global; // optional
-
-  // Tags
-  // $color-tags: #; //optional
-  // $bgcolor-tags: #; //optional
-
-  // Icon colors
-  $color-editor-icons: $color-global;
-
-  // Border colors
-  $border-color-theme: $gray-400;
-  $bordercolor-inline-code: $secondary; // optional
-
-  // admin theme box
-  $color-theme-color-box: $primary;
-
-  @import '../../styles/theme/apply-colors';
-  @import '../../styles/theme/apply-colors-dark';
-
-  //Button
-  .btn-group.grw-page-editor-mode-manager {
-    .btn.btn-outline-primary {
-      @include page-editor-mode-manager.btn-page-editor-mode-manager(lighten($primary, 30%), lighten($primary, 20%), $primary, darken($primary, 20%));
+.theme {
+  [data-color-scheme='dark'] :global {
+    $primary: #115cd3;
+    $accent: #db00c2;
+
+    // Background colors
+    $bgcolor-global: #131418;
+    $bgcolor-inline-code: #1f1f22; //optional
+    $bgcolor-card: darken($bgcolor-global, 5%);
+    $bgcolor-blinked-section: rgba($primary, 0.4);
+    $bgcolor-keyword-highlighted: darken($grw-marker-red, 30%);
+
+    // Font colors
+    $color-global: $gray-400;
+    $color-reversal: $gray-900;
+    // $color-header: desaturate($primary, 20%);
+    $color-link: #7b9ad5;
+    $color-link-hover: lighten($color-link, 10%);
+    $color-link-wiki: $color-link;
+    $color-link-wiki-hover: lighten($color-link-wiki, 10%);
+    $color-link-nabvar: #a7a7a7;
+    $color-inline-code: #c7254e; // optional
+
+    // List Group colors
+    // $color-list: $color-global; // optional
+    // $bgcolor-list: $bgcolor-global; // optional
+    // $color-list-hover: $color-global; // optional
+    // $bgcolor-list-hover: lighten($bgcolor-global, 3%); // optional
+    // $color-list-active:white ; // optional
+    // $bgcolor-list-active: $primary; // optional
+
+    // Table colors
+    // $color-table: #; // optional
+    // $bgcolor-table: #; // optional
+    // $border-color-table: #; // optional
+    // $color-table-hover: #; // optional
+    // $bgcolor-table-hover: #; // optional
+
+    // Navbar
+    $bgcolor-navbar: #2a2929;
+    $bgcolor-search-top-dropdown: $accent;
+    $border-image-navbar: linear-gradient(to right, #44bfe3 0%, #b04aff 50%, #ff1794 100%);
+
+    // Logo colors
+    $bgcolor-logo: $bgcolor-navbar;
+    $fillcolor-logo-mark: $gray-700;
+
+    // Sidebar
+    $bgcolor-sidebar: #122c55;
+    $bgcolor-sidebar-nav-item-active: rgba(#969494, 0.3); // optional
+    $text-shadow-sidebar-nav-item-active: 0px 0px 10px #0099ff; // optional
+    // Sidebar resize button
+    $color-resize-button: white;
+    $bgcolor-resize-button: $accent;
+    $color-resize-button-hover: white;
+    $bgcolor-resize-button-hover: darken($bgcolor-resize-button, 5%);
+    // Sidebar contents
+    $bgcolor-sidebar-context: lighten($bgcolor-global, 8%);
+    $color-sidebar-context: $color-global;
+    // Sidebar list group
+    $bgcolor-sidebar-list-group: #1c2a3e; // optional
+
+    // Subnavigation
+    $bgcolor-subnav: lighten($bgcolor-global, 4%); // optional
+
+    // Tabs
+    $bordercolor-nav-tabs: $gray-700; // optional
+    // $color-nav-tabs-link-active: #; //optional
+    $bordercolor-nav-tabs-hover: #666 #666 $bordercolor-nav-tabs; // optional
+    // $bordercolor-nav-tabs-active: # # $bgcolor-global; // optional
+
+    // Tags
+    // $color-tags: #; //optional
+    // $bgcolor-tags: #; //optional
+
+    // Icon colors
+    $color-editor-icons: $color-global;
+
+    // Border colors
+    $border-color-theme: $gray-400;
+    $bordercolor-inline-code: $secondary; // optional
+
+    // admin theme box
+    $color-theme-color-box: $primary;
+
+    @import '../../styles/theme/apply-colors';
+    @import '../../styles/theme/apply-colors-dark';
+
+    //Button
+    .btn-group.grw-page-editor-mode-manager {
+      .btn.btn-outline-primary {
+        @include page-editor-mode-manager.btn-page-editor-mode-manager(lighten($primary, 30%), lighten($primary, 20%), $primary, darken($primary, 20%));
+      }
     }
   }
 }

packages/app/src/components/Theme/ThemeFireRed.module.scss

@@ -2,204 +2,208 @@
 @use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
-.theme[data-color-scheme='light'] :global {
-  // Theme colors
-  $themecolor: #ea5532;
-  $themelight: #ffffff;
-  $accentcolor: #bfbfbf;
-  $subthemecolor: #e6e6e6;
-
-  $primary: $themecolor;
-
-  // Background colors
-  $bgcolor-global: $themelight;
-  $bgcolor-inline-code: $gray-100; //optional
-  $bgcolor-card: $accentcolor;
-  $bgcolor-blinked-section: rgba($primary, 0.1);
-  //$bgcolor-keyword-highlighted: $grw-marker-yellow;
-
-  // Font colors
-  $color-global: #2c2c2c;
-  $color-reversal: $gray-100;
-  $color-link: $primary;
-  $color-link-hover: lighten($color-link, 12%);
-  $color-link-wiki: $primary;
-  $color-link-wiki-hover: lighten($color-link-wiki, 12%);
-  $color-link-nabvar: $color-reversal;
-  $color-inline-code: #c7254e; // optional
-  $color-search: $color-global;
-
-  // List Group colors
-  // $color-list: $color-global;
-  $bgcolor-list: transparent;
-  $color-list-hover: $color-search;
-  $bgcolor-list-hover: darken($bgcolor-global, 3%);
-  // $color-list-active: $color-reversal;
-  // $bgcolor-list-active: $primary;
-
-  // Navbar
-  $bgcolor-navbar: $color-global;
-  $bgcolor-search-top-dropdown: $themecolor;
-  $border-image-navbar: linear-gradient(to right, $primary 0%, darken($primary, 5%) 100%);
-
-  // Logo colors
-  $bgcolor-logo: $themelight;
-  $fillcolor-logo-mark: $themelight;
-
-  // Sidebar
-  $bgcolor-sidebar: $accentcolor;
-  // $bgcolor-sidebar-nav-item-active: rgba(#, 0.37); // optional
-  $text-shadow-sidebar-nav-item-active: 0px 0px 10px #ffffff; // optional
-  // Sidebar resize button
-  $color-resize-button: #ffffff;
-  $bgcolor-resize-button: $primary;
-  $color-resize-button-hover: $color-reversal;
-  $bgcolor-resize-button-hover: lighten($bgcolor-resize-button, 5%);
-  // Sidebar contents
-  $color-sidebar-context: $color-global;
-  $bgcolor-sidebar-context: #ececec;
-  // Sidebar list group
-  // $bgcolor-sidebar-list-group: #; // optional
-
-  // Icon colors
-  $color-editor-icons: $color-global;
-
-  // Border colors
-  $border-color-theme: $primary;
-  $bordercolor-inline-code: #ccc8c8; // optional
-
-  // admin theme box
-  $color-theme-color-box: $primary;
-
-  @import '../../styles/theme/apply-colors';
-  @import '../../styles/theme/apply-colors-light';
-
-  // Navs {
-  .nav-tabs {
-    border-bottom: $border-color-theme 1px solid;
-    .nav-link {
-      &:hover {
-        border-color: lighten($border-color-theme, 10%);
-        border-bottom: none;
-      }
-      &.active {
-        background-color: transparent;
+.theme {
+  [data-color-scheme='light'] :global {
+    // Theme colors
+    $themecolor: #ea5532;
+    $themelight: #ffffff;
+    $accentcolor: #bfbfbf;
+    $subthemecolor: #e6e6e6;
+
+    $primary: $themecolor;
+
+    // Background colors
+    $bgcolor-global: $themelight;
+    $bgcolor-inline-code: $gray-100; //optional
+    $bgcolor-card: $accentcolor;
+    $bgcolor-blinked-section: rgba($primary, 0.1);
+    //$bgcolor-keyword-highlighted: $grw-marker-yellow;
+
+    // Font colors
+    $color-global: #2c2c2c;
+    $color-reversal: $gray-100;
+    $color-link: $primary;
+    $color-link-hover: lighten($color-link, 12%);
+    $color-link-wiki: $primary;
+    $color-link-wiki-hover: lighten($color-link-wiki, 12%);
+    $color-link-nabvar: $color-reversal;
+    $color-inline-code: #c7254e; // optional
+    $color-search: $color-global;
+
+    // List Group colors
+    // $color-list: $color-global;
+    $bgcolor-list: transparent;
+    $color-list-hover: $color-search;
+    $bgcolor-list-hover: darken($bgcolor-global, 3%);
+    // $color-list-active: $color-reversal;
+    // $bgcolor-list-active: $primary;
+
+    // Navbar
+    $bgcolor-navbar: $color-global;
+    $bgcolor-search-top-dropdown: $themecolor;
+    $border-image-navbar: linear-gradient(to right, $primary 0%, darken($primary, 5%) 100%);
+
+    // Logo colors
+    $bgcolor-logo: $themelight;
+    $fillcolor-logo-mark: $themelight;
+
+    // Sidebar
+    $bgcolor-sidebar: $accentcolor;
+    // $bgcolor-sidebar-nav-item-active: rgba(#, 0.37); // optional
+    $text-shadow-sidebar-nav-item-active: 0px 0px 10px #ffffff; // optional
+    // Sidebar resize button
+    $color-resize-button: #ffffff;
+    $bgcolor-resize-button: $primary;
+    $color-resize-button-hover: $color-reversal;
+    $bgcolor-resize-button-hover: lighten($bgcolor-resize-button, 5%);
+    // Sidebar contents
+    $color-sidebar-context: $color-global;
+    $bgcolor-sidebar-context: #ececec;
+    // Sidebar list group
+    // $bgcolor-sidebar-list-group: #; // optional
+
+    // Icon colors
+    $color-editor-icons: $color-global;
+
+    // Border colors
+    $border-color-theme: $primary;
+    $bordercolor-inline-code: #ccc8c8; // optional
+
+    // admin theme box
+    $color-theme-color-box: $primary;
+
+    @import '../../styles/theme/apply-colors';
+    @import '../../styles/theme/apply-colors-light';
+
+    // Navs {
+    .nav-tabs {
+      border-bottom: $border-color-theme 1px solid;
+      .nav-link {
+        &:hover {
+          border-color: lighten($border-color-theme, 10%);
+          border-bottom: none;
+        }
+        &.active {
+          background-color: transparent;
+        }
       }
     }
-  }
-  // Button
-  .btn-group.grw-page-editor-mode-manager {
-    .btn.btn-outline-primary {
-      @include page-editor-mode-manager.btn-page-editor-mode-manager(#ffffff, $primary, $primary, lighten($primary, 20%));
+    // Button
+    .btn-group.grw-page-editor-mode-manager {
+      .btn.btn-outline-primary {
+        @include page-editor-mode-manager.btn-page-editor-mode-manager(#ffffff, $primary, $primary, lighten($primary, 20%));
+      }
     }
   }
 }
 
-.theme[data-color-scheme='dark'] :global {
-  // Theme colors
-  $themecolor: #ea5532;
-  $themedark: #333333;
-  $accentcolor: #212121;
-  $subthemecolor: #2e2e2e;
-
-  $primary: #ea5532;
-  $dark: #a7a7a7;
-
-  // Background colors
-  $bgcolor-global: $themedark;
-  $bgcolor-navbar: #2b2b2b;
-  $bgcolor-inline-code: $gray-100; //optional
-  $bgcolor-card: darken($themedark, 5%);
-  $bgcolor-blinked-section: rgba($primary, 0.5);
-  $bgcolor-keyword-highlighted: darken($grw-marker-red, 30%);
-
-  // Font colors
-  $color-global: #ffffff;
-  $color-reversal: $gray-100;
-  $color-link: $primary;
-  $color-link-hover: lighten($color-link, 12%);
-  $color-link-wiki: $primary;
-  $color-link-wiki-hover: lighten($color-link-wiki, 12%);
-  $color-link-nabvar: $color-reversal;
-  $color-inline-code: $subthemecolor;
-  $color-inline-code: #c7254e; // optional
-  $color-search: $dark;
-
-  // 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: #2c2c2c;
-  $bgcolor-search-top-dropdown: $themecolor;
-  $border-image-navbar: linear-gradient(to right, #ea5532 0%, #c9171e 100%);
-
-  // Logo colors
-  $bgcolor-logo: #ffffff;
-  $fillcolor-logo-mark: #ffffff;
-  // $fillcolor-logo-mark: #4e5a60;
-
-  // Sidebar
-  $bgcolor-sidebar: $accentcolor;
-  // $bgcolor-sidebar-nav-item-active: rgba(#, 0.3); // optional
-  $text-shadow-sidebar-nav-item-active: 0px 0px 10px $primary; // optional
-  // Sidebar resize button
-  $color-resize-button: $color-global;
-  $bgcolor-resize-button: $primary;
-  $color-resize-button-hover: $color-global;
-  $bgcolor-resize-button-hover: darken($bgcolor-resize-button, 5%);
-  // Sidebar contents
-  $bgcolor-sidebar-context: #413f3f;
-  $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: $primary;
-  $bordercolor-inline-code: #4d4d4d; // optional
-
-  // Dropdown colors
-  $color-dropdown-link-active: $color-global;
-  $color-dropdown-link-hover: $color-reversal;
-
-  // admin theme box
-  $color-theme-color-box: $primary;
-
-  @import '../../styles/theme/apply-colors';
-  @import '../../styles/theme/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;
+.theme {
+  [data-color-scheme='dark'] :global {
+    // Theme colors
+    $themecolor: #ea5532;
+    $themedark: #333333;
+    $accentcolor: #212121;
+    $subthemecolor: #2e2e2e;
+
+    $primary: #ea5532;
+    $dark: #a7a7a7;
+
+    // Background colors
+    $bgcolor-global: $themedark;
+    $bgcolor-navbar: #2b2b2b;
+    $bgcolor-inline-code: $gray-100; //optional
+    $bgcolor-card: darken($themedark, 5%);
+    $bgcolor-blinked-section: rgba($primary, 0.5);
+    $bgcolor-keyword-highlighted: darken($grw-marker-red, 30%);
+
+    // Font colors
+    $color-global: #ffffff;
+    $color-reversal: $gray-100;
+    $color-link: $primary;
+    $color-link-hover: lighten($color-link, 12%);
+    $color-link-wiki: $primary;
+    $color-link-wiki-hover: lighten($color-link-wiki, 12%);
+    $color-link-nabvar: $color-reversal;
+    $color-inline-code: $subthemecolor;
+    $color-inline-code: #c7254e; // optional
+    $color-search: $dark;
+
+    // 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: #2c2c2c;
+    $bgcolor-search-top-dropdown: $themecolor;
+    $border-image-navbar: linear-gradient(to right, #ea5532 0%, #c9171e 100%);
+
+    // Logo colors
+    $bgcolor-logo: #ffffff;
+    $fillcolor-logo-mark: #ffffff;
+    // $fillcolor-logo-mark: #4e5a60;
+
+    // Sidebar
+    $bgcolor-sidebar: $accentcolor;
+    // $bgcolor-sidebar-nav-item-active: rgba(#, 0.3); // optional
+    $text-shadow-sidebar-nav-item-active: 0px 0px 10px $primary; // optional
+    // Sidebar resize button
+    $color-resize-button: $color-global;
+    $bgcolor-resize-button: $primary;
+    $color-resize-button-hover: $color-global;
+    $bgcolor-resize-button-hover: darken($bgcolor-resize-button, 5%);
+    // Sidebar contents
+    $bgcolor-sidebar-context: #413f3f;
+    $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: $primary;
+    $bordercolor-inline-code: #4d4d4d; // optional
+
+    // Dropdown colors
+    $color-dropdown-link-active: $color-global;
+    $color-dropdown-link-hover: $color-reversal;
+
+    // admin theme box
+    $color-theme-color-box: $primary;
+
+    @import '../../styles/theme/apply-colors';
+    @import '../../styles/theme/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;
-  }
+    // Table
+    .table {
+      color: white;
+    }
 
-  // Button
-  .btn-group.grw-page-editor-mode-manager {
-    .btn.btn-outline-primary {
-      @include page-editor-mode-manager.btn-page-editor-mode-manager(#ffffff, $primary, $primary, darken($primary, 20%));
+    // Button
+    .btn-group.grw-page-editor-mode-manager {
+      .btn.btn-outline-primary {
+        @include page-editor-mode-manager.btn-page-editor-mode-manager(#ffffff, $primary, $primary, darken($primary, 20%));
+      }
     }
   }
 }

packages/app/src/components/Theme/ThemeHufflepuff.module.scss

@@ -33,7 +33,8 @@
 
 //== Light Mode
 //
-.theme {[data-color-scheme='light'] :global {
+.theme {
+  [data-color-scheme='light'] :global {
     // Theme colors
     $themecolor: #eaab20;
     $themelight: #efe2cf;
@@ -170,7 +171,8 @@
   }
 }
 
-.theme {[data-color-scheme='dark'] :global {
+.theme {
+  [data-color-scheme='dark'] :global {
     // Theme colors
     $themecolor: #eaab20;
     $themedark: #3d3f38;

packages/app/src/components/Theme/ThemeJadeGreen.module.scss

@@ -2,204 +2,208 @@
 @use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
-.theme[data-color-scheme='light'] :global {
-  // Theme colors
-  $themecolor: #38b48b;
-  $themelight: #ffffff;
-  $accentcolor: #bfbfbf;
-  $subthemecolor: #e6e6e6;
-
-  $primary: $themecolor;
-
-  // Background colors
-  $bgcolor-global: $themelight;
-  $bgcolor-inline-code: $gray-100; //optional
-  $bgcolor-card: $accentcolor;
-  $bgcolor-blinked-section: rgba($primary, 0.1);
-  //$bgcolor-keyword-highlighted: $grw-marker-yellow;
-
-  // Font colors
-  $color-global: #2c2c2c;
-  $color-reversal: $gray-100;
-  $color-link: $primary;
-  $color-link-hover: lighten($color-link, 12%);
-  $color-link-wiki: $primary;
-  $color-link-wiki-hover: lighten($color-link-wiki, 12%);
-  $color-link-nabvar: $color-reversal;
-  $color-inline-code: #c7254e; // optional
-  $color-search: $color-global;
-
-  // List Group colors
-  // $color-list: $color-global;
-  $bgcolor-list: transparent;
-  $color-list-hover: $color-search;
-  $bgcolor-list-hover: darken($bgcolor-global, 3%);
-  // $color-list-active: $color-reversal;
-  // $bgcolor-list-active: $primary;
-
-  // Navbar
-  $bgcolor-navbar: $color-global;
-  $bgcolor-search-top-dropdown: $themecolor;
-  $border-image-navbar: linear-gradient(to right, $primary 0%, darken($primary, 5%) 100%);
-
-  // Logo colors
-  $bgcolor-logo: $themelight;
-  $fillcolor-logo-mark: $themelight;
-
-  // Sidebar
-  $bgcolor-sidebar: $accentcolor;
-  // $bgcolor-sidebar-nav-item-active: rgba(#, 0.37); // optional
-  $text-shadow-sidebar-nav-item-active: 0px 0px 10px #ffffff; // optional
-  // Sidebar resize button
-  $color-resize-button: #ffffff;
-  $bgcolor-resize-button: $primary;
-  $color-resize-button-hover: $color-reversal;
-  $bgcolor-resize-button-hover: lighten($bgcolor-resize-button, 5%);
-  // Sidebar contents
-  $color-sidebar-context: $color-global;
-  $bgcolor-sidebar-context: #ebebeb;
-  // Sidebar list group
-  // $bgcolor-sidebar-list-group: #; // optional
-
-  // Icon colors
-  $color-editor-icons: $color-global;
-
-  // Border colors
-  $border-color-theme: $primary;
-  $bordercolor-inline-code: #ccc8c8; // optional
-
-  // admin theme box
-  $color-theme-color-box: $primary;
-
-  @import '../../styles/theme/apply-colors';
-  @import '../../styles/theme/apply-colors-light';
-
-  // Navs {
-  .nav-tabs {
-    border-bottom: $border-color-theme 1px solid;
-    .nav-link {
-      &:hover {
-        border-color: lighten($border-color-theme, 10%);
-        border-bottom: none;
-      }
-      &.active {
-        background-color: transparent;
+.theme {
+  [data-color-scheme='light'] :global {
+    // Theme colors
+    $themecolor: #38b48b;
+    $themelight: #ffffff;
+    $accentcolor: #bfbfbf;
+    $subthemecolor: #e6e6e6;
+
+    $primary: $themecolor;
+
+    // Background colors
+    $bgcolor-global: $themelight;
+    $bgcolor-inline-code: $gray-100; //optional
+    $bgcolor-card: $accentcolor;
+    $bgcolor-blinked-section: rgba($primary, 0.1);
+    //$bgcolor-keyword-highlighted: $grw-marker-yellow;
+
+    // Font colors
+    $color-global: #2c2c2c;
+    $color-reversal: $gray-100;
+    $color-link: $primary;
+    $color-link-hover: lighten($color-link, 12%);
+    $color-link-wiki: $primary;
+    $color-link-wiki-hover: lighten($color-link-wiki, 12%);
+    $color-link-nabvar: $color-reversal;
+    $color-inline-code: #c7254e; // optional
+    $color-search: $color-global;
+
+    // List Group colors
+    // $color-list: $color-global;
+    $bgcolor-list: transparent;
+    $color-list-hover: $color-search;
+    $bgcolor-list-hover: darken($bgcolor-global, 3%);
+    // $color-list-active: $color-reversal;
+    // $bgcolor-list-active: $primary;
+
+    // Navbar
+    $bgcolor-navbar: $color-global;
+    $bgcolor-search-top-dropdown: $themecolor;
+    $border-image-navbar: linear-gradient(to right, $primary 0%, darken($primary, 5%) 100%);
+
+    // Logo colors
+    $bgcolor-logo: $themelight;
+    $fillcolor-logo-mark: $themelight;
+
+    // Sidebar
+    $bgcolor-sidebar: $accentcolor;
+    // $bgcolor-sidebar-nav-item-active: rgba(#, 0.37); // optional
+    $text-shadow-sidebar-nav-item-active: 0px 0px 10px #ffffff; // optional
+    // Sidebar resize button
+    $color-resize-button: #ffffff;
+    $bgcolor-resize-button: $primary;
+    $color-resize-button-hover: $color-reversal;
+    $bgcolor-resize-button-hover: lighten($bgcolor-resize-button, 5%);
+    // Sidebar contents
+    $color-sidebar-context: $color-global;
+    $bgcolor-sidebar-context: #ebebeb;
+    // Sidebar list group
+    // $bgcolor-sidebar-list-group: #; // optional
+
+    // Icon colors
+    $color-editor-icons: $color-global;
+
+    // Border colors
+    $border-color-theme: $primary;
+    $bordercolor-inline-code: #ccc8c8; // optional
+
+    // admin theme box
+    $color-theme-color-box: $primary;
+
+    @import '../../styles/theme/apply-colors';
+    @import '../../styles/theme/apply-colors-light';
+
+    // Navs {
+    .nav-tabs {
+      border-bottom: $border-color-theme 1px solid;
+      .nav-link {
+        &:hover {
+          border-color: lighten($border-color-theme, 10%);
+          border-bottom: none;
+        }
+        &.active {
+          background-color: transparent;
+        }
       }
     }
-  }
-  // Button
-  .btn-group.grw-page-editor-mode-manager {
-    .btn.btn-outline-primary {
-      @include page-editor-mode-manager.btn-page-editor-mode-manager(#ffffff, $primary, $primary, lighten($primary, 20%));
+    // Button
+    .btn-group.grw-page-editor-mode-manager {
+      .btn.btn-outline-primary {
+        @include page-editor-mode-manager.btn-page-editor-mode-manager(#ffffff, $primary, $primary, lighten($primary, 20%));
+      }
     }
   }
 }
 
-.theme[data-color-scheme='dark'] :global {
-  // Theme colors
-  $themecolor: #38b48b;
-  $themedark: #333333;
-  $accentcolor: #212121;
-  $subthemecolor: #2e2e2e;
-
-  $primary: #38b48b;
-  $dark: #a7a7a7;
-
-  // Background colors
-  $bgcolor-global: $themedark;
-  $bgcolor-navbar: #2b2b2b;
-  $bgcolor-inline-code: $gray-100; //optional
-  $bgcolor-card: darken($themedark, 5%);
-  $bgcolor-blinked-section: rgba($primary, 0.5);
-  $bgcolor-keyword-highlighted: darken($grw-marker-red, 30%);
-
-  // Font colors
-  $color-global: #ffffff;
-  $color-reversal: $gray-100;
-  $color-link: $primary;
-  $color-link-hover: lighten($color-link, 12%);
-  $color-link-wiki: $primary;
-  $color-link-wiki-hover: lighten($color-link-wiki, 12%);
-  $color-link-nabvar: $color-reversal;
-  $color-inline-code: $subthemecolor;
-  $color-inline-code: #c7254e; // optional
-  $color-search: $dark;
-
-  // 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: #2c2c2c;
-  $bgcolor-search-top-dropdown: $themecolor;
-  $border-image-navbar: linear-gradient(to right, $primary 0%, darken($primary, 5%) 100%);
-
-  // Logo colors
-  $bgcolor-logo: #ffffff;
-  $fillcolor-logo-mark: #ffffff;
-  // $fillcolor-logo-mark: #4e5a60;
-
-  // Sidebar
-  $bgcolor-sidebar: $accentcolor;
-  // $bgcolor-sidebar-nav-item-active: rgba(#, 0.3); // optional
-  $text-shadow-sidebar-nav-item-active: 0px 0px 10px $primary; // optional
-  // Sidebar resize button
-  $color-resize-button: $color-global;
-  $bgcolor-resize-button: $primary;
-  $color-resize-button-hover: $color-global;
-  $bgcolor-resize-button-hover: darken($bgcolor-resize-button, 5%);
-  // Sidebar contents
-  $bgcolor-sidebar-context: #3c403c;
-  $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: $primary;
-  $bordercolor-inline-code: #4d4d4d; // optional
-
-  // Dropdown colors
-  $color-dropdown-link-active: $color-global;
-  $color-dropdown-link-hover: $color-reversal;
-
-  // admin theme box
-  $color-theme-color-box: $primary;
-
-  @import '../../styles/theme/apply-colors';
-  @import '../../styles/theme/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;
+.theme {
+  [data-color-scheme='dark'] :global {
+    // Theme colors
+    $themecolor: #38b48b;
+    $themedark: #333333;
+    $accentcolor: #212121;
+    $subthemecolor: #2e2e2e;
+
+    $primary: #38b48b;
+    $dark: #a7a7a7;
+
+    // Background colors
+    $bgcolor-global: $themedark;
+    $bgcolor-navbar: #2b2b2b;
+    $bgcolor-inline-code: $gray-100; //optional
+    $bgcolor-card: darken($themedark, 5%);
+    $bgcolor-blinked-section: rgba($primary, 0.5);
+    $bgcolor-keyword-highlighted: darken($grw-marker-red, 30%);
+
+    // Font colors
+    $color-global: #ffffff;
+    $color-reversal: $gray-100;
+    $color-link: $primary;
+    $color-link-hover: lighten($color-link, 12%);
+    $color-link-wiki: $primary;
+    $color-link-wiki-hover: lighten($color-link-wiki, 12%);
+    $color-link-nabvar: $color-reversal;
+    $color-inline-code: $subthemecolor;
+    $color-inline-code: #c7254e; // optional
+    $color-search: $dark;
+
+    // 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: #2c2c2c;
+    $bgcolor-search-top-dropdown: $themecolor;
+    $border-image-navbar: linear-gradient(to right, $primary 0%, darken($primary, 5%) 100%);
+
+    // Logo colors
+    $bgcolor-logo: #ffffff;
+    $fillcolor-logo-mark: #ffffff;
+    // $fillcolor-logo-mark: #4e5a60;
+
+    // Sidebar
+    $bgcolor-sidebar: $accentcolor;
+    // $bgcolor-sidebar-nav-item-active: rgba(#, 0.3); // optional
+    $text-shadow-sidebar-nav-item-active: 0px 0px 10px $primary; // optional
+    // Sidebar resize button
+    $color-resize-button: $color-global;
+    $bgcolor-resize-button: $primary;
+    $color-resize-button-hover: $color-global;
+    $bgcolor-resize-button-hover: darken($bgcolor-resize-button, 5%);
+    // Sidebar contents
+    $bgcolor-sidebar-context: #3c403c;
+    $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: $primary;
+    $bordercolor-inline-code: #4d4d4d; // optional
+
+    // Dropdown colors
+    $color-dropdown-link-active: $color-global;
+    $color-dropdown-link-hover: $color-reversal;
+
+    // admin theme box
+    $color-theme-color-box: $primary;
+
+    @import '../../styles/theme/apply-colors';
+    @import '../../styles/theme/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;
-  }
+    // Table
+    .table {
+      color: white;
+    }
 
-  // Button
-  .btn-group.grw-page-editor-mode-manager {
-    .btn.btn-outline-primary {
-      @include page-editor-mode-manager.btn-page-editor-mode-manager(#ffffff, $primary, $primary, darken($primary, 20%));
+    // Button
+    .btn-group.grw-page-editor-mode-manager {
+      .btn.btn-outline-primary {
+        @include page-editor-mode-manager.btn-page-editor-mode-manager(#ffffff, $primary, $primary, darken($primary, 20%));
+      }
     }
   }
 }

packages/app/src/components/Theme/ThemeMonoBlue.module.scss

@@ -2,200 +2,204 @@
 @use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
-.theme[data-color-scheme='light'] :global {
-  // Theme colors
-  $themecolor: #00587a;
-  $themelight: #f7fbfd;
-  $accentcolor: #16617d;
-  $subthemecolor: #186718;
-
-  $primary: $themecolor;
-
-  // Background colors
-  $bgcolor-global: $themelight;
-  $bgcolor-inline-code: $gray-100; //optional
-  $bgcolor-card: darken($themelight, 5%);
-  $bgcolor-blinked-section: rgba($primary, 0.1);
-  //$bgcolor-keyword-highlighted: $grw-marker-yellow;
-
-  // Font colors
-  $color-global: $themecolor;
-  $color-reversal: $gray-100;
-  $color-link: lighten($primary, 5%);
-  $color-link-hover: lighten($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: #c7254e; // optional
-  $color-search: #c0d6df;
-
-  // List Group colors
-  // $color-list: $color-global;
-  $bgcolor-list: transparent;
-  $color-list-hover: $color-search;
-  $bgcolor-list-hover: lighten($primary, 70%);
-  // $color-list-active: $color-reversal;
-  // $bgcolor-list-active: $primary;
-
-  // Navbar
-  $bgcolor-navbar: #2a2929;
-  $bgcolor-search-top-dropdown: $themecolor;
-  $border-image-navbar: linear-gradient(to right, #54bafd 0%, #3d98a3 50%, #708b0b 100%);
-
-  // Logo colors
-  $bgcolor-logo: $themecolor;
-  $fillcolor-logo-mark: lighten(desaturate($bgcolor-navbar, 10%), 15%);
-
-  // Sidebar
-  $bgcolor-sidebar: $themecolor;
-  // $bgcolor-sidebar-nav-item-active: rgba(#, 0.37); // optional
-  $text-shadow-sidebar-nav-item-active: 0px 0px 10px #0099ff; // optional
-  // Sidebar resize button
-  $color-resize-button: $color-reversal;
-  $bgcolor-resize-button: #209fd8;
-  $color-resize-button-hover: $color-reversal;
-  $bgcolor-resize-button-hover: lighten($bgcolor-resize-button, 5%);
-  // Sidebar contents
-  $color-sidebar-context: $color-global;
-  $bgcolor-sidebar-context: #f1fcff;
-  // Sidebar list group
-  // $bgcolor-sidebar-list-group: #; // optional
-
-  // Icon colors
-  $color-editor-icons: $color-global;
-
-  // Border colors
-  $border-color-theme: $gray-300;
-  $bordercolor-inline-code: #ccc8c8; // optional
-
-  // admin theme box
-  $color-theme-color-box: lighten($primary, 20%);
-
-  @import '../../styles/theme/apply-colors';
-  @import '../../styles/theme/apply-colors-light';
-
-  // Navs {
-  .nav-tabs {
-    border-bottom: $border-color-theme 1px solid;
-    .nav-link {
-      &:hover {
-        border-color: lighten($border-color-theme, 10%);
-        border-bottom: none;
-      }
-      &.active {
-        background-color: transparent;
+.theme {
+  [data-color-scheme='light'] :global {
+    // Theme colors
+    $themecolor: #00587a;
+    $themelight: #f7fbfd;
+    $accentcolor: #16617d;
+    $subthemecolor: #186718;
+
+    $primary: $themecolor;
+
+    // Background colors
+    $bgcolor-global: $themelight;
+    $bgcolor-inline-code: $gray-100; //optional
+    $bgcolor-card: darken($themelight, 5%);
+    $bgcolor-blinked-section: rgba($primary, 0.1);
+    //$bgcolor-keyword-highlighted: $grw-marker-yellow;
+
+    // Font colors
+    $color-global: $themecolor;
+    $color-reversal: $gray-100;
+    $color-link: lighten($primary, 5%);
+    $color-link-hover: lighten($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: #c7254e; // optional
+    $color-search: #c0d6df;
+
+    // List Group colors
+    // $color-list: $color-global;
+    $bgcolor-list: transparent;
+    $color-list-hover: $color-search;
+    $bgcolor-list-hover: lighten($primary, 70%);
+    // $color-list-active: $color-reversal;
+    // $bgcolor-list-active: $primary;
+
+    // Navbar
+    $bgcolor-navbar: #2a2929;
+    $bgcolor-search-top-dropdown: $themecolor;
+    $border-image-navbar: linear-gradient(to right, #54bafd 0%, #3d98a3 50%, #708b0b 100%);
+
+    // Logo colors
+    $bgcolor-logo: $themecolor;
+    $fillcolor-logo-mark: lighten(desaturate($bgcolor-navbar, 10%), 15%);
+
+    // Sidebar
+    $bgcolor-sidebar: $themecolor;
+    // $bgcolor-sidebar-nav-item-active: rgba(#, 0.37); // optional
+    $text-shadow-sidebar-nav-item-active: 0px 0px 10px #0099ff; // optional
+    // Sidebar resize button
+    $color-resize-button: $color-reversal;
+    $bgcolor-resize-button: #209fd8;
+    $color-resize-button-hover: $color-reversal;
+    $bgcolor-resize-button-hover: lighten($bgcolor-resize-button, 5%);
+    // Sidebar contents
+    $color-sidebar-context: $color-global;
+    $bgcolor-sidebar-context: #f1fcff;
+    // Sidebar list group
+    // $bgcolor-sidebar-list-group: #; // optional
+
+    // Icon colors
+    $color-editor-icons: $color-global;
+
+    // Border colors
+    $border-color-theme: $gray-300;
+    $bordercolor-inline-code: #ccc8c8; // optional
+
+    // admin theme box
+    $color-theme-color-box: lighten($primary, 20%);
+
+    @import '../../styles/theme/apply-colors';
+    @import '../../styles/theme/apply-colors-light';
+
+    // Navs {
+    .nav-tabs {
+      border-bottom: $border-color-theme 1px solid;
+      .nav-link {
+        &:hover {
+          border-color: lighten($border-color-theme, 10%);
+          border-bottom: none;
+        }
+        &.active {
+          background-color: transparent;
+        }
       }
     }
-  }
-  // Button
-  .btn-group.grw-page-editor-mode-manager {
-    .btn.btn-outline-primary {
-      @include page-editor-mode-manager.btn-page-editor-mode-manager($primary, lighten($primary, 65%), lighten($primary, 70%));
+    // Button
+    .btn-group.grw-page-editor-mode-manager {
+      .btn.btn-outline-primary {
+        @include page-editor-mode-manager.btn-page-editor-mode-manager($primary, lighten($primary, 65%), lighten($primary, 70%));
+      }
     }
   }
 }
 
-.theme[data-color-scheme='dark'] :global {
-  // Theme colors
-  $themecolor: #00587a;
-  $themedark: #061f2f;
-  $accentcolor: #16617d;
-  $subthemecolor: #c1f1f0;
-
-  $primary: #0090c8;
-  $dark: #031018;
-
-  // Background colors
-  $bgcolor-global: $themedark;
-  $bgcolor-navbar: #27343b;
-  $bgcolor-inline-code: #1f1f22; //optional
-  $bgcolor-card: darken($themedark, 5%);
-  $bgcolor-blinked-section: rgba($primary, 0.5);
-  $bgcolor-keyword-highlighted: darken($grw-marker-red, 30%);
-
-  // Font colors
-  $color-global: #d3d4d4;
-  $color-reversal: $gray-100;
-  $color-link: #97d1f0;
-  $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: $subthemecolor;
-  $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: #2a2929;
-  $bgcolor-search-top-dropdown: $themecolor;
-  $border-image-navbar: linear-gradient(to right, #54bafd 0%, #3d98a3 50%, #708b0b 100%);
-
-  // Logo colors
-  $bgcolor-logo: #13191c;
-  $fillcolor-logo-mark: lighten(desaturate($bgcolor-navbar, 10%), 15%);
-  // $fillcolor-logo-mark: #4e5a60;
-
-  // Sidebar
-  $bgcolor-sidebar: $accentcolor;
-  // $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: $themecolor;
-  $color-resize-button-hover: $color-global;
-  $bgcolor-resize-button-hover: darken($bgcolor-resize-button, 5%);
-  // Sidebar contents
-  $bgcolor-sidebar-context: darken($bgcolor-sidebar, 13%);
-  $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
-
-  // admin theme box
-  $color-theme-color-box: $primary;
-
-  @import '../../styles/theme/apply-colors';
-  @import '../../styles/theme/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;
+.theme {
+  [data-color-scheme='dark'] :global {
+    // Theme colors
+    $themecolor: #00587a;
+    $themedark: #061f2f;
+    $accentcolor: #16617d;
+    $subthemecolor: #c1f1f0;
+
+    $primary: #0090c8;
+    $dark: #031018;
+
+    // Background colors
+    $bgcolor-global: $themedark;
+    $bgcolor-navbar: #27343b;
+    $bgcolor-inline-code: #1f1f22; //optional
+    $bgcolor-card: darken($themedark, 5%);
+    $bgcolor-blinked-section: rgba($primary, 0.5);
+    $bgcolor-keyword-highlighted: darken($grw-marker-red, 30%);
+
+    // Font colors
+    $color-global: #d3d4d4;
+    $color-reversal: $gray-100;
+    $color-link: #97d1f0;
+    $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: $subthemecolor;
+    $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: #2a2929;
+    $bgcolor-search-top-dropdown: $themecolor;
+    $border-image-navbar: linear-gradient(to right, #54bafd 0%, #3d98a3 50%, #708b0b 100%);
+
+    // Logo colors
+    $bgcolor-logo: #13191c;
+    $fillcolor-logo-mark: lighten(desaturate($bgcolor-navbar, 10%), 15%);
+    // $fillcolor-logo-mark: #4e5a60;
+
+    // Sidebar
+    $bgcolor-sidebar: $accentcolor;
+    // $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: $themecolor;
+    $color-resize-button-hover: $color-global;
+    $bgcolor-resize-button-hover: darken($bgcolor-resize-button, 5%);
+    // Sidebar contents
+    $bgcolor-sidebar-context: darken($bgcolor-sidebar, 13%);
+    $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
+
+    // admin theme box
+    $color-theme-color-box: $primary;
+
+    @import '../../styles/theme/apply-colors';
+    @import '../../styles/theme/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;
-  }
+    // Table
+    .table {
+      color: white;
+    }
 
-  // Button
-  .btn-group.grw-page-editor-mode-manager {
-    .btn.btn-outline-primary {
-      @include page-editor-mode-manager.btn-page-editor-mode-manager(lighten($primary, 30%), $primary, darken($primary, 10%), darken($primary, 20%));
+    // Button
+    .btn-group.grw-page-editor-mode-manager {
+      .btn.btn-outline-primary {
+        @include page-editor-mode-manager.btn-page-editor-mode-manager(lighten($primary, 30%), $primary, darken($primary, 10%), darken($primary, 20%));
+      }
     }
   }
 }