From: Stadly <magnar@myrtveit.com>
Date: Thu, 25 Mar 2021 08:29:41 +0000 (+0100)
Subject: Merge branch 'develop' into Fix-responsive-padding-for-nested-columns
X-Git-Tag: v2.4.0^2~47^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1050%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-emails.git

Merge branch 'develop' into Fix-responsive-padding-for-nested-columns
---

477c42260b666f130d43f3beab4f2eafe0646eb1
diff --cc scss/components/_media-query.scss
index 5e794f98,193ea6f7..e99488c2
--- a/scss/components/_media-query.scss
+++ b/scss/components/_media-query.scss
@@@ -28,8 -28,15 +28,8 @@@
      -moz-box-sizing: border-box;
      -webkit-box-sizing: border-box;
      box-sizing: border-box;
-     padding-left: $global-gutter !important;
-     padding-right: $global-gutter !important;
+     padding-left: $global-gutter-small !important;
+     padding-right: $global-gutter-small !important;
 -
 -    // Nested columns won't double the padding
 -    .column,
 -    .columns {
 -      padding-left: 0 !important;
 -      padding-right: 0 !important;
 -    }
    }
  
    // Collpased columns have no gutter.