Merge pull request #2250 from ymcatwincities/8.x-2.x

update upstream
ymcatwincities · Oct 20, 2020 · 375ad15 · 375ad15
2 parents 6b645b1 + 73f6c5b
commit 375ad15
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/themes/openy_themes/openy_rose/templates/node/node--landing-page--full.html.twig b/themes/openy_themes/openy_rose/templates/node/node--landing-page--full.html.twig
@@ -119,19 +119,7 @@
 
     {% if content.field_content|render|trim is not empty %}
       <div{{ content_attributes.addClass(content_classes) }}>
-        {% if node.field_lp_layout.value == "one_column" %}
-          <div class="main-region col-sm-12">
-            {{ content.field_content }}
-            {% if content.addthis is not empty %}
-              {{ content.addthis }}
-            {% endif %}
-            {% if content.field_sidebar_content.0 %}
-              <aside{{ sidebar_attributes.addClass(sidebar_classes) }}>
-                {{ content.field_sidebar_content }}
-              </aside>
-            {% endif %}
-          </div>
-        {% elseif ( node.field_lp_layout.value == "two_column" ) or ( node.field_lp_layout.value == "two_column_fixed" ) %}
+        {% if ( node.field_lp_layout.value == "two_column" ) or ( node.field_lp_layout.value == "two_column_fixed" ) %}
           <div class="two-column">
             <div class="main-region col-sm-8">
               {{ content.field_content }}
@@ -163,6 +151,18 @@
               {% endif %}
             </div>
           </div>
+        {% else %}
+          <div class="main-region{{ node.field_lp_layout.value == "one_column" ? ' col-sm-12' : '' }}">
+            {{ content.field_content }}
+            {% if content.addthis is not empty %}
+              {{ content.addthis }}
+            {% endif %}
+            {% if content.field_sidebar_content.0 %}
+              <aside{{ sidebar_attributes.addClass(sidebar_classes) }}>
+                {{ content.field_sidebar_content }}
+              </aside>
+            {% endif %}
+          </div>
         {% endif %}
       </div>
     {% endif %}