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

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

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

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

@@ -26,7 +26,7 @@ const GrowiSubNavigationForUserPage = (props) => {
   }, []);
 
   return (
-    <div className={`row ${(isCompactMode && layoutType === 'growi') && 'grw-compact-subnavbar w-100'}`}>
+    <div className={`row ${(isCompactMode && layoutType === 'growi') && 'grw-compact-subnavbar'}`}>
 
       <div className="col-12">
         {/* Page Path */}

+ 0 - 1
src/client/styles/scss/_page_growi.scss

@@ -21,7 +21,6 @@
       }
     }
     .grw-compact-subnavbar {
-      z-index: $zindex-fixed;
       h2 {
         font-size: 20px;
         line-height: 1.1em;

+ 11 - 6
src/server/views/layout-growi/base/layout.html

@@ -9,12 +9,17 @@
 {% block layout_main %}
 <div class="container-fluid">
 
-  <div class="sticky-top row grw-subnav">
-    <div class="col-12 grw-title-bar">
-      {% block content_header %}
-      {% endblock %}
-    </div><!-- /.grw-title-bar -->
-  </div><!-- /.row -->
+  <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="row">
     <div id="main" class="main col-md-12 {% if page %}{{ css.grant(page) }}{% endif %} {% block main_css_class %}{% endblock %}">