Narrow and wide campaign stuff.

MozillaFoundation · May 28, 2018 · 4f7e00a · 4f7e00a
1 parent d11f998
commit 4f7e00a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 19 deletions.
diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/campaign_page.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/campaign_page.html
@@ -3,11 +3,13 @@
 
 {% block subcontent %}
 <div class="row">
-    <div class="cms{% if page.cta and uses_menu == False %}
+    <div class="cms
+      {% if page.cta and uses_menu == False and page.specific.narrowed_page_content == False %}
         col-lg-7
-    {% else %}
+      {% else %}
         col-12
-    {% endif %}{% if uses_menu and page.narrowed_page_content %} col-md-9{% endif %}">
+      {% endif %}"
+    >
 
       {% block html_content %}
         {% for block in page.body %}
@@ -21,16 +23,22 @@ <h1>{{ block.value }}</h1>
     </div>
 
     {% if page.cta != None %}
-    <div class="cta col-lg-{% if uses_menu == False %}4 offset-lg-1{% else %}12{% endif %}">
-        <div class="narrow-sticky-button-container hidden">
-          <a href="#cta-anchor" class="narrow-sticky-button btn">TAKE ACTION</a>
+    <div class="cta
+      {% if uses_menu == False and page.specific.narrowed_page_content == False %}
+        col-lg-4 offset-lg-1
+      {% else %}
+        col-lg-12
+      {% endif %}"
+    >
+      <div class="narrow-sticky-button-container hidden">
+        <a href="#cta-anchor" class="narrow-sticky-button btn">TAKE ACTION</a>
+      </div>
+      <div class="sticky-cta">
+        <div id="cta-anchor">
+          {% cta page %}
         </div>
-        <div class="sticky-cta">
-          <div id="cta-anchor">
-            {% cta page %}
-          </div>
-        </div>
-        <script src="https://c.shpg.org/352/sp.js"></script>
+      </div>
+      <script src="https://c.shpg.org/352/sp.js"></script>
     </div>
     {% endif %}
 </div>

diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/mini_site_name_space.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/mini_site_name_space.html
@@ -18,14 +18,15 @@
 
 {% block heading_classes %}
   py-5
-  {% if uses_menu == False %}
-    col-{% if page.specific.narrowed_page_content %}md-8
-      offset-md-2{% else %}12{% endif %}
-    col-lg-12
-  {% else %}
-    col-{% if page.specific.narrowed_page_content %}md-8
-      offset-md-0{% else %}12{% endif %}
+  {% if page.specific.narrowed_page_content and uses_menu %}
+    col-md-7
+  {% elif page.specific.narrowed_page_content %}
+    offset-md-2
+    col-md-8
+  {% elif uses_menu %}
     col-md-9
+  {% else %}
+    col-md-12
   {% endif %}
 {% endblock %}