mayu morita 7 лет назад
Родитель
Сommit
1ff01d1abe

+ 1 - 1
lib/views/layout-kibela/page.html

@@ -33,7 +33,7 @@
   </div>
 
   {% if 'growi' === behaviorType() || 'crowi-plus' === behaviorType() %}
-  <div class="row page-list m-t-30">
+  <div class="row page-list m-t-30 p-10 p-t-20 p-b-20 bg-white">
     <div class="col-md-10">
       {% include '../widget/page_list_and_timeline.html' %}
     </div>

+ 2 - 4
lib/views/layout-kibela/widget/comments.html

@@ -1,7 +1,6 @@
-<div class="kibela">
 <div class="page-comments-row row">
 
-    <div class="page-comments col-lg-7 col-md-9">
+    <div class="page-comments col-lg-9 col-md-11">
 
       <h4><i class="icon-fw icon-bubbles"></i> Comments</h4>
 
@@ -24,6 +23,5 @@
       {% endif %}
 
     </div>
-
-  </div>
 </div>
+

+ 4 - 2
resource/styles/agile-admin/inverse/colors/kibela.scss

@@ -1,8 +1,10 @@
 @import '../variables';
 
+$radius: 3px;
+
 $themecolor: #00587A;
-$themelight: #F7FBFD;
-$subthemecolor: #186718;
+$themelight: #F4F5F6;
+$subthemecolor: rgb(75, 96, 129);
 
 
 $topbar: $themecolor;

+ 7 - 16
resource/styles/scss/_layout_kibela.scss

@@ -1,5 +1,5 @@
 .kibela {
-  p, h1, h2, h3, h4, h5, h6, li, span, i, a, li, .active {
+  p, h1, h2, h3, h4, h5, h6, li, span, i, a, li {
     color: #3c4a60;
   }
   .icon-link, .CodeMirror-hint-active, .nav-main-left-tab, .tav-pane, .active {
@@ -17,20 +17,19 @@
    }
  }
  .search-input-group, .search-typeahead {
-   background-color: white !important;
-   border-radius: 2.5em;
    .btn {
     background-color: transparent;
    }
  }
 
-  #page-header, .navbar-header, .active, .textarea-editor, .page-editor-preview-body, .top-left-part, .modal-content, .panel-body, .well, .rbt-menu, .input-group, .search-box {
+  #page-header, .navbar-header {
     background: white;
     color: #3c4a60;
     border: none;
   }
-  .main-container header.affix {
+  .page-list {
     background: white;
+    border-radius: 0.5em;
   }
   .page-attachment-row {
     background-color: #E5ECF1 !important;
@@ -48,7 +47,7 @@
 
     position: absolute;
     top: 0px;
-    right: 0px;
+    right: 100px;
     bottom: 0px;
     left: 0px;
     margin: auto;
@@ -70,7 +69,7 @@
 
   .revision-toc {
     &.affix {
-      right: 4rem;
+      right: 10rem;
       margin-top: 35px;
       top: calc(46px + 5px);
       min-width: calc(#{100/12*2%} - #{$grid-gutter-width});  // width of 2column - padding
@@ -80,7 +79,7 @@
     .revision-toc-content {
       padding: 0;
     }
-    @media screen and (max-width: 1400px) {
+    @media screen and (max-width: 1440px) {
       &.affix {
       right: 0rem !important;
       transition: 0.5s ;
@@ -89,14 +88,6 @@
   }
 
 
-
-
-
-
-
-
-
-
     %comment-section {
       position: relative;
       padding: 1em;