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

changed the word of "animals" to "spring"

kaoritokashiki 6 лет назад
Родитель
Сommit
3d55213b79

+ 1 - 1
config/webpack.common.js

@@ -44,7 +44,7 @@ module.exports = (options) => {
       'styles/theme-wood':          './src/client/styles/scss/theme/wood.scss',
       'styles/theme-christmas':          './src/client/styles/scss/theme/christmas.scss',
       'styles/theme-island':      './src/client/styles/scss/theme/island.scss',
-      'styles/theme-animals':      './src/client/styles/scss/theme/animals.scss',
+      'styles/theme-spring':      './src/client/styles/scss/theme/spring.scss',
       'styles/theme-antarctic':      './src/client/styles/scss/theme/antarctic.scss',
       // styles for external services
       'styles/style-hackmd':          './src/client/styles/hackmd/style.scss',

+ 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: 'animals', bg: '#ffffff', topbar: '#334455', theme: '#112744',
+      name: 'spring', bg: '#ffffff', topbar: '#334455', theme: '#112744',
     }];
 
     const darkTheme = [{

+ 11 - 1
src/client/styles/agile-admin/inverse/colors/animals.scss → src/client/styles/agile-admin/inverse/colors/spring.scss

@@ -2,7 +2,7 @@
 
 $themecolor:#112744;
 
-$topbar:#334455;
+$topbar:#F5A9F2;
 $sidebar:#fff;
 $bodycolor:#fff;
 $headingtext: #2b2b2b;
@@ -19,3 +19,13 @@ $wikilinktext-hover: lighten($wikilinktext, 20%);
 
 @import 'apply-colors';
 @import 'apply-colors-light';
+
+// add background-image
+.main-container > #wrapper > #page-wrapper,
+.page-editor-preview-container {
+  background-image: url('/images/themes/spring/spring.jpg');
+  background-attachment: fixed;
+  background-position: bottom;
+  background-size: cover;
+  opacity: 0.4;
+}

+ 1 - 1
src/client/styles/scss/theme/animals.scss → src/client/styles/scss/theme/spring.scss

@@ -1,5 +1,5 @@
 // import colors
-@import '../../agile-admin/inverse/colors/animals';
+@import '../../agile-admin/inverse/colors/spring';
 
 // apply agile-admin theme
 @import '../../agile-admin/inverse/style';

+ 1 - 1
src/server/routes/apiv3/customize-setting.js

@@ -95,7 +95,7 @@ module.exports = (crowi) => {
     layoutTheme: [
       body('layoutType').isString().isIn(['growi', 'kibela', 'crowi']),
       body('themeType').isString().isIn([
-        'default', 'nature', 'mono-blue', 'wood', 'island', 'christmas', 'antarctic', 'default-dark', 'future', 'blue-night', 'halloween', 'animals',
+        'default', 'nature', 'mono-blue', 'wood', 'island', 'christmas', 'antarctic', 'default-dark', 'future', 'blue-night', 'halloween', 'spring',
       ]),
     ],
     behavior: [