From e7749c2c35c74b36eb5cc2735da6e5a56a67c91f Mon Sep 17 00:00:00 2001
From: hatuhay <alberto@siles.pe>
Date: Mon, 12 Feb 2018 08:01:36 -0500
Subject: [PATCH] Match changes on subtheme.
---
subtheme/templates/page.html.twig | 161 +++++++++++++++---------------
templates/layout/page.html.twig | 1 -
2 files changed, 83 insertions(+), 79 deletions(-)
diff --git a/subtheme/templates/page.html.twig b/subtheme/templates/page.html.twig
index 8d49e09..f8d49ad 100644
--- a/subtheme/templates/page.html.twig
+++ b/subtheme/templates/page.html.twig
@@ -70,91 +70,96 @@
#}
{% block head %}
- {% if page.secondary_menu or page.page.top_header or page.top_header_form %}
- <nav{{ navbar_top_attributes }}>
- {% if container_navbar %}
- <div class="container">
- {% endif %}
- <div class="navbar-brand">
- {{ page.header }}
- </div>
- {% if page.top_header_form %}
- <div class="form-inline navbar-form float-right">
- {{ page.top_header_form }}
- </div>
- {% endif %}
- {% if page.secondary_menu or page.top_header %}
- <div class="navbar-nav float-right">
- {{ page.secondary_menu }}
- {{ page.top_header }}
- </ div>
- {% endif %}
- {% if container_navbar %}
- </div>
- {% endif %}
- </nav>
- {% endif %}
- <nav{{ navbar_attributes }}>
- {% if container_navbar %}
- <div class="container">
- {% endif %}
- <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#CollapsingNavbar" aria-controls="CollapsingNavbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
- <div class="collapse navbar-collapse" id="CollapsingNavbar">
- {{ page.primary_menu }}
- {% if page.header_form %}
- <div class="form-inline navbar-form float-right">
- {{ page.header_form }}
+ {% if page.secondary_menu or page.page.top_header or page.top_header_form %}
+ <nav{{ navbar_top_attributes }}>
+ {% if container_navbar %}
+ <div class="container">
+ {% endif %}
+ {{ page.secondary_menu }}
+ {{ page.top_header }}
+ {% if page.top_header_form %}
+ <div class="form-inline navbar-form float-right">
+ {{ page.top_header_form }}
+ </div>
+ {% endif %}
+ {% if container_navbar %}
</div>
+ {% endif %}
+ </nav>
{% endif %}
- </div>
- {% if container_navbar %}
- </div>
- {% endif %}
- </nav>
+ <nav{{ navbar_attributes }}>
+ {% if container_navbar %}
+ <div class="container">
+ {% endif %}
+ <div class="navbar-brand">
+ {{ page.header }}
+ </div>
+ {% if page.primary_menu or page.header_form %}
+ <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#CollapsingNavbar" aria-controls="CollapsingNavbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
+ <div class="collapse navbar-collapse" id="CollapsingNavbar">
+ {{ page.primary_menu }}
+ {% if page.header_form %}
+ <div class="form-inline navbar-form float-right">
+ {{ page.header_form }}
+ </div>
+ {% endif %}
+ </div>
+ {% endif %}
+ {% if sidebar_collapse %}
+ <button class="navbar-toggler navbar-toggler-left" type="button" data-toggle="collapse" data-target="#CollapsingLeft" aria-controls="CollapsingLeft" aria-expanded="false" aria-label="Toggle navigation"></button>
+ {% endif %}
+ {% if container_navbar %}
+ </div>
+ {% endif %}
+ </nav>
{% endblock %}
{% block content %}
- <div id="main" class="{{ container }}">
- <div class="row clearfix">
- {{ page.breadcrumb }}
- <main{{ content_attributes }}>
- <section class="section">
- <a id="main-content" tabindex="-1"></a>
- {{ page.content }}
- </section>
- </main>
- {% if page.sidebar_first %}
- <div{{ sidebar_first_attributes }}>
- <aside class="section" role="complementary">
- {{ page.sidebar_first }}
- </aside>
- </div>
- {% endif %}
- {% if page.sidebar_second %}
- <div{{ sidebar_second_attributes }}>
- <aside class="section" role="complementary">
- {{ page.sidebar_second }}
- </aside>
+ <div id="main" class="{{ container }}">
+ {% if page.breadcrumb %}
+ <div class="row">
+ {{ page.breadcrumb }}
+ </div>
+ {% endif %}
+ <div class="row row-offcanvas row-offcanvas-left clearfix">
+ <main{{ content_attributes }}>
+ <section class="section">
+ <a id="main-content" tabindex="-1"></a>
+ {{ page.content }}
+ </section>
+ </main>
+ {% if page.sidebar_first %}
+ <div{{ sidebar_first_attributes }}>
+ <aside class="section" role="complementary">
+ {{ page.sidebar_first }}
+ </aside>
+ </div>
+ {% endif %}
+ {% if page.sidebar_second %}
+ <div{{ sidebar_second_attributes }}>
+ <aside class="section" role="complementary">
+ {{ page.sidebar_second }}
+ </aside>
+ </div>
+ {% endif %}
+ </div>
</div>
- {% endif %}
- </div>
- </div>
{% endblock %}
{% block footer %}
- <div class="{{ container }}">
- {% if page.footer_first or page.footer_second or page.footer_third or page.footer_fourth %}
- <div class="site-footer__top clearfix">
- {{ page.footer_first }}
- {{ page.footer_second }}
- {{ page.footer_third }}
- {{ page.footer_fourth }}
- </div>
- {% endif %}
- {% if page.footer_fifth %}
- <div class="site-footer__bottom">
- {{ page.footer_fifth }}
- </div>
- {% endif %}
- </div>
+ <div class="{{ container }}">
+ {% if page.footer_first or page.footer_second or page.footer_third or page.footer_fourth %}
+ <div class="site-footer__top clearfix">
+ {{ page.footer_first }}
+ {{ page.footer_second }}
+ {{ page.footer_third }}
+ {{ page.footer_fourth }}
+ </div>
+ {% endif %}
+ {% if page.footer_fifth %}
+ <div class="site-footer__bottom">
+ {{ page.footer_fifth }}
+ </div>
+ {% endif %}
+ </div>
{% endblock %}
diff --git a/templates/layout/page.html.twig b/templates/layout/page.html.twig
index b8ca8cd..e2f03a4 100644
--- a/templates/layout/page.html.twig
+++ b/templates/layout/page.html.twig
@@ -129,7 +129,6 @@
{{ page.featured_top }}
</aside>
</div>
- {% endblock %}
{% endif %}
<div id="main-wrapper" class="layout-main-wrapper clearfix">
{% block content %}
--
GitLab