mayu morita 7 лет назад
Родитель
Сommit
4f9a902d1a

+ 0 - 0
public/images/admin/customize/halloween-navbar.png → public/images/background/halloween-navbar.png


+ 0 - 0
public/images/admin/customize/halloween.png → public/images/background/halloween.png


+ 0 - 0
public/images/admin/customize/island.png → public/images/background/island.png


+ 0 - 0
public/images/admin/customize/wood-navbar.png → public/images/background/wood-navbar.png


+ 0 - 0
public/images/admin/customize/wood.png → public/images/background/wood.png


+ 8 - 12
src/client/styles/agile-admin/inverse/colors/halloween.scss

@@ -1,13 +1,13 @@
 @import '../variables';
 
-$basecolor:#030003;
+$basecolor:#0a010a;
 $themecolor: #aa4a04;
 $subthemecolor: #e9af2b;
 $linkcolor: #aa4a04;
 $topbar: $themecolor;
 $sidebar:#061f2f;
 $subthemecolor: #e9af2b;
-$bodycolor: #030000;
+$bodycolor: #0f0101;
 $headingtext: #e9af2b;
 $bodytext: #e9af2b;
 $linktext: $linkcolor;
@@ -59,26 +59,22 @@ $inline-code-bg: #0a121b;
   color: $white;
 }
 
-.navbar-header {
-  background-image: url("/images/admin/customize/halloween-navbar.png") !important;
+#wrapper > .navbar > .navbar-header {
+  background-image: url("/images/background/halloween-navbar.png");
 }
 
-#page-wrapper {
-  background-image: url("/images/admin/customize/halloween.png") !important;
+.main-container > #wrapper > #page-wrapper {
+  background-image: url("/images/background/halloween.png");
 }
 
 .bg-title {
-  background: transparent !important;
+  background-color: rgba(0, 0, 0, 0.3);
 }
 
 /* Tabs */
 .nav.nav-tabs {
   >li.active>a {
-    background: transparent !important;
+    background: transparent;
     border-bottom: 1px solid #1f1b1b;
   }
 }
-
-.page-editor-preview-body {
-  background: transparent !important;
-}

+ 4 - 15
src/client/styles/agile-admin/inverse/colors/island.scss

@@ -21,7 +21,7 @@ $wikilinktext-hover: rgba($linktext, 0.8);
 $dark: darken($bodytext, 5%);
 $border: #76b1a8;
 $navbar-border: #76b1a8;
-$active-navbar-border: darken($navbar-border, 3%);
+$active-navbar-border: darken($navbar-border, 13%);
 $btn-default-bgcolor: darken($themecolor, 10%);
 $inline-code-color: #8f5313;
 $inline-code-bg: darken($themelight, 3%);
@@ -59,12 +59,6 @@ $inline-code-bg: darken($themelight, 3%);
   }
 }
 
-/* Nav-pills */
-.nav-pills a:hover {
-  background: $themecolor;
-  color: #72a1a4 !important;
-}
-
 /* GROWI page list */
 .page-list {
   .page-list-ul {
@@ -80,22 +74,17 @@ $inline-code-bg: darken($themelight, 3%);
   background: lighten($themelight, 5%);
 }
 
-#page-wrapper {
-  background-image: url("/images/admin/customize/island.png") !important;
+.main-container > #wrapper > #page-wrapper {
+  background-image: url("/images/background/island.png");
 }
 
 /* Tabs */
 .nav.nav-tabs {
   >li.active>a {
-    background: transparent !important;
+    background: transparent;
     border-bottom: 1px solid #d0ece7;
   }
 }
-
-.page-editor-preview-container {
-  background: transparent !important;
-}
-
 /* Table */
  .table > thead > tr > th, .table > tbody > tr > th, .table > tfoot > tr > th,
  .table > thead > tr > td, .table > tbody > tr > td, .table > tfoot > tr > td ,

+ 8 - 10
src/client/styles/agile-admin/inverse/colors/wood.scss

@@ -1,4 +1,5 @@
 @import '../variables';
+
 $themecolor: #aaa45f;
 $themelight: #f5f3ee;
 $subthemecolor: #dddebf;
@@ -17,6 +18,7 @@ $wikilinktext: lighten($themecolor, 5%);
 $wikilinktext-hover: lighten($wikilinktext, 15%);
 $inline-code-color: darken($themecolor, 20%);
 $inline-code-bg: lighten($subthemecolor, 70%);
+
 @import 'apply-colors';
 @import 'apply-colors-light';
 
@@ -37,26 +39,22 @@ $inline-code-bg: lighten($subthemecolor, 70%);
   background: $themelight;
 }
 
-#page-wrapper {
-  background-image: url("/images/admin/customize/wood.png") !important;
+.main-container > #wrapper > #page-wrapper {
+  background-image: url("/images/background/wood.png");
 }
 
 .bg-title {
-  background: transparent !important;
+  background-color: rgba(226, 221, 192, 0.205);
 }
 
 /* Tabs */
 .nav.nav-tabs {
   >li.active>a {
-    background: transparent !important;
+    background: transparent;
     border-bottom: 1px solid $bodycolor;
   }
 }
 
-.navbar-header {
-  background-image: url("/images/admin/customize/wood-navbar.png") !important;
-}
-
-.page-editor-preview-container {
-  background: transparent !important;
+#wrapper > .navbar > .navbar-header {
+  background-image: url("/images/background/wood-navbar.png");
 }