From: Joe Workman <joe@workmanmail.com>
Date: Mon, 20 Jul 2020 19:34:40 +0000 (-0700)
Subject: Merge branch 'chore/upgrade-dependencies' into v2.3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=266c781e42588032934e41bd3dbfcc42ec385e79;p=thirdparty%2Ffoundation%2Ffoundation-emails.git

Merge branch 'chore/upgrade-dependencies' into v2.3
---

266c781e42588032934e41bd3dbfcc42ec385e79
diff --cc docs/pages/grid.md
index f072f536,42e9524e..77d0bbf2
--- a/docs/pages/grid.md
+++ b/docs/pages/grid.md
@@@ -95,12 -95,10 +95,12 @@@ The `.expander` prevents a rendering bu
  
  Collapsing a row removes the gutters from every column, which is the spacing between them. Add the class `.collapse` to a row to enable this.
  
 +There are more utility classes that you can use to isolate and collapse portions of your layouts: `.collapse-top` `.collapse-bottom` `.collapse-left` `.collapse-right` `.collapse-border` `.collapse-gutter`
 +
  ```inky_example
  <row class="collapse">
-   <columns large="6"><img src="http://placehold.it/300x150/777777/&text=These columns touch" alt=""></columns>
-   <columns large="6"><img src="http://placehold.it/300x150/999999/&text=These columns touch" alt=""></columns>
+   <columns large="6"><img src="https://placehold.it/300x150/777777/&text=These columns touch" alt=""></columns>
+   <columns large="6"><img src="https://placehold.it/300x150/999999/&text=These columns touch" alt=""></columns>
  </row>
  ```
  
diff --cc scss/components/_media-query.scss
index 206bd2d1,983df61b..06f38400
--- a/scss/components/_media-query.scss
+++ b/scss/components/_media-query.scss
@@@ -25,9 -25,11 +25,9 @@@
    table.body .columns,
    table.body .column {
      height: auto !important;
 -    -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,