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

changed update-buttons' shape and added box-shadow
changed spring theme button's design
added background-color

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

+ 1 - 1
src/client/js/components/Admin/Common/AdminUpdateButtonRow.jsx

@@ -10,7 +10,7 @@ class AdminUpdateButtonRow extends React.PureComponent {
     return (
       <div className="row my-3">
         <div className="col-xs-offset-4 col-xs-5">
-          <button type="button" className="btn btn-primary" onClick={this.props.onClick} disabled={this.props.disabled}>{ t('Update') }</button>
+           <button type="button" className="radius-btn btn btn-primary"onClick={this.props.onClick} disabled={this.props.disabled}>{ t('Update') }</button>
         </div>
       </div>
     );

+ 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: 'spring', bg: '#FBEFFB', topbar: '#CC2EFA', theme: '#F5A9F2',
+      name: 'spring', bg: '#FBEFFB', topbar: '#ff69b4', theme: '#ffb6c1',
     }];
 
     const darkTheme = [{

+ 61 - 3
src/client/styles/agile-admin/inverse/colors/spring.scss

@@ -1,17 +1,21 @@
 @import '../variables';
 
 $themecolor:#ffb6c1;
-$subthemecolor: black;
-$themelight: #f0f8ff;
+$subthemecolor:#ee82ee;
+$themelight: #fff0f5;
 $topbar:$themecolor;
 $sidebar:#fff;
 $bodycolor:#fff;
-$headingtext: #2b2b2b;
+$headingtext: #da70d6;
 $bodytext: #333333;
 $linktext: lighten($themecolor, 20%);
 $linktext-hover: lighten($linktext, 20%);
 $sidebar-text:#38495a;
 $accentcolor:#ee82ee;
+$background-color: rgba(
+  $color: $themelight,
+  $alpha: 0.8,
+);
 
 $primary: $themecolor;
 
@@ -30,10 +34,17 @@ $wikilinktext-hover: lighten($wikilinktext, 20%);
   background-position: bottom;
   background-size: cover;
   
+  
+}
+
+div .row.bg-title.hidden-print {
+  background: #fff0f5;
 }
 
+
 .sidebar {
   background: $themecolor;
+
 }
 
 /*
@@ -91,4 +102,51 @@ body:not(.on-edit) .nav.nav-tabs {
     ); // overwrite only the bottom pixel
     background-color: $themecolor;
   }
+}
+
+/*
+ * button
+ */
+
+div .radius-btn {
+  border-radius: 10%;
+    box-shadow: 2px 2px 4px gray;
+}
+
+/*
+ *  Login page
+ */
+
+ .login-page > #wrapper > #page-wrapper {
+  background-image: url('/images/themes/spring/spring.jpg');
+  background-attachment: fixed;
+  background-position: bottom;
+  background-size: cover;
+
+  .link-switch {
+    color: dimgray;
+
+    &:hover {
+      color: #000080;
+    }
+  }
+}
+
+/*
+ *  letter 
+ */
+
+ .help-block {
+  background-color: $background-color;
+  padding: 5px;
+}
+
+
+.main-container{
+  font-family: Avenir;
+}
+
+.admin-page #themeOptions .theme-option-container.active a {
+  background-color:$themelight;
+  border-color:#da70d6;
 }