Skip to content
Snippets Groups Projects
Commit e7749c2c authored by Alberto Siles's avatar Alberto Siles
Browse files

Match changes on subtheme.

parent 4386e0bf
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
subtheme/templates/page.html.twig
+ 83
− 78
View file @ e7749c2c
...@@ -70,91 +70,96 @@ ...@@ -70,91 +70,96 @@
#} #}
{% block head %} {% block head %}
{% if page.secondary_menu or page.page.top_header or page.top_header_form %} {% if page.secondary_menu or page.page.top_header or page.top_header_form %}
<nav{{ navbar_top_attributes }}> <nav{{ navbar_top_attributes }}>
{% if container_navbar %} {% if container_navbar %}
<div class="container"> <div class="container">
{% endif %} {% endif %}
<div class="navbar-brand"> {{ page.secondary_menu }}
{{ page.header }} {{ page.top_header }}
</div> {% if page.top_header_form %}
{% if page.top_header_form %} <div class="form-inline navbar-form float-right">
<div class="form-inline navbar-form float-right"> {{ page.top_header_form }}
{{ page.top_header_form }} </div>
</div> {% endif %}
{% endif %} {% if container_navbar %}
{% 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 }}
</div> </div>
{% endif %}
</nav>
{% endif %} {% endif %}
</div> <nav{{ navbar_attributes }}>
{% if container_navbar %} {% if container_navbar %}
</div> <div class="container">
{% endif %} {% endif %}
</nav> <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 %} {% endblock %}
{% block content %} {% block content %}
<div id="main" class="{{ container }}"> <div id="main" class="{{ container }}">
<div class="row clearfix"> {% if page.breadcrumb %}
{{ page.breadcrumb }} <div class="row">
<main{{ content_attributes }}> {{ page.breadcrumb }}
<section class="section"> </div>
<a id="main-content" tabindex="-1"></a> {% endif %}
{{ page.content }} <div class="row row-offcanvas row-offcanvas-left clearfix">
</section> <main{{ content_attributes }}>
</main> <section class="section">
{% if page.sidebar_first %} <a id="main-content" tabindex="-1"></a>
<div{{ sidebar_first_attributes }}> {{ page.content }}
<aside class="section" role="complementary"> </section>
{{ page.sidebar_first }} </main>
</aside> {% if page.sidebar_first %}
</div> <div{{ sidebar_first_attributes }}>
{% endif %} <aside class="section" role="complementary">
{% if page.sidebar_second %} {{ page.sidebar_first }}
<div{{ sidebar_second_attributes }}> </aside>
<aside class="section" role="complementary"> </div>
{{ page.sidebar_second }} {% endif %}
</aside> {% if page.sidebar_second %}
<div{{ sidebar_second_attributes }}>
<aside class="section" role="complementary">
{{ page.sidebar_second }}
</aside>
</div>
{% endif %}
</div>
</div> </div>
{% endif %}
</div>
</div>
{% endblock %} {% endblock %}
{% block footer %} {% block footer %}
<div class="{{ container }}"> <div class="{{ container }}">
{% if page.footer_first or page.footer_second or page.footer_third or page.footer_fourth %} {% if page.footer_first or page.footer_second or page.footer_third or page.footer_fourth %}
<div class="site-footer__top clearfix"> <div class="site-footer__top clearfix">
{{ page.footer_first }} {{ page.footer_first }}
{{ page.footer_second }} {{ page.footer_second }}
{{ page.footer_third }} {{ page.footer_third }}
{{ page.footer_fourth }} {{ page.footer_fourth }}
</div> </div>
{% endif %} {% endif %}
{% if page.footer_fifth %} {% if page.footer_fifth %}
<div class="site-footer__bottom"> <div class="site-footer__bottom">
{{ page.footer_fifth }} {{ page.footer_fifth }}
</div> </div>
{% endif %} {% endif %}
</div> </div>
{% endblock %} {% endblock %}
templates/layout/page.html.twig
+ 0
− 1
View file @ e7749c2c
...@@ -129,7 +129,6 @@ ...@@ -129,7 +129,6 @@
{{ page.featured_top }} {{ page.featured_top }}
</aside> </aside>
</div> </div>
{% endblock %}
{% endif %} {% endif %}
<div id="main-wrapper" class="layout-main-wrapper clearfix"> <div id="main-wrapper" class="layout-main-wrapper clearfix">
{% block content %} {% block content %}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment