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

WIP: apply bootstrap theme

* adjust color
Yuki Takei 8 лет назад
Родитель
Сommit
7f98e12d5f

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

@@ -847,7 +847,7 @@ label{
 // Page title
 
 .bg-title{
-  background:$white;
+  background: $extralight;
   overflow:hidden;
   padding:15px 15px 10px;
   margin-bottom:25px;

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

@@ -11,7 +11,7 @@ $basefont2: Lato, -apple-system, BlinkMacSystemFont, 'Hiragino Kaku Gothic ProN'
 /*Theme Colors*/
 $topbar:#3c4451;
 $sidebar:#4F5467;
-$bodycolor:#f4f6f8;
+$bodycolor:#fff;
 $headingtext: #2b2b2b;
 $bodytext: #686868;
 $sidebar-text:#54667a;

+ 9 - 5
resource/styles/scss/_page.scss

@@ -23,16 +23,20 @@
       }
     }
 
-    .like-button {
+    .like-button, .bookmark-link {
+      border: none;
       font-size: 1.2em;
       line-height: 0.8em;
+      &:not(:hover) {
+        background-color: transparent;
+      }
+    }
+    .like-button {
       &.active {
         @extend .btn-info;
       }
     }
     .bookmark-link {
-      font-size: 1.2em;
-      line-height: 0.8em;
       &.active {
         @extend .btn-warning;
       }
@@ -86,8 +90,8 @@
       top: 0;
       left: 0;
       padding: 5px 20px;
-      // z-index: 1039;
-      // background: rgba(255, 255, 255, .9);
+      z-index: 15; // over the .sidebar
+      background: rgba(white, .9);
       box-shadow: 0 0px 2px #999;
 
       h1 {

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

@@ -21,7 +21,7 @@
 @import 'layout_crowi-plus';
 // @import 'page_list';
 @import 'page';
-// @import 'page_crowi-plus';
+@import 'page_crowi-plus';
 // @import 'portal';
 @import 'search';
 @import 'shortcuts';