Browse Source

adjust styles

Yuki Takei 8 years ago
parent
commit
4c647cb6ca

+ 21 - 23
resource/styles/agile-admin/inverse/colors/_apply-colors-dark.scss

@@ -71,31 +71,29 @@ input.form-control, textarea.form-control {
 }
 
 /*
- * Tabs
+ * Table
  */
-.nav.nav-tabs {
-  border-bottom-color: $border;
+ .table > thead > tr > th, .table > tbody > tr > th, .table > tfoot > tr > th,
+ .table > thead > tr > td, .table > tbody > tr > td, .table > tfoot > tr > td ,
+ .table > thead > tr > th, .table-bordered{
+     border-top: 1px solid $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;
-    }
-  }
-}
+ .table-bordered > thead > tr > th,
+ .table-bordered > tbody > tr > th,
+ .table-bordered > tfoot > tr > th,
+ .table-bordered > thead > tr > td,
+ .table-bordered > tbody > tr > td,
+ .table-bordered > tfoot > tr > td {
+   border: 1px solid $border;
+ }
+ .table > thead > tr > th {
+     border-bottom: 1px solid $border;
+ }
+
+ .table-bordered {
+     border: 1px solid $border;
+ }
 
 
 /*

+ 0 - 7
resource/styles/agile-admin/inverse/colors/_apply-colors-light.scss

@@ -15,13 +15,6 @@
   background-color: darken($bodycolor, 5%);
 }
 
-/*
- * Tabs
- */
-.nav-tabs > li > a {
-  color: $dark;
-}
-
 /*
  * GROWI header
  */

+ 27 - 0
resource/styles/agile-admin/inverse/colors/_apply-colors.scss

@@ -214,6 +214,33 @@ legend {
   }
 }
 
+/*
+ * Tabs
+ */
+ .nav.nav-tabs {
+  border-bottom-color: $navbar-border;
+
+  > li > a {
+    color:$linktext;
+    &:hover, &:focus {
+      color: $linktext-hover;
+    }
+  }
+  > li.active > a {
+    border-top-color: $navbar-border;
+    border-left-color: $navbar-border;
+    border-right-color: $navbar-border;
+  }
+  > li:not(.active) > a {
+    &:hover, &:focus {
+      border-top-color: $active-navbar-border;
+      border-left-color: $active-navbar-border;
+      border-right-color: $active-navbar-border;
+      border-bottom: transparent;
+    }
+  }
+}
+
 
 /*
  * Crowi sidebar

+ 2 - 0
resource/styles/agile-admin/inverse/colors/default-dark.scss

@@ -20,6 +20,8 @@ $wikilinktext-hover: darken($wikilinktext, 5%);
 
 $dark: darken($bodytext, 5%);
 $border: lighten($basecolor, 15%);
+$navbar-border: lighten($border, 10%);
+$active-navbar-border: darken($border, 3%);
 
 @import 'apply-colors';
 @import 'apply-colors-dark';

+ 2 - 0
resource/styles/agile-admin/inverse/variables.scss

@@ -51,6 +51,8 @@ $rgt:right !default;
 $lft:left !default;
 
 $dark-text:#848a96 !default;
+$navbar-border: #999 !default;
+$active-navbar-border: lighten($navbar-border, 20%) !default;
 
 /*Border radius*/
 $radius: 0 !default;