Merge pull request #2955 from weseek/imprv/userhome-renovation-gw4178

imprv/gw4178

src/client/styles/scss/_layout_growi.scss

@@ -27,7 +27,7 @@
     position: sticky;
     // growisubnavigation + grw-navbar-boder
     top: calc(100px + 4px);
-    min-width: 260px;
+    width: 250px;
     margin-top: 5px;
 
     .revision-toc-content {

src/server/views/layout-growi/page.html

@@ -6,18 +6,18 @@
 
 
 {% block content_main %}
-  <div class="row">
+  <div class="d-flex justify-content-between">
 
-    <div class="col grw-page-content-container">
+    <div class="grw-page-content-container flex-grow-1">
 
       {% include '../widget/page_content.html' %}
 
     </div>
 
-    <div class="col-xl-2 col-lg-3 d-none d-lg-block revision-toc-container">
-        <div id="revision-toc" class="revision-toc mt-3 sps sps--abv" data-sps-offset="123">
-          <div id="revision-toc-content" class="revision-toc-content"></div>
-        </div>
+    <div class="d-none d-lg-block revision-toc-container">
+      <div id="revision-toc" class="revision-toc mt-3 sps sps--abv" data-sps-offset="123">
+        <div id="revision-toc-content" class="revision-toc-content"></div>
+      </div>
     </div>
 
   </div>

src/server/views/layout-growi/page_list.html

@@ -6,15 +6,15 @@
 
 
 {% block content_main %}
-  <div class="row">
+  <div class="d-flex justify-content-between">
 
-    <div class="col grw-page-content-container">
+    <div class="grw-page-content-container flex-grow-1">
 
       {% include '../widget/page_content.html' %}
 
     </div>
 
-    <div class="col-xl-2 col-lg-3 d-none d-lg-block revision-toc-container">
+    <div class="d-none d-lg-block revision-toc-container">
       <div id="revision-toc" class="revision-toc mt-3 sps sps--abv" data-sps-offset="123">
         <div id="revision-toc-content" class="revision-toc-content"></div>
       </div>

src/server/views/layout-growi/shared_page.html

@@ -15,13 +15,13 @@
 
 {% block content_main %}
   <div
-    class="row"
+    class="d-flex justify-content-between"
     id="is-shared-page"
     data-share-link-expired-at="{% if sharelink.expiredAt %}{{ sharelink.expiredAt|datetz('Y/m/d H:i:s')}}{% endif %}"
     data-share-link-created-at="{{ sharelink.createdAt|datetz('Y/m/d H:i:s')}}"
   >
     {% block content_page %}
-      <div class="col grw-page-content-container">
+      <div class="grw-page-content-container flex-grow-1">
         <div id="share-link-alert"></div>
 
         {% include '../widget/page_content.html' %}
@@ -33,7 +33,7 @@
       </div>
 
       {# relocate #revision-toc #}
-      <div class="col-xl-2 col-lg-3 d-none d-lg-block revision-toc-container">
+      <div class="d-none d-lg-block revision-toc-container">
         <div id="revision-toc" class="revision-toc mt-3 sps sps--abv" data-sps-offset="123">
           <div id="revision-toc-content" class="revision-toc-content"></div>
         </div>

src/server/views/layout-growi/user_page.html

@@ -11,9 +11,8 @@
     </div>
   </div>
 
-  <div class="row">
-
-    <div class="col grw-page-content-container">
+  <div class="d-flex justify-content-between">
+    <div class="grw-page-content-container flex-grow-1">
 
       {#
         #   Because this block has content like 'Bookmarks' or 'Recent Created' whose height changes dynamically,
@@ -36,7 +35,7 @@
     </div> {# /.col- #}
 
     {# relocate #revision-toc #}
-    <div class="col-xl-2 col-lg-3 d-none d-lg-block revision-toc-container">
+    <div class="d-none d-lg-block revision-toc-container">
       <div id="revision-toc" class="revision-toc mt-3 sps sps--abv" data-sps-offset="116">
         <div id="revision-toc-content" class="revision-toc-content"></div>
       </div>