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

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

@@ -26,7 +26,7 @@
 
     {# relocate #revision-toc #}
     <div class="col-lg-2 col-md-3 revision-toc-container hidden-sm hidden-xs">
-      <div id="revision-toc" class="revision-toc" data-spy="affix" data-offset-top="80">
+      <div id="revision-toc" class="revision-toc affix" data-spy="" data-offset-top="80">
         <div id="revision-toc-content" class="revision-toc-content"></div>
       </div>
     </div> {# /.col- #}
@@ -34,7 +34,7 @@
   </div>
 
   {% if 'growi' === behaviorType() || 'crowi-plus' === behaviorType() %}
-  <div class="row page-list m-t-30 round-corner">
+  <div class="row page-list p-t-10 m-t-30 m-b-30 round-corner">
     <div class="col-md-10">
       {% include '../widget/page_list_and_timeline.html' %}
     </div>

+ 3 - 3
lib/views/layout-kibela/page_list.html

@@ -13,7 +13,7 @@
 <div class="row page-content">
 
 
-  <div class="col-xs-12 bg-white">
+  <div class="col-xs-12 bg-white round-corner">
 
     {% include '../widget/page_content.html' %}
 
@@ -29,14 +29,14 @@
 
     {# relocate #revision-toc #}
     <div class="col-lg-2 col-md-3 revision-toc-container hidden-sm hidden-xs">
-      <div id="revision-toc" class="revision-toc" data-spy="affix" data-offset-top="80">
+      <div id="revision-toc" class="revision-toc affix" data-spy="" data-offset-top="80">
         <div id="revision-toc-content" class="revision-toc-content"></div>
       </div>
     </div> {# /.col- #}
 
 
 
-  <div class="row page-list bg-white round-corner m-20 {% if isPortal %}m-t-30{% endif %}">
+  <div class="row page-list bg-white round-corner p-t-10 m-20 m-b-30 {% if isPortal %}m-t-30{% endif %}">
     <div class="col-md-10 col-xs-12">
       {% include '../widget/page_list_and_timeline_kibela.html' %}
     </div>

+ 10 - 3
resource/styles/scss/_layout_kibela.scss

@@ -113,6 +113,13 @@
     left: 0px;
     margin: auto;
     height: 11em;
+    /* 編集の時だけ消したい
+    &.on-edit .kibela-block {
+      border-radius: 0.35em;
+      border-top: solid 0.4em #5584E1;
+      z-index: absolute;
+    }
+    */
   }
   .bg-title {
     position: relative;
@@ -127,8 +134,8 @@
   .revision-toc {
     &.affix {
       right: 10rem;
-      margin-top: 35px;
-      top: calc(46px + 5px);
+      margin-top: 40px;
+      top: calc(60px + 5px);
       min-width: calc(#{100/12*2%} - #{$grid-gutter-width});  // width of 2column - padding
 
     }
@@ -136,7 +143,7 @@
     .revision-toc-content {
       padding: 0;
     }
-    @media screen and (max-width: 1350px) {
+    @media screen and (max-width: 1400px) {
       &.affix {
       right: 0rem !important;
       transition: 0.5s ;