mayu morita пре 7 година
родитељ
комит
e40965848c

+ 0 - 1
src/client/js/util/GrowiRenderer.js

@@ -23,7 +23,6 @@ export default class GrowiRenderer {
    *
    *
    * @param {Crowi} crowi
    * @param {Crowi} crowi
    * @param {GrowiRenderer} originRenderer may be customized by plugins
    * @param {GrowiRenderer} originRenderer may be customized by plugins
-   * @param {Kibela} kibela
    * @param {object} options
    * @param {object} options
    */
    */
   constructor(crowi, originRenderer, options) {
   constructor(crowi, originRenderer, options) {

+ 2 - 2
src/client/styles/agile-admin/inverse/widgets.scss

@@ -669,7 +669,7 @@ Basic List
 .tab-content{
 .tab-content{
   margin-top:30px;
   margin-top:30px;
 }
 }
-*/
+
 .customtab{
 .customtab{
   border-bottom:2px solid $extralight;
   border-bottom:2px solid $extralight;
 }
 }
@@ -684,7 +684,7 @@ Basic List
   border:0px;
   border:0px;
 
 
 }
 }
-
+*/
 
 
 /*custom tab2*/
 /*custom tab2*/
 /*
 /*

+ 0 - 22
src/client/styles/scss/_comment_kibela.scss

@@ -1,27 +1,5 @@
 
 
 .kibela.main-container {
 .kibela.main-container {
-  .revision-toc {
-    &.affix {
-      right: 10rem;
-      margin-top: 40px;
-      top: calc(60px + 5px);
-      min-width: calc(#{100/12*2%} - #{$grid-gutter-width}); // width of 2column - padding
-    }
-    .revision-toc-content {
-      padding: 0;
-    }
-    @media screen and (max-width: 1400px) {
-      &.affix {
-        right: 0rem !important;
-        transition: 0.5s;
-      }
-    }
-  }
-  /* search page */
-  .search-result-list,
-  .page-list-li {
-    background: #F4F5F6;
-  }
   /* Comment section */
   /* Comment section */
   %comment-section {
   %comment-section {
     position: relative;
     position: relative;

+ 76 - 0
src/client/styles/scss/_layout_kibela.scss

@@ -82,6 +82,82 @@
       padding-top: 30px;
       padding-top: 30px;
     }
     }
   }
   }
+  .revision-toc {
+    &.affix {
+      right: 10rem;
+      margin-top: 40px;
+      top: calc(60px + 5px);
+      min-width: calc(#{100/12*2%} - #{$grid-gutter-width}); // width of 2column - padding
+    }
+    .revision-toc-content {
+      padding: 0;
+    }
+    @media screen and (max-width: 1400px) {
+      &.affix {
+        right: 0rem !important;
+        transition: 0.5s;
+      }
+    }
+  }
+  /* search page */
+  .search-result-list,
+  .page-list-li {
+    background: #F4F5F6;
+  }
+  /* Tabs */
+  .nav.nav-tabs {
+    border-bottom-color: #F4F5F6;
+    >li>a {
+      &,
+      &:hover,
+      &:focus {
+        background: transparent;
+        border-top: none;
+        border-left: none;
+        border-right: none;
+      }
+    }
+    >li.active>a {
+      background: transparent !important;
+      border-bottom: solid 2.7px #5584E1;
+      border-top: none;
+      border-left: none;
+      border-right: none;
+    }
+    .wiki {
+      h1 {
+        border-bottom: solid 2px #5584E1 !important;
+      }
+      h2 {
+        border-color: solid 1px #5584E1;
+      }
+    }
+  }
+  /* user page */
+  .header-wrap {
+    margin-left: 2em;
+    padding: 0px;
+  }
+  /* edit */
+  .CodeMirror {
+    border-radius: 0.35em;
+    border-top: solid 0.3em #5584E1 !important;
+    border: solid 1.2px #D8D8D8;
+  }
+  .tab-content {
+    padding: 1em;
+  }
+  .tab-pane {
+    .page-editor-editor-container {
+      margin: 0px;
+      border: none !important;
+    }
+  }
+  .page-editor-preview-container {
+    background: white !important;
+    padding-right: 0px !important;
+    padding-left: 2em;
+  }
 }
 }
 .on-edit {
 .on-edit {
   .kibela-block {
   .kibela-block {