Merge pull request #60 from ASCWebServices/canini

asc_bootstrap - sass updates, contactinfo address fix, allout boxes a…

web/themes/asc_bootstrap/assets/sass/components/_paragraphs.scss

@@ -260,7 +260,7 @@
           @media (max-width: 768px) {
             display: block;
             width: 100%;
-            margin: 0;
+            margin: 0 0 8px 0;
             font-weight: 700;
           }
         }
@@ -298,7 +298,7 @@
           @media (max-width: 768px) {
             display: block;
             width: 100%;
-            margin: 0;
+            margin: 0 0 8px 0;
             font-weight: 700;
           }
         }
@@ -336,7 +336,7 @@
           @media (max-width: 768px) {
             display: block;
             width: 100%;
-            margin: 0;
+            margin: 0 0 8px 0;
             font-weight: 700;
           }
         }

web/themes/asc_bootstrap/css/style.css

@@ -10918,7 +10918,7 @@ article .field--name-body {
   .slide-txt-container .slide-txt .slide-txt-wrapper .btn-links-19 .btn-wrapper {
     display: block;
     width: 100%;
-    margin: 0;
+    margin: 0 0 8px 0;
     font-weight: 700;
   }
 }
@@ -10958,7 +10958,7 @@ article .field--name-body {
   .slide-txt-container .slide-txt .slide-txt-wrapper .btn-links-18 .btn-wrapper {
     display: block;
     width: 100%;
-    margin: 0;
+    margin: 0 0 8px 0;
     font-weight: 700;
   }
 }
@@ -10998,7 +10998,7 @@ article .field--name-body {
   .slide-txt-container .slide-txt .slide-txt-wrapper .btn-links-17 .btn-wrapper {
     display: block;
     width: 100%;
-    margin: 0;
+    margin: 0 0 8px 0;
     font-weight: 700;
   }
 }

web/themes/asc_bootstrap/templates/block/block--contactinfo.html.twig

@@ -48,11 +48,11 @@
 <div class="footer-address">
   <h3>Contact Us</h3>
   <p>
-    {% if content.field_address1.0 %}
+    {% if content.field_address_line1.0 %}
       {{ content.field_address_line1.0 }}<br/>
     {% endif %}
 
-    {% if content.field_address2.0 %}
+    {% if content.field_address_line2.0 %}
       {{ content.field_address_line2.0 }}<br/>
     {% endif %}
 

web/themes/asc_bootstrap/templates/paragraph/paragraph--call-out-boxes-three.html.twig

@@ -39,6 +39,9 @@
 {# Setting up variable that determines the background color for section #}
 {% set bgcolor = content.field_background_color['#items'].getString() %}
 
+{% if bgcolor == ''%}
+  {% set bgcolor = 'transparent-bg' %}
+{% endif %}
 
 {# Prints div with classes, and content without Width and Background. #}
 <div{{ attributes.addClass(classes) }}>

web/themes/asc_bootstrap/templates/paragraph/paragraph--call-out-boxes-two.html.twig

@@ -40,6 +40,9 @@
 {# Setting up variable that determines the background color for section #}
 {% set bgcolor = content.field_background_color['#items'].getString() %}
 
+{% if bgcolor == ''%}
+  {% set bgcolor = 'transparent-bg' %}
+{% endif %}
 
 {# Prints div with classes, and content without Width and Background. #}
 <div{{ attributes.addClass(classes) }}>

web/themes/asc_bootstrap/templates/paragraph/paragraph--fun-facts.html.twig

@@ -39,6 +39,9 @@
 {# Setting up variable that determines the background color for section #}
 {% set bgcolor = content.field_background_color['#items'].getString() %}
 
+{% if bgcolor == ''%}
+  {% set bgcolor = 'transparent-bg' %}
+{% endif %}
 
 {# Prints div with classes, and content without Width and Background. #}
 <div{{ attributes.addClass(classes) }}>

web/themes/asc_bootstrap/templates/system/page.html.twig

@@ -117,7 +117,7 @@
 
       </section>
 
-      {% if (page.sidemenu or page.sidebar_second) %}
+      {% if page.sidebar_menu or page.sidebar_second %}
         <aside class="col-sm-3" role="complementary">
           {# Sidebar Second #}
           {% if page.sidebar_menu %}