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

Merge pull request #2267 from weseek/imprv/gw-2551-island-theme

Imprv/gw 2551 island theme
Kaori Tokashiki 5 лет назад
Родитель
Сommit
1b670e50a4
1 измененных файлов с 31 добавлено и 83 удалено
  1. 31 83
      src/client/styles/scss/theme/island.scss

+ 31 - 83
src/client/styles/scss/theme/island.scss

@@ -1,53 +1,62 @@
 @import '../variables';
 @import '../variables';
 @import '../override-bootstrap-variables';
 @import '../override-bootstrap-variables';
 
 
-$color-themelight: rgba(183, 226, 219, 1);
 $color-primary: #97cbc3;
 $color-primary: #97cbc3;
-$color-navbar: #0c2a44;
-$color-global: #3c6d72;
-$color-link-global: $color-global;
-$color-inline-code: #8f5313;
-$color-active-bgnav-tabs: #dbf0ed;
-$color-link-wiki: $color-global;
-$color-link-wiki-hover: rgba($color-global, 0.8);
-$bgcolor-inline-code: darken($color-themelight, 3%);
-
-$dark: darken($color-global, 5%);
+$color-themelight: rgba(183, 226, 219, 1);
 
 
 html[light],
 html[light],
 html[dark] {
 html[dark] {
+  $primary: $color-primary;
   // Background colors
   // Background colors
   $bgcolor-card: #f5f5f5;
   $bgcolor-card: #f5f5f5;
   $bgcolor-global: lighten($color-themelight, 10%);
   $bgcolor-global: lighten($color-themelight, 10%);
   $bgcolor-inline-code: #f0f0f0; //optional
   $bgcolor-inline-code: #f0f0f0; //optional
 
 
   // Font colors
   // Font colors
+  $color-global: #112744;
   $color-reversal: #eeeeee;
   $color-reversal: #eeeeee;
-  $color-link: lighten($color-global, 20%);
+  // $color-header: #2b2b2b;
+  $color-link: #3c6d72;
   $color-link-hover: lighten($color-link, 20%);
   $color-link-hover: lighten($color-link, 20%);
+  $color-link-wiki: $color-link;
+  $color-link-wiki-hover: lighten($color-link-wiki, 20%);
   $color-link-nabvar: $color-reversal;
   $color-link-nabvar: $color-reversal;
   $color-inline-code: #c7254e; // optional
   $color-inline-code: #c7254e; // optional
 
 
   // List Group colors
   // List Group colors
   $color-list: $color-global;
   $color-list: $color-global;
   $bgcolor-list: lighten($color-themelight, 10%);
   $bgcolor-list: lighten($color-themelight, 10%);
-  $color-list-active: $color-reversal;
-  $bgcolor-list-active: $color-primary;
+  $color-list-active: $color-global;
+  $bgcolor-list-active: $primary;
   $color-list-hover: $color-reversal;
   $color-list-hover: $color-reversal;
 
 
   // Navbar
   // Navbar
-  $bgcolor-navbar: #0c2a44;
-  $border-color-navbar-gradient-left: #545fff;
-  $border-color-navbar-gradient-right: #00a6e5;
+  $bgcolor-navbar: #302e2e;
+  $bgcolor-search-top-dropdown: $color-primary;
+  $border-image-navbar: linear-gradient(to right, #5ce4ef 0%, #5953eb 100%);
 
 
   // Logo colors
   // Logo colors
-  $bgcolor-logo: $color-navbar;
+  $bgcolor-logo: #0d3955;
   $fillcolor-logo-mark: lighten(desaturate($bgcolor-inline-code, 10%), 15%);
   $fillcolor-logo-mark: lighten(desaturate($bgcolor-inline-code, 10%), 15%);
 
 
   // Sidebar
   // Sidebar
-  $bgcolor-sidebar: $color-navbar;
-  $color-sidebar-context: $color-reversal;
-  $bgcolor-sidebar-context: lighten($color-navbar, 10%);
+  $bgcolor-sidebar: #0d3955;
+  $bgcolor-sidebar-nav-item-active: rgba(#000000, 0.37);
+  // $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: $primary;
+  $color-resize-button-hover: white;
+  $bgcolor-resize-button-hover: darken($bgcolor-resize-button, 5%);
+  // Sidebar contents
+  $bgcolor-sidebar-context: #e2f3f1;
+  $color-sidebar-context: $color-link;
+  // Sidebar list group
+  $bgcolor-sidebar-list-group: #eff8f7; // optional
+
+  // Tabs
+  $bordercolor-nav-tabs: #ccc; // optional
 
 
   // Icon colors
   // Icon colors
   $color-editor-icons: $color-global;
   $color-editor-icons: $color-global;
@@ -75,55 +84,7 @@ html[dark] {
 
 
   .wiki {
   .wiki {
     .highlighted {
     .highlighted {
-      background-color: lighten($color-primary, 20%);
-    }
-  }
-
-  .nav-tabs,
-  .nav-tabs .nav-link.active,
-  .nav-link {
-    background: none;
-    border-color: $color-primary;
-    border-bottom-color: $color-primary;
-  }
-
-  .card,
-  .card-header {
-    background: none;
-    border: none;
-  }
-
-  .panel {
-    &,
-    &.panel-white,
-    &.panel-default {
-      color: $color-primary;
-      background-color: lighten($color-primary, 30%);
-      border-color: white;
-
-      .panel-heading {
-        color: $color-primary;
-        background-color: white;
-      }
-
-      ul {
-        li {
-          a {
-            color: darken($color-primary, 15%);
-          }
-        }
-      }
-    }
-  }
-
-  /* GROWI page list */
-  .page-list {
-    .page-list-ul {
-      > li {
-        > a strong {
-          color: $color-link-global;
-        }
-      }
+      background-color: lighten($primary, 20%);
     }
     }
   }
   }
 
 
@@ -137,19 +98,6 @@ html[dark] {
     background-attachment: fixed;
     background-attachment: fixed;
   }
   }
 
 
-  /*
-   * Tabs
-   */
-  body:not(.on-edit) .nav.nav-tabs {
-    > li.active > a {
-      background: linear-gradient(
-        rgba($color-active-bgnav-tabs, 0) 0%,
-        rgba($color-active-bgnav-tabs, 0) 90%,
-        $color-active-bgnav-tabs 100%
-      ); // overwrite only the bottom pixel
-    }
-  }
-
   /* Table */
   /* Table */
   .table > thead > tr > th,
   .table > thead > tr > th,
   .table > tbody > tr > th,
   .table > tbody > tr > th,