From 2cfffa22c1e3455715e34500382bdbcfc02a7938 Mon Sep 17 00:00:00 2001
From: Brian Canini <canini.16@osu.edu>
Date: Tue, 11 Jan 2022 15:57:42 -0500
Subject: [PATCH] adv callout basic page mobile fix
---
.../paragraph--columns_four.html.twig | 25 +++++--------------
.../paragraph--columns_three.html.twig | 21 +++++-----------
.../paragraph--columns_two.html.twig | 22 ++++++++++------
3 files changed, 26 insertions(+), 42 deletions(-)
diff --git a/web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_four.html.twig b/web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_four.html.twig
index 5bd5b02bc9..25535d1b2b 100644
--- a/web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_four.html.twig
+++ b/web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_four.html.twig
@@ -76,14 +76,17 @@
{% set contcount = thecont|length - 17 %}
<div id="carousel-mobile-{{ rand }}" class="carousel slide adv-callout-carousel adv-callout-mobile" data-ride="false" data-interval="0">
+
{% if page_content_type == 'landing_page' %}
<div class="container">
+{% endif %}
+
<div class="carousel-inner adv-call-mob-inner" role="listbox">
{% for item in thecont|slice(0, contcount) %}
<div class="item {% if loop.first %}active{% endif %}">
- <div class="col-xs-12 col-adv-call-mobile">
+ <div class="col-xs-12">
<div class="card">
{{ thecont[loop.index0] }}
</div>
@@ -91,28 +94,12 @@
</div>
{% endfor %}
-{% endif %}
-{% if page_content_type == 'page' %}
- <div class="{{ leftwidth }} col-l adv-call-mobile-bl">
- {{ thecont[0] }}
- </div>
-
- <div class="{{ middlewidth }} col-m adv-call-mobile-bm">
- {{ thecont[1] }}
- </div>
- <div class="{{ middlewidth }} col-m adv-call-mobile-bm">
- {{ thecont[2] }}
- </div>
+ </div>
- <div class="{{ rightwidth }} col-r adv-call-mobile-br">
- {{ thecont[3] }}
- </div>
-{% endif %}
{% if page_content_type == 'landing_page' %}
- </div>
-{% endif %}
</div>
+{% endif %}
{% if page_content_type != 'page' %}
<!-- Controls -->
diff --git a/web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_three.html.twig b/web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_three.html.twig
index f970f3b5f8..db2793d8b3 100644
--- a/web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_three.html.twig
+++ b/web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_three.html.twig
@@ -98,14 +98,17 @@
{% set contcount = thecont|length - 17 %}
<div id="carousel-mobile-{{ rand }}" class="carousel slide adv-callout-carousel adv-callout-mobile" data-ride="false" data-interval="0">
+
{% if page_content_type == 'landing_page' %}
<div class="container">
+{% endif %}
+
<div class="carousel-inner adv-call-mob-inner" role="listbox">
{% for item in thecont|slice(0, contcount) %}
<div class="item {% if loop.first %}active{% endif %}">
- <div class="col-xs-12 col-adv-call-mobile">
+ <div class="col-xs-12">
<div class="card">
{{ thecont[loop.index0] }}
</div>
@@ -113,24 +116,12 @@
</div>
{% endfor %}
-{% endif %}
-{% if page_content_type == 'page' %}
- <div class="{{ leftwidth }} col-l adv-call-mobile-bl">
- {{ thecont[0] }}
- </div>
- <div class="{{ middlewidth }} col-m adv-call-mobile-bm">
- {{ thecont[1] }}
- </div>
+ </div>
- <div class="{{ rightwidth }} col-r adv-call-mobile-br">
- {{ thecont[2] }}
- </div>
-{% endif %}
{% if page_content_type == 'landing_page' %}
- </div>
-{% endif %}
</div>
+{% endif %}
{% if page_content_type != 'page' %}
<!-- Controls -->
diff --git a/web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_two.html.twig b/web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_two.html.twig
index 6773ebb2d3..3b9c9c2e54 100644
--- a/web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_two.html.twig
+++ b/web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_two.html.twig
@@ -96,18 +96,14 @@
{% if thecont[0]['#paragraph'].type.target_id == 'advanced_callout_box' %}
{% set contcount = thecont|length - 17 %}
- <div id="carousel-mobile-{{ rand }}" class="carousel slide adv-callout-carousel adv-callout-mobile" data-ride="false" data-interval="0">
-
{% if page_content_type == 'landing_page' %}
+ <div id="carousel-mobile-{{ rand }}" class="carousel slide adv-callout-carousel adv-callout-mobile" data-ride="false" data-interval="0">
<div class="container">
-{% endif %}
-
<div class="carousel-inner adv-call-mob-inner" role="listbox">
-
{% for item in thecont|slice(0, contcount) %}
<div class="item {% if loop.first %}active{% endif %}">
- <div class="col-xs-12">
+ <div class="col-xs-12 col-adv-call-mobile">
<div class="card">
{{ thecont[loop.index0] }}
</div>
@@ -115,10 +111,18 @@
</div>
{% endfor %}
+{% endif %}
+{% if page_content_type == 'page' %}
+ <div class="{{ leftwidth }} col-l adv-call-mobile-bl">
+ {{ thecont[0] }}
+ </div>
- </div>
-
+ <div class="{{ rightwidth }} col-r adv-call-mobile-br">
+ {{ thecont[1] }}
+ </div>
+{% endif %}
{% if page_content_type == 'landing_page' %}
+ </div>
</div>
{% endif %}
@@ -133,7 +137,9 @@
</a>
</div>
{% endif %}
+{% if page_content_type != 'page' %}
</div>
+{% endif %}
{# Advanced Callout box desktop #}
--
GitLab