Yuki Takei 8 лет назад
Родитель
Сommit
fccc860144

+ 1 - 1
resource/js/components/Page/RevisionPath.js

@@ -57,7 +57,7 @@ export default class RevisionPath extends React.Component {
       return <a href={pagePath+'/'} className={(isLastElement && !this.state.isListPage) ? 'last-path' : ''}>/</a>;
     }
     else if (!isLastElement) {
-      return <span className="text-primary">/</span>;
+      return <span>/</span>;
     }
     else {
       return <span></span>

+ 11 - 8
resource/styles/agile-admin/inverse/colors/default.scss

@@ -7,10 +7,13 @@ $sidebar:#fff;
 $bodycolor:#fff;
 $headingtext: #2b2b2b;
 $bodytext: #686868;
+$linktext: $inverse;
+$linktext-hover: lighten($inverse, 20%);
 $sidebar-text:#54667a;
-$themecolor:#f75b36;
+$themecolor:#393C4A;
 $dark-themecolor:#4F5467;
 
+$primary: $topbar;
 
 body{
   background:$sidebar;
@@ -19,7 +22,7 @@ body{
 /*Top Header Part*/
 
 .logo i{ color:$white;}
-.top-left-part{ 
+.top-left-part{
   .light-logo{
     display:inline-block;
   }
@@ -27,7 +30,7 @@ body{
     display:none;
   }
 }
-.navbar-header{ 
+.navbar-header{
      background:$topbar;
 }
 .navbar-top-links > li > a{
@@ -51,7 +54,7 @@ body{
     color:$themecolor;
 }
 .bg-title{
-  
+
 }
 
 /*Sidebar*/
@@ -61,7 +64,7 @@ body{
     box-shadow:1px 0px 20px rgba(0, 0, 0, 0.08);
   .label-custom{
       background:$megna;
-  }  
+  }
 }
 #side-menu li a{
     color:$sidebar-text;
@@ -78,7 +81,7 @@ body{
    &.active {
             border-left:3px solid $themecolor;
             color:$dark;
-            
+
             font-weight:500;
         i{
           color:$themecolor;
@@ -89,7 +92,7 @@ body{
 #side-menu ul > li > a {
     &:hover{
         color:$themecolor;
-        
+
     }
     &.active{
      color:$dark;
@@ -140,4 +143,4 @@ body{
 .nav-pills>li.active>a, .nav-pills>li.active>a:focus, .nav-pills>li.active>a:hover{
   background:$themecolor;
   color:$white;
-}
+}

+ 5 - 0
resource/styles/agile-admin/inverse/eliteadmin.scss

@@ -71,6 +71,11 @@ b {
   font-weight:$font-bold;
 }
 a {
+  color: $linktext;
+
+  &:hover, &:focus {
+    color: $linktext-hover;
+  }
 
   &:hover {
     outline: 0;

+ 1 - 1
resource/styles/agile-admin/inverse/pages.scss

@@ -758,7 +758,7 @@
         z-index: -1;
         width: 100%;
         height: 100%;
-        background-color: #f0f0f0;
+        background-color: $gray-light;
         content: '';
         -webkit-transition: -webkit-transform 0.3s, background-color 0.3s;
         transition: transform 0.3s, background-color 0.3s;

+ 26 - 21
resource/styles/agile-admin/inverse/variables.scss

@@ -8,39 +8,44 @@ $basefont1: Lato, -apple-system, BlinkMacSystemFont, 'Hiragino Kaku Gothic ProN'
 $basefont2: Lato, -apple-system, BlinkMacSystemFont, 'Hiragino Kaku Gothic ProN', Meiryo, sans-serif;
 
 
-/*Theme Colors*/
-$topbar:#3c4451;
-$sidebar:#4F5467;
-$bodycolor:#fff;
-$headingtext: #2b2b2b;
-$bodytext: #686868;
-$sidebar-text:#54667a;
-$themecolor:#ff6849;
-$dark-themecolor:#4F5467;
-
 /*bootstrap Color*/
-$danger: #f75b36;
-$success: #00c292;
-$warning: #f8c255;
+$danger: #ff0a54;
+$success: #00bb83;
+$warning: #ffa32b;
 $primary: #2c5ca9;
-$info: #008efa;
+$info: #009fbb;
 $muted: #98a6ad;
 $dark: #3e4d6c;
 $inverse:#3e4d6c;
 $light:#e4e7ea;
 $extralight:#f7fafc ;
-
-
+$gray: #eee;
+$gray-light: #f0f0f0;
+$gray-lighter: #f5f5f5;
+$gray-extralight: #fafafa;
 
 /*Normal Color*/
 $white: #ffffff;
-$red:#fb3a3a;
-$purple:#2c5ca9;
-$blue:#02bec9;
-$yellow:#a0aec4;
-$border:rgba(120, 130, 140, 0.21);
+$red:#ff0000;
+$purple:#7b00ce;
+$blue:#0d00c5;
+$yellow:#cccf0e;
+$border:$gray;
 $megna:#00b5c2;
 
+/*Theme Colors*/
+$topbar:#3c4451;
+$sidebar:#4F5467;
+$bodycolor:#fff;
+$headingtext: #2b2b2b;
+$bodytext: #686868;
+$linktext: $inverse;
+$linktext-hover: lighten($inverse, 20%);
+$sidebar-text:#54667a;
+$themecolor:#ff6849;
+$dark-themecolor:#4F5467;
+
+
 $rgt:right;
 $lft:left;
 

+ 3 - 3
resource/styles/agile-admin/inverse/widgets.scss

@@ -648,9 +648,9 @@ Basic List
     border-color:$danger;
 }
 .alert-primary {
-    background: $purple;
+    background: $primary;
     color:$white;
-    border-color:$purple;
+    border-color:$primary;
 }
 .alert-info {
     background: $info;
@@ -2233,7 +2233,7 @@ position:relative;
 .btn-1b.btn-info:after, .btn-1c.btn-info:after, .btn-1d.btn-info:after, .btn-1e.btn-info:after, .btn-1f.btn-info:after{background: $info;}
 .btn-1b.btn-warning:after, .btn-1c.btn-warning:after, .btn-1d.btn-warning:after, .btn-1e.btn-warning:after, .btn-1f.btn-warning:after{background: $warning;}
 .btn-1b.btn-danger:after, .btn-1c.btn-danger:after, .btn-1d.btn-danger:after, .btn-1e.btn-danger:after, .btn-1f.btn-danger:after{background: $danger;}
-.btn-1b.btn-primary:after, .btn-1c.btn-primary:after, .btn-1d.btn-primary:after, .btn-1e.btn-primary:after, .btn-1f.btn-primary:after{background: $purple;}
+.btn-1b.btn-primary:after, .btn-1c.btn-primary:after, .btn-1d.btn-primary:after, .btn-1e.btn-primary:after, .btn-1f.btn-primary:after{background: $primary;}
 .btn-1b.btn-success:after, .btn-1c.btn-success:after, .btn-1d.btn-success:after, .btn-1e.btn-success:after, .btn-1f.btn-success:after{background: $success;}
 .btn-1b.btn-inverse:after, .btn-1c.btn-inverse:after, .btn-1d.btn-inverse:after, .btn-1e.btn-inverse:after, .btn-1f.btn-inverse:after{background: $inverse;}
 

+ 1 - 1
resource/styles/scss/_attachments.scss

@@ -1,7 +1,7 @@
 
 .page-attachments-row {
   border-top: solid 1px #ccc;
-  background: #f5f5f5;
+  background: $gray-lighter;
 }
 .page-attachments, .page-meta {
   font-size: 0.95em;

+ 1 - 1
resource/styles/scss/_comment_crowi-plus.scss

@@ -27,7 +27,7 @@
   }
 
   .page-comments-row {
-    border-top: 5px solid #f0f0f0;
+    border-top: 5px solid $gray-light;
     margin: 30px 0px;
   }
 

+ 1 - 1
resource/styles/scss/_layout_crowi.scss

@@ -22,7 +22,7 @@
       border-radius: 0 5px;
       padding: 3px 11px;
       font-weight: bold;
-      background: #f0f0f0;
+      background: $gray-light;
       margin-left: 5px;
       margin-bottom: 5px;
 

+ 1 - 1
resource/styles/scss/_search.scss

@@ -120,7 +120,7 @@
           &.active {
             padding-right: 7px;
             border-right: solid 3px #666;
-            background: #f0f0f0;
+            background: $gray-light;
           }
         }
       }