WIP: reconstruct layouts

* affix

lib/views/layout-growi/base/not_found_nosidebar.html

@@ -19,14 +19,12 @@
     {% endblock %}
 
     {% block content_main %}
-      {% parent %}
     {% endblock content_main %}
 
     {% block content_main_after %}
     {% endblock %}
 
     {% block content_footer %}
-      {% parent %}
     {% endblock %}
   </article>
 </div>

lib/views/layout-growi/page.html

@@ -1,7 +1,6 @@
 {% extends 'base/page_nosidebar.html' %}
 
 {% block main_css_class %}
-  main-crowi-plus-customized
   {% parent %}
 {% endblock %}
 
@@ -39,7 +38,7 @@
 
       {# relocate #revision-toc #}
       <div class="col-lg-2 col-md-3 visible-lg visible-md">
-        <div id="revision-toc" class="revision-toc" data-spy="affix" data-offset-top="128">
+        <div id="revision-toc" class="revision-toc" data-spy="affix" data-offset-top="80">
           <div id="revision-toc-content" class="revision-toc-content"></div>
         </div>
       </div> {# /.col- #}

lib/views/layout-growi/page_list.html

@@ -40,7 +40,7 @@
 
       {# relocate #revision-toc #}
       <div class="col-lg-2 col-md-3 visible-lg visible-md">
-        <div id="revision-toc" class="revision-toc" data-spy="affix" data-offset-top="100">
+        <div id="revision-toc" class="revision-toc" data-spy="affix" data-offset-top="80">
           <div id="revision-toc-content" class="revision-toc-content"></div>
         </div>
       </div> {# /.col- #}

resource/js/legacy/crowi.js

@@ -522,15 +522,17 @@ $(function() {
     }
     */
 
-    // header
-    var $header = $('#page-header');
-    if ($header.length > 0) {
-      var headerHeight = $header.outerHeight(true);
-      $('.header-wrap').css({height: (headerHeight + 0) + 'px'});
-      $header.affix({
+    // header affix
+    var $affixContent = $('#page-header');
+    if ($affixContent.length > 0) {
+      var $affixContentContainer = $('.row.bg-title');
+      var containerHeight = $affixContentContainer.outerHeight(true);
+      // fix height(固定)
+      $affixContentContainer.css({height: containerHeight + 'px'});
+      $affixContent.affix({
         offset: {
           top: function() {
-            return headerHeight + 86; // (54 header + 16 header padding-top + 16 content padding-top)
+            return $('.navbar').outerHeight(true) + containerHeight;
           }
         }
       });

resource/styles/scss/_layout_crowi-plus.scss

@@ -1,8 +1,19 @@
 .growi.main-container {
-  .main-crowi-plus-customized .content-main {
+  .content-main {
     padding: 0;
   }
 
+  .revision-toc {
+    &.affix {
+      margin-top: 5px;
+      top: calc(46px + 5px);
+    }
+
+    .revision-toc-content {
+      padding: 0;
+    }
+  }
+
   @media (max-width: $screen-sm-max) {
     .system-version {
       display: none;

resource/styles/scss/_wiki_crowi-plus.scss

@@ -1,21 +0,0 @@
-.growi.main-container {
-
-  .revision-toc {
-    // reset official styles
-    float: none;
-    border: none;
-    border-radius: 0;
-    max-width: none;
-    overflow: auto;
-
-    .revision-toc-content {
-      margin-top: 50px;
-      background: none;
-    }
-
-    // affix
-    &.affix {
-      top: 0;
-    }
-  }
-}

resource/styles/scss/crowi.scss

@@ -30,7 +30,6 @@
 @import 'user';
 @import 'user_crowi-plus';
 @import 'wiki';
-@import 'wiki_crowi-plus';
 
 /*
 ul {