Yuki Takei 8 лет назад
Родитель
Сommit
c41460f238

+ 3 - 1
lib/views/layout-crowi/page.html

@@ -29,7 +29,9 @@
 
 
 {% block content_main %}
-  {% include '../widget/page_content.html' %}
+  <div class="m-b-30">
+    {% include '../widget/page_content.html' %}
+  </div>
 {% endblock %}
 
 

+ 4 - 2
lib/views/layout-crowi/page_list.html

@@ -59,9 +59,11 @@
   {% endif %}
   {% endif %}
 
-  {% include '../widget/page_content.html' %}
+  <div class="{% if isPortal %}m-b-30{% endif %}">
+    {% include '../widget/page_content.html' %}
+  </div>
 
-  <div class="row page-list m-t-30">
+  <div class="row page-list">
     <div class="col-md-12">
       {% include '../widget/page_list_and_timeline.html' %}
     </div>

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

@@ -11,7 +11,7 @@
 
 
 {% block content_main %}
-  <div class="row">
+  <div class="row m-b-30">
 
     <div class="col-lg-10 col-md-9">
 
@@ -34,7 +34,7 @@
   </div>
 
   {% if 'growi' === behaviorType() || 'crowi-plus' === behaviorType() %}
-  <div class="row page-list m-t-30">
+  <div class="row page-list">
     <div class="col-md-12">
       {% include '../widget/page_list_and_timeline.html' %}
     </div>

+ 2 - 2
lib/views/layout-growi/page_list.html

@@ -11,7 +11,7 @@
 
 
 {% block content_main %}
-  <div class="row">
+  <div class="row m-b-30">
 
     <div class="col-lg-10 col-md-9">
 
@@ -33,7 +33,7 @@
 
   </div>
 
-  <div class="row page-list m-t-30">
+  <div class="row page-list">
     <div class="col-md-12">
       {% include '../widget/page_list_and_timeline.html' %}
     </div>

+ 2 - 2
lib/views/layout-growi/user_page.html

@@ -15,7 +15,7 @@
 
 
 {% block content_main %}
-  <div class="row">
+  <div class="row m-b-30">
 
     <div class="col-lg-10 col-md-9">
 
@@ -52,7 +52,7 @@
   </div>
 
   {% if 'growi' === behaviorType() || 'crowi-plus' === behaviorType() %}
-  <div class="row page-list m-t-30">
+  <div class="row page-list">
     <div class="col-md-12">
       {% include '../widget/page_list_and_timeline.html' %}
     </div>

+ 1 - 1
lib/views/widget/not_found_content.html

@@ -22,7 +22,7 @@
     {# list view #}
     <div class="p-t-10 active tab-pane page-list-container" id="revision-body">
       {% if pages.length == 0 %}
-        <div class="m-t-20">
+        <div class="m-t-10">
           There are no pages under <strong>{{ path }}</strong>.
         </div>
       {% endif  %}

+ 11 - 10
lib/views/widget/page_list_and_timeline.html

@@ -7,18 +7,19 @@
   </ul>
 
   <div class="tab-content">
-    {% if pages.length == 0 %}
-
-      {% if isTrashPage() %}
-      No deleted pages.
-      {% else %}
-      There are no pages under <strong>{{ path }}</strong>.
-      {% endif %}
-    {% endif  %}
-
     {# list view #}
     <div class="p-t-10 active tab-pane fade page-list-container in" id="view-list">
-      {% include 'page_list.html' with { pages: pages, pager: pager, viewConfig: viewConfig } %}
+      {% if pages.length == 0 %}
+        <div class="m-t-10">
+          {% if isTrashPage() %}
+          No deleted pages.
+          {% else %}
+          There are no pages under <strong>{{ path }}</strong>.
+          {% endif %}
+        </div>
+      {% else %}
+        {% include 'page_list.html' with { pages: pages, pager: pager, viewConfig: viewConfig } %}
+      {% endif %}
     </div>
 
     {# timeline view #}