Merge pull request #2495 from weseek/imprv/commonality-subnavbar

Imprv/commonality subnavbar

src/client/styles/scss/theme/_apply-colors-kibela.scss

@@ -24,11 +24,6 @@ body.kibela {
       background-color: rgba(lighten($bgcolor-global, 50%), 0.85);
     }
 
-    /* kibela block */
-    .kibela-border-top {
-      border-top: solid 0.4em $thickborder;
-    }
-
     /* page wrapper */
     #page-wrapper {
       background-color: $bgcolor-global;

src/server/views/layout-kibela/base/layout.html

@@ -9,15 +9,23 @@
 {% block layout_main %}
 <div class="container-fluid p-0">
 
+  <div id="grw-subnav-switcher-container" class="d-edit-none"></div>
+  <div id="grw-subnav-sticky-trigger" class="sticky-top"></div>
+
   <div class="row body m-0 p-0 d-print-block">
 
     <div id="main" class="main col-12 kibela-block round-corner {% if page %}{{ css.grant(page) }}{% endif %}{% block main_css_class %}{% endblock %}">
-      <div class="row grw-subnav d-edit-none d-print-block">
-        <div class="col-12 col-xl-9 col-lg-8 px-0 mx-0 bg-white kibela-border-top round-corner">
-          {% block content_header %} {% endblock %}
-        </div>
-        <div class="col-xl-3 col-lg-4"></div>
-      </div>
+      {% block content_header_wrapper %}
+        <header class="row mb-5 grw-subnav d-edit-none d-print-block round-corner">
+            <div class="col-12 px-0 mx-0">
+              {% block content_header %}
+                <div id="grw-subnav-container" class="d-edit-none"></div>
+              {% endblock %}
+            </div>
+          </header>
+        </header>
+      {% endblock %}
+
       <!-- /.grw-subnav -->
 
       {% block content_main_before %}

src/server/views/layout-kibela/forbidden.html

@@ -1,11 +1,5 @@
 {% extends 'base/layout.html' %}
 
-
-{% block content_header %}
-  {% include 'widget/header.html' %}
-{% endblock %}
-
-
 {% block content_main_before %}
   {% include '../widget/page_alerts.html' %}
 {% endblock %}

src/server/views/layout-kibela/not_creatable.html

@@ -1,11 +1,5 @@
 {% extends 'base/layout.html' %}
 
-
-{% block content_header %}
-  {% include 'widget/header.html' %}
-{% endblock %}
-
-
 {% block content_main_before %}
   {% include '../widget/page_alerts.html' %}
 {% endblock %}

src/server/views/layout-kibela/not_found.html

@@ -1,11 +1,5 @@
 {% extends 'base/layout.html' %}
 
-
-{% block content_header %}
-  {% include 'widget/header.html' %}
-{% endblock %}
-
-
 {% block content_main_before %}
   {% include '../widget/page_alerts.html' %}
 {% endblock %}

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

@@ -1,11 +1,5 @@
 {% extends 'base/layout.html' %}
 
-
-{% block content_header %}
-  {% include 'widget/header.html' %}
-{% endblock %}
-
-
 {% block content_main_before %}
 {% endblock %}
 

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

@@ -1,10 +1,5 @@
 {% extends 'base/layout.html' %}
 
-{% block content_header %}
- {% include 'widget/header.html' %}
- {% endblock %}
-
-
  {% block content_main_before%}
  {% endblock %}
 

src/server/views/layout-kibela/widget/header.html

@@ -1,2 +0,0 @@
-<div id="grw-subnav" class="grw-subnav" data-is-forbidden-page="{{ forbidden }}"></div>
-

src/server/views/widget/header.html

@@ -0,0 +1 @@
+<div id="grw-subnav" class="grw-subnav d-edit-none"></div>