2
0
Yuki Takei 8 жил өмнө
parent
commit
693bf36c71

+ 17 - 1
resource/styles/agile-admin/inverse/colors/_apply-colors-dark.scss

@@ -70,10 +70,26 @@ input.form-control, textarea.form-control {
 
 
 /*
- * header
+ * GROWI header
  */
 .main-container header.affix {
   .logo-mark {
     fill: white;
   }
 }
+
+/*
+ * GROWI page list
+ */
+.page-list {
+  .page-list-ul {
+    > li {
+      > a strong {
+        color: lighten($bodytext, 25%);
+      }
+      > span.page-list-meta {
+        color: $bodytext;
+      }
+    }
+  }
+}

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

@@ -17,3 +17,20 @@
 .nav-tabs > li > a {
   color: $dark;
 }
+
+
+/*
+ * GROWI page list
+ */
+ .page-list {
+  .page-list-ul {
+    > li {
+      > a strong {
+        color: darken($bodytext, 20%);
+      }
+      > span.page-list-meta {
+        color: lighten($bodytext, 10%);;
+      }
+    }
+  }
+}

+ 24 - 11
resource/styles/agile-admin/inverse/colors/_apply-colors.scss

@@ -158,8 +158,22 @@ legend {
 /*
  * Modal
  */
-.modal-content {
-  background-color: $bodycolor;
+.modal {
+  .modal-header {
+    &.bg-primary, &.bg-info, &.bg-success, &.bg-warning, &.bg-danger {
+      color: white;
+    }
+    .close {
+      color: white;
+      opacity: 0.5;
+      &:hover {
+        opacity: 0.9;
+      }
+    }
+  }
+  .modal-content {
+    background-color: $bodycolor;
+  }
 }
 
 /*
@@ -195,14 +209,14 @@ legend {
 
 
 /*
- * header
+ * GROWI header
  */
 .main-container header.affix {
   background: rgba(darken($bodycolor, 2%), .9);
 }
 
 /*
- * on-edit
+ * GROWI on-edit
  */
 body.on-edit {
   .main {
@@ -218,18 +232,17 @@ body.on-edit {
 }
 
 /*
- * comment form
+ * GROWI comment form
  */
 .growi .main {
   .page-comments-row {
     border-top-color: $border;
   }
-  .comment-form {
-    .comment-form-main {
-      background-color: darken($bodycolor, 4%);
-      &:before {
-        border-right-color: darken($bodycolor, 4%);
-      }
+  .page-comment .page-comment-main,
+  .comment-form-main {
+    background-color: darken($bodycolor, 4%);
+    &:before {
+      border-right-color: darken($bodycolor, 4%);
     }
   }
 }

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

@@ -13,7 +13,7 @@ $sidebar-text:#a6acbc;
 $themecolor:#f75b36;
 $dark-themecolor:#4F5467;
 
-$primary: $topbar;
+$primary: $themecolor;
 
 $dark: darken($bodytext, 5%);
 $border: lighten($basecolor, 40%);

+ 9 - 8
resource/styles/agile-admin/inverse/eliteadmin.scss

@@ -1140,26 +1140,27 @@ label{
 
 }
 .btn-default, .btn-default.disabled{
-  background:$light;
-  border:1px solid $light;
+  color: $bodytext;
+  $this-color: darken($bodycolor, 10%);
+  background: $this-color;
+  border:1px solid $this-color;
    &:hover, &:focus, &.focus{
     opacity:0.8;
-    border:1px solid $light;
-    background:$light;
+    border:1px solid $this-color;
+    background:$this-color;
   }
 
 }
 
 .btn-default.btn-outline {
-    background-color:$white;
+    background-color: transparent;
     &:hover, &:focus, &.focus{
-    background:$light;
-
+    background:darken($bodycolor, 10%);
     }
 }
 .btn-primary.btn-outline {
     color: $primary;
-    background-color:$white;
+    background-color: transparent;
      &:hover, &:focus, &.focus{
     background:$primary;
     color:$white;

+ 1 - 0
resource/styles/agile-admin/inverse/widgets.scss

@@ -2216,6 +2216,7 @@ position:relative;
 
 /* Button 1b */
 .btn-1b{
+  overflow: hidden;
   &:after {
   width: 100%;
   height: 0;

+ 1 - 1
resource/styles/scss/_create-page.scss

@@ -60,5 +60,5 @@
         font-family: $font-family-monospace-not-strictly;
       }
     }
-  }
+  } // .modal-body
 }

+ 0 - 5
resource/styles/scss/_page_list.scss

@@ -27,15 +27,10 @@
         display: inline;
         padding: 0 4px;
         color: inherit;
-
-        strong {
-          color: #333;
-        }
       }
 
       > span.page-list-meta {
         font-size: .9em;
-        color: #999;
 
         >span {
           margin-right: .3rem;