Skip to content
Snippets Groups Projects
Commit c44e20c6 authored by Eva Dale's avatar Eva Dale
Browse files

Merge branch 'canini-3' into 'main'

fixing adv callout boxes not displaying in mobile

See merge request !53
parents adc8b6fc 4970269d
No related branches found
No related tags found
1 merge request!53fixing adv callout boxes not displaying in mobile
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
</div> </div>
{% endif %} {% endif %}
{% if page_content_type != 'page' %} {% if page_content_type == 'landing_page' %}
<!-- Controls --> <!-- Controls -->
<div class="col-12 text-center"> <div class="col-12 text-center">
<a class="btn btn-primary mb-3 mr-1 control-l" href="#carousel-mobile-{{ rand }}" role="button" data-slide="prev"> <a class="btn btn-primary mb-3 mr-1 control-l" href="#carousel-mobile-{{ rand }}" role="button" data-slide="prev">
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
</div> </div>
{% endif %} {% endif %}
{% if page_content_type != 'page' %} {% if page_content_type == 'landing_page' %}
{% if contcount > 4 %} {% if contcount > 4 %}
<!-- Controls --> <!-- Controls -->
<div class="col-6 text-right"> <div class="col-6 text-right">
......
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
{% if page_content_type == 'landing_page' %} {% if page_content_type == 'landing_page' %}
<div class="item {% if loop.first %}active{% endif %}"> <div class="item {% if loop.first %}active{% endif %}">
{% endif %} {% endif %}
{% if page_content_type == 'page' %} {% if page_content_type == 'page' or page_content_type == 'academic_programs' or page_content_type == 'course' or page_content_type == 'departments_centers' or page_content_type == 'event' or page_content_type == 'newsletter_article' or page_content_type == 'news_story' or page_content_type == 'research' %}
<div class="item active"> <div class="item active">
{% endif %} {% endif %}
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
</div> </div>
{% endif %} {% endif %}
{% if page_content_type == 'page' %} {% if page_content_type == 'page' or page_content_type == 'academic_programs' or page_content_type == 'course' or page_content_type == 'departments_centers' or page_content_type == 'event' or page_content_type == 'newsletter_article' or page_content_type == 'news_story' or page_content_type == 'research' %}
{% if content.field_publish_section_title['#items'].value == 1 %} {% if content.field_publish_section_title['#items'].value == 1 %}
<h2 class="sec-title">{{ content.field_column_title3 }}</h2> <h2 class="sec-title">{{ content.field_column_title3 }}</h2>
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
</div> </div>
{% endif %} {% endif %}
{% if page_content_type != 'page' %} {% if page_content_type == 'landing_page' %}
<!-- Controls --> <!-- Controls -->
<div class="col-12 text-center"> <div class="col-12 text-center">
<a class="btn btn-primary mb-3 mr-1 control-l" href="#carousel-mobile-{{ rand }}" role="button" data-slide="prev"> <a class="btn btn-primary mb-3 mr-1 control-l" href="#carousel-mobile-{{ rand }}" role="button" data-slide="prev">
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
</div> </div>
{% endif %} {% endif %}
{% if page_content_type != 'page' %} {% if page_content_type == 'landing_page' %}
{% if contcount > 3 %} {% if contcount > 3 %}
<!-- Controls --> <!-- Controls -->
<div class="col-6 text-right"> <div class="col-6 text-right">
......
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
{% if page_content_type == 'landing_page' %} {% if page_content_type == 'landing_page' %}
<div class="item {% if loop.first %}active{% endif %}"> <div class="item {% if loop.first %}active{% endif %}">
{% endif %} {% endif %}
{% if page_content_type == 'page' %} {% if page_content_type == 'page' or page_content_type == 'academic_programs' or page_content_type == 'course' or page_content_type == 'departments_centers' or page_content_type == 'event' or page_content_type == 'newsletter_article' or page_content_type == 'news_story' or page_content_type == 'research' %}
<div class="item active"> <div class="item active">
{% endif %} {% endif %}
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
</div> </div>
{% endif %} {% endif %}
{% if page_content_type == 'page' %} {% if page_content_type == 'page' or page_content_type == 'academic_programs' or page_content_type == 'course' or page_content_type == 'departments_centers' or page_content_type == 'event' or page_content_type == 'newsletter_article' or page_content_type == 'news_story' or page_content_type == 'research' %}
{% if content.field_publish_section_title['#items'].value == 1 %} {% if content.field_publish_section_title['#items'].value == 1 %}
<h2 class="sec-title">{{ content.field_column_title2 }}</h2> <h2 class="sec-title">{{ content.field_column_title2 }}</h2>
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
</div> </div>
{% endif %} {% endif %}
{% if page_content_type != 'page' %} {% if page_content_type == 'landing_page' %}
<!-- Controls --> <!-- Controls -->
<div class="col-12 text-center"> <div class="col-12 text-center">
<a class="btn btn-primary mb-3 mr-1 control-l" href="#carousel-mobile-{{ rand }}" role="button" data-slide="prev"> <a class="btn btn-primary mb-3 mr-1 control-l" href="#carousel-mobile-{{ rand }}" role="button" data-slide="prev">
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
</div> </div>
{% endif %} {% endif %}
{% if page_content_type != 'page' %} {% if page_content_type == 'landing_page' %}
{% if contcount > 2 %} {% if contcount > 2 %}
<!-- Controls --> <!-- Controls -->
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment