]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Merge branch 'v6.3' of git://github.com/sethkane/foundation-sites into sethkane-v6.3
authorKevin Ball <kmball11@gmail.com>
Fri, 21 Oct 2016 22:50:40 +0000 (15:50 -0700)
committerKevin Ball <kmball11@gmail.com>
Fri, 21 Oct 2016 22:50:40 +0000 (15:50 -0700)
1  2 
docs/partials/off-canvi.html
js/foundation.util.nest.js
scss/components/_menu.scss
scss/grid/_flex-grid.scss

index 2a8a09b6068c456176aa83ce6c484b161a40baa7,d225457dec3aec6525d1e9a31165ef9c1e7e7361..a37a5f06e412764cd1ac1dfd949fb0489cbe372f
@@@ -43,7 -43,7 +43,6 @@@
          <li><a href="http://foundation.zurb.com/learn/responsive-reading.html">Responsive Reading</a></li>
        </ul>
      </li>
 -    
      <li>
        <a href="http://foundation.zurb.com/get-involved/support.html">Get Involved</a>
        <ul class="submenu menu vertical" data-submenu>
Simple merge
Simple merge
index bf9c92636d6a0a31db90afef05854cefaa10fc1f,d6d4016f085e81f539a955c50ff4d7e3421642d1..febd8d45ba312205b4bf0c0124fd385197a8f215
  
  /// Creates a column for a flex grid. By default, the column will stretch to the full width of its container, but this can be overridden with sizing classes, or by using the `unstack` class on the parent flex row.
  ///
 -/// @param {Mixed} $columns [null] - Width of the column. Refer to the `flex-grid-column()` function to see possible values.
 +/// @param {Mixed} $columns [expand] - Width of the column. Refer to the `flex-grid-column()` function to see possible values.
  /// @param {Number} $gutter [$grid-column-gutter] - Space between columns, added as a left and right padding.
  @mixin flex-grid-column(
 -  $columns: null,
 -  $gutter: $grid-column-gutter
 +  $columns: expand,
 +  $gutters: $grid-column-gutter
  ) {
    // Base properties
-   @include flex-grid-size($columns);
+   flex: flex-grid-column($columns);
  
    // Gutters
 -  @if type-of($gutter) == 'map' {
 -    @each $breakpoint, $value in $gutter {
 -      $padding: rem-calc($value) / 2;
 -
 -      @include breakpoint($breakpoint) {
 -        padding-left: $padding;
 -        padding-right: $padding;
 -      }
 -    }
 -  }
 -  @else if type-of($gutter) == 'number' and strip-unit($gutter) > 0 {
 -    $padding: rem-calc($gutter) / 2;
 -    padding-left: $padding;
 -    padding-right: $padding;
 -  }
 +  @include grid-column-gutter($gutters: $gutters);
  
    // fixes recent Chrome version not limiting child width
    // https://stackoverflow.com/questions/34934586/white-space-nowrap-and-flexbox-did-not-work-in-chrome