Merge pull request #163 from SLAC/SLACDP22-433-section-padding

[SLACDP22-433] Default to adding vertical padding if paragraph is not…
SLAC · Mar 30, 2023 · 96665ec · 96665ec
2 parents 5eefd9c + af25484
commit 96665ec
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 11 deletions.
diff --git a/source/02-layouts/section/_section.scss b/source/02-layouts/section/_section.scss
@@ -145,16 +145,34 @@
         .l-section--yellow,
         .l-section--purple,
         .l-section--blue,
-        .l-section--gray-white,
         .l-section--white-gray,
         .l-section--gray
       )
   ) {
-  & + & {
+  &:first-of-type {
+    padding-top: 0;
+  }
+
+  + :is(
+      .l-section--white,
+      .l-section:not(
+          .l-section--purple-black,
+          .l-section--blue-green,
+          .l-section--yellow,
+          .l-section--purple,
+          .l-section--blue,
+          .l-section--gray-white,
+          .l-section--gray
+        )
+    ) {
     padding-top: 0;
   }
 
   @include breakpoint-min(gesso-breakpoint(desktop)) {
+    &:first-of-type {
+      padding-top: 0;
+    }
+
     & + & {
       padding-top: 0;
     }

diff --git a/templates/paragraph/paragraph--accordion.html.twig b/templates/paragraph/paragraph--accordion.html.twig
@@ -50,7 +50,6 @@
 {% if is_nested %}{{ accordion }}{% else %}
   {% include '@layouts/section/section.twig' with {
     'section_content': accordion,
-    'modifier_classes': 'l-section--no-padding',
     'has_constrain': true
   } %}
 {% endif %}
diff --git a/templates/paragraph/paragraph--content-embed.html.twig b/templates/paragraph/paragraph--content-embed.html.twig
@@ -43,7 +43,6 @@
 {% if is_nested %}{{ paragraph_content }}{% else %}
   {% include '@layouts/section/section.twig' with {
     section_content: paragraph_content,
-    modifier_classes: 'l-section--no-padding',
     has_constrain: true
   } %}
 {% endif %}

diff --git a/templates/paragraph/paragraph--embed-full-html-.html.twig b/templates/paragraph/paragraph--embed-full-html-.html.twig
@@ -7,7 +7,6 @@
 {% if is_nested %}{{ embed }}{% else %}
   {% include '@layouts/section/section.twig' with {
     section_content: embed,
-    modifier_classes: 'l-section--no-padding',
     has_constrain: true
   } %}
 {% endif %}
diff --git a/templates/paragraph/paragraph--fifty-fifty.html.twig b/templates/paragraph/paragraph--fifty-fifty.html.twig
@@ -48,7 +48,6 @@
 {% if is_nested %}{{ paragraph_content }}{% else %}
   {% include '@layouts/section/section.twig' with {
     'section_content': paragraph_content,
-    'modifier_classes': 'l-section',
     'has_constrain': true
   } %}
 {% endif %}

diff --git a/templates/paragraph/paragraph--media-grid--default.html.twig b/templates/paragraph/paragraph--media-grid--default.html.twig
@@ -47,7 +47,6 @@
 {% if is_nested %}{{ media_grid }}{% else %}
   {% include '@layouts/section/section.twig' with {
     section_content: media_grid,
-    modifier_classes: 'l-section l-section--padding-bottom',
     has_constrain: true
   } %}
 {% endif %}
diff --git a/templates/paragraph/paragraph--overlap-image.html.twig b/templates/paragraph/paragraph--overlap-image.html.twig
@@ -92,7 +92,6 @@
 {% else %}
   {% include '@layouts/section/section.twig' with {
     section_content: overlap_image,
-    modifier_classes: 'l-section--no-padding',
     has_constrain: true
   } %}
 {% endif %}

diff --git a/templates/paragraph/paragraph--quote.html.twig b/templates/paragraph/paragraph--quote.html.twig
@@ -12,7 +12,6 @@
 {% if is_nested %}{{ quote }}{% else %}
   {% include '@layouts/section/section.twig' with {
     section_content: quote,
-    modifier_classes: 'l-section--no-padding',
     has_constrain: true
   } %}
 {% endif %}
diff --git a/templates/paragraph/paragraph--tabs.html.twig b/templates/paragraph/paragraph--tabs.html.twig
@@ -46,7 +46,6 @@
 {% if is_nested %}{{ paragraph_content }}{% else %}
   {% include '@layouts/section/section.twig' with {
     section_content: paragraph_content,
-    modifier_classes: 'l-section--no-padding',
     has_constrain: true
   } %}
 {% endif %}

diff --git a/templates/paragraph/paragraph--wysiwyg.html.twig b/templates/paragraph/paragraph--wysiwyg.html.twig
@@ -49,6 +49,5 @@
   {% include '@layouts/section/section.twig' with {
     section_content: wysiwyg,
     has_constrain: true,
-    modifier_classes: 'l-section--no-padding'
   } %}
 {% endif %}