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

BIN
public/images/admin/customize/halloween-navbar.png


BIN
public/images/admin/customize/halloween.png


BIN
public/images/admin/customize/island.png


+ 7 - 1
src/client/styles/agile-admin/inverse/colors/halloween.scss

@@ -1,4 +1,5 @@
 @import '../variables';
+
 $basecolor:#030003;
 $themecolor: #aa4a04;
 $subthemecolor: #e9af2b;
@@ -22,8 +23,9 @@ $border: $themecolor;
 $navbar-border: lighten($basecolor, 25%);
 $active-navbar-border: darken($navbar-border, 3%);
 $btn-default-bgcolor: darken($basecolor, 10%);
-$inline-code-color: a94f04;
+$inline-code-color: #a94f04;
 $inline-code-bg: #0a121b;
+
 @import 'apply-colors';
 @import 'apply-colors-dark';
 
@@ -57,6 +59,10 @@ $inline-code-bg: #0a121b;
   color: $white;
 }
 
+.navbar-header {
+  background-image: url("/images/admin/customize/halloween-navbar.png") !important;
+}
+
 #page-wrapper {
   background-image: url("/images/admin/customize/halloween.png") !important;
 }

+ 30 - 8
src/client/styles/agile-admin/inverse/colors/island.scss

@@ -1,12 +1,14 @@
 @import '../variables';
+
 $themecolor: #0c2a44;
 $themelight: rgba(183, 226, 219, 1);
+
 $subthemecolor: rgba($linktext, 0.8);
 $linkcolor: #3c6d72;
 $themecolor: #97cbc3;
 $topbar: #0c2a44;
 $sidebar: $themelight;
-$bodycolor: $themelight;
+$bodycolor: lighten($themelight, 5%);
 $headingtext:#3c6d72;
 $bodytext: #3c6d72;
 $linktext: $linkcolor;
@@ -17,12 +19,13 @@ $logo-mark-fill: lighten($themelight, 10%);
 $wikilinktext: $linkcolor;
 $wikilinktext-hover: rgba($linktext, 0.8);
 $dark: darken($bodytext, 5%);
-$border: #ffffff;
-$navbar-border: lighten($themecolor, 25%);
+$border: #76b1a8;
+$navbar-border: #76b1a8;
 $active-navbar-border: darken($navbar-border, 3%);
 $btn-default-bgcolor: darken($themecolor, 10%);
 $inline-code-color: #8f5313;
 $inline-code-bg: darken($themelight, 3%);
+
 @import 'apply-colors';
 @import 'apply-colors-light';
 
@@ -32,10 +35,6 @@ $inline-code-bg: darken($themelight, 3%);
   }
 }
 
-.wiki h1 {
-  border-color: white !important;
-}
-
 .panel {
 
   &,
@@ -47,7 +46,7 @@ $inline-code-bg: darken($themelight, 3%);
 
     .panel-heading {
       color: $themecolor;
-      background-color: lighten($themecolor, 20%);
+      background-color: white;
     }
 
     ul {
@@ -96,3 +95,26 @@ $inline-code-bg: darken($themelight, 3%);
 .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 ,
+ .table > thead > tr > th, .table-bordered{
+     border-top: 1px solid $border;
+ }
+
+ .table-bordered > thead > tr > th,
+ .table-bordered > tbody > tr > th,
+ .table-bordered > tfoot > tr > th,
+ .table-bordered > thead > tr > td,
+ .table-bordered > tbody > tr > td,
+ .table-bordered > tfoot > tr > td {
+   border: 1px solid $border;
+ }
+ .table > thead > tr > th {
+     border-bottom: 1px solid $border;
+ }
+
+ .table-bordered {
+     border: 1px solid $border;
+ }