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

Merge pull request #1568 from weseek/adjust-background-color-with-css

Adjust background color with css
Yuki Takei 6 лет назад
Родитель
Сommit
d679c17ad5

+ 1 - 1
src/client/js/components/Admin/Customize/CustomizeThemeOptions.jsx

@@ -28,7 +28,7 @@ class CustomizeThemeOptions extends React.Component {
     }, {
     }, {
       name: 'antarctic', bg: '#ffffff', topbar: '#000080', theme: '#99cccc',
       name: 'antarctic', bg: '#ffffff', topbar: '#000080', theme: '#99cccc',
     }, {
     }, {
-      name: 'spring', bg: '#FBEFFB', topbar: '#ff69b4', theme: '#ffb6c1',
+      name: 'spring', bg: '#fff5ee', topbar: '#ff69b4', theme: '#ffb6c1',
     }];
     }];
 
 
     const darkTheme = [{
     const darkTheme = [{

+ 38 - 7
src/client/styles/agile-admin/inverse/colors/spring.scss

@@ -17,7 +17,8 @@ $accentcolor: #e08dbc;
 $accentlight: rgba(224, 141, 188, 0.2);
 $accentlight: rgba(224, 141, 188, 0.2);
 $accentdark: rgba(224, 141, 188, 0.5);
 $accentdark: rgba(224, 141, 188, 0.5);
 $background-color: rgba(171, 224, 174, 0.4);
 $background-color: rgba(171, 224, 174, 0.4);
-
+$third-main-color: antiquewhite;
+$textcolor: dimgray;
 $primary: $themecolor;
 $primary: $themecolor;
 
 
 $logo-mark-fill: lighten(desaturate($topbar, 10%), 15%);
 $logo-mark-fill: lighten(desaturate($topbar, 10%), 15%);
@@ -42,7 +43,15 @@ $wikilinktext-hover: lighten($wikilinktext, 20%);
 }
 }
 
 
 /*
 /*
- * Accentcolor (yellow)
+ * user's page
+ */
+
+.growi .main .page-comments-row {
+  border-top-color: $third-main-color;
+}
+
+/*
+ * Accentcolor (green)
  */
  */
 
 
 header.affix {
 header.affix {
@@ -126,6 +135,17 @@ div .btn-default {
   border-color: $accentdark;
   border-color: $accentdark;
 }
 }
 
 
+/*
+ * GROWI admin page #themeOptions
+ */
+.admin-page {
+  #themeOptions {
+    .theme-option-container.active a {
+      border-color: $accentcolor;
+    }
+  }
+}
+
 button .btn-outline {
 button .btn-outline {
   background-color: $themelight;
   background-color: $themelight;
 }
 }
@@ -160,10 +180,21 @@ input .btn-secondary {
 
 
 .help-block {
 .help-block {
   padding: 5px;
   padding: 5px;
-  background-color: $background-color;
-}
+  color: $textcolor;
+  background-color: $accentlight;
+  .panel-primary a {
+    color: $subthemecolor;
+  }
 
 
-.admin-page #themeOptions .theme-option-container.active a {
-  background-color: $themelight;
-  border-color: $headingtext;
+  /*
+ *  panel
+ */
+
+  .panel-timeline > .panel-heading {
+    background-color: $third-main-color;
+  }
+
+  .panel-default > .panel-heading {
+    background-color: $third-main-color;
+  }
 }
 }