itizawa 6 лет назад
Родитель
Сommit
94d4dd2945

+ 1 - 1
src/client/js/components/Navbar/GrowiSubNavigation.jsx

@@ -36,7 +36,7 @@ const GrowiSubNavigation = (props) => {
   }
   }
 
 
   return (
   return (
-    <div className={`row px-3 py-1 align-items-center ${compactClassName}`}>
+    <div className={`d-flex px-3 py-1 align-items-center ${compactClassName}`}>
 
 
       {/* Page Path */}
       {/* Page Path */}
       <div className="title-container mr-auto">
       <div className="title-container mr-auto">

+ 9 - 14
src/server/views/layout-growi/base/layout.html

@@ -7,20 +7,16 @@
 {% endblock %}
 {% endblock %}
 
 
 {% block layout_main %}
 {% block layout_main %}
-<div class="container-fluid">
-
-  <header class="sticky-top py-0" id="page-header">
-
-    <div id="grw-subnav" data-is-forbidden-page="{{ forbidden }}"></div>
-
-      {% if not page and not forbidden and ('/' === path or 'crowi' === getConfig('crowi', 'customize:behavior')) and not isUserPageList(path) and !isTrashPage() %}
-        {% if '/' === path.slice(-1) %}
-          {% include '../../widget/create_portal.html' %}
-        {% endif %}
-      {% endif %}
-
-  </header>
+<header class="sticky-top py-0" id="page-header">
+  <div id="grw-subnav" data-is-forbidden-page="{{ forbidden }}"></div>
+  {% if not page and not forbidden and ('/' === path or 'crowi' === getConfig('crowi', 'customize:behavior')) and not isUserPageList(path) and !isTrashPage() %}
+    {% if '/' === path.slice(-1) %}
+      {% include '../../widget/create_portal.html' %}
+    {% endif %}
+  {% endif %}
+</header>
 
 
+<div class="container-fluid">
   <div class="row">
   <div class="row">
     <div id="main" class="main col-md-12 {% if page %}{{ css.grant(page) }}{% endif %} {% block main_css_class %}{% endblock %}">
     <div id="main" class="main col-md-12 {% if page %}{{ css.grant(page) }}{% endif %} {% block main_css_class %}{% endblock %}">
       {% block content_main_before %}
       {% block content_main_before %}
@@ -33,7 +29,6 @@
       {% endblock %}
       {% endblock %}
     </div><!-- /.main -->
     </div><!-- /.main -->
   </div><!-- /.row -->
   </div><!-- /.row -->
-
 </div><!-- /.container-fluid -->
 </div><!-- /.container-fluid -->
 
 
 <footer class="footer">
 <footer class="footer">