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

change nature color texts and borders again

yusuketk 8 лет назад
Родитель
Сommit
eab4787ada

+ 37 - 3
resource/styles/agile-admin/inverse/colors/_apply-colors-nature.scss

@@ -15,11 +15,45 @@
   background-color: darken($bodycolor, 5%);
   background-color: darken($bodycolor, 5%);
 }
 }
 
 
+/*
+ * Panel
+ */
+ .panel {
+ &, &.panel-white, &.panel-default {
+    border-color: darken($bodycolor,3%);
+    .panel-heading {
+      color: $headingtext;
+      background-color: darken($bodycolor,3%);
+      border-bottom:1px solid darken($bodycolor,3%);
+   }
+  }
+}
+
 /*
 /*
  * Tabs
  * Tabs
  */
  */
-.nav-tabs > li > a {
-  color: $dark;
+ .nav.nav-tabs {
+  border-bottom-color: $border;
+
+  > li > a {
+    color:$linktext;
+    &:hover, &:focus {
+      color: $linktext-hover;
+    }
+  }
+  > li.active > a {
+    border-top-color: $border;
+    border-left-color: $border;
+    border-right-color: $border;
+  }
+  > li:not(.active) > a {
+    &:hover, &:focus {
+      border-top-color: darken($border, 5%);
+      border-left-color: darken($border, 5%);
+      border-right-color: darken($border, 5%);
+      border-bottom: transparent;
+    }
+  }
 }
 }
 
 
 /*
 /*
@@ -58,7 +92,7 @@
 
 
 .wiki {
 .wiki {
   h1 {
   h1 {
-    border-color: darken($border, 20%);
+    border-color: $border;
   }
   }
   h2 {
   h2 {
     border-color: $border;
     border-color: $border;

+ 3 - 4
resource/styles/agile-admin/inverse/colors/nature.scss

@@ -6,13 +6,12 @@ $topbar:#118050;;
 $sidebar:#fff;
 $sidebar:#fff;
 $bodycolor:#fefffd;
 $bodycolor:#fefffd;
 
 
-$headingtext: #695846;
+$headingtext: #46694e;
 $bodytext: #333333;
 $bodytext: #333333;
-$linktext: $themecolor;
+$linktext: lighten($themecolor,5%);
 $linktext-hover: lighten($linktext, 12%);
 $linktext-hover: lighten($linktext, 12%);
 $sidebar-text:#5c7253;
 $sidebar-text:#5c7253;
-$border:#f3f3e9;
-$table-border-color:$border;
+$border: #e9f0de;
 
 
 $primary: $themecolor;
 $primary: $themecolor;
 
 

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

@@ -124,7 +124,7 @@
         fill: #118050;
         fill: #118050;
       }
       }
       .color3 {
       .color3 {
-        fill: #00424b;
+        fill: #00363d;
       }
       }
     }
     }
   }
   }