From: Kevin Ball Date: Fri, 2 Dec 2016 23:15:39 +0000 (-0800) Subject: Remove scss items marked for removal in 6.3 X-Git-Tag: v6.3.0-rc2~3^2~2^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9437%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git Remove scss items marked for removal in 6.3 --- diff --git a/scss/_global.scss b/scss/_global.scss index cb9753023..e23f65b8d 100644 --- a/scss/_global.scss +++ b/scss/_global.scss @@ -109,10 +109,6 @@ $success-color: map-get($foundation-palette, success); $warning-color: map-get($foundation-palette, warning); $alert-color: map-get($foundation-palette, alert); -// Remove this in 6.3 -$-zf-menu-icon-imported: false; -$-zf-flex-classes-imported: false; - @mixin foundation-global-styles { @include -zf-normalize; diff --git a/scss/grid/_flex-grid.scss b/scss/grid/_flex-grid.scss index fa76956fa..a43774d1a 100644 --- a/scss/grid/_flex-grid.scss +++ b/scss/grid/_flex-grid.scss @@ -125,29 +125,6 @@ } } -/// Changes the source order of a flex grid column. Columns with lower numbers appear first in the layout. -/// @param {Number} $order [0] - Order number to apply. -@mixin flex-grid-order($order: 0) { - @warn 'This mixin is being replaced by flex-order(). flex-grid-order() will be removed in Foundation 6.3.'; - @include flex-order($order); -} - -/// Horizontally or vertically aligns the columns within a flex row. Apply this mixin to a flex row. -/// -/// @param {Keyword} $x [null] - Horizontal alignment to use. Can be `left`, `right`, `center`, `justify`, or `spaced`. Or, set it to `null` (the default) to not set horizontal alignment. -/// @param {Keyword} $y [null] - Vertical alignment to use. Can be `top`, `bottom`, `middle`, or `stretch`. Or, set it to `null` (the default) to not set vertical alignment. -@mixin flex-grid-row-align($x: null, $y: null) { - @warn 'This mixin is being replaced by flex-align(). flex-grid-row-align() will be removed in Foundation 6.3.'; - @include flex-align($x, $y); -} - -/// Vertically align a single column within a flex row. Apply this mixin to a flex column. -/// -/// @param {Keyword} $y [null] - Vertical alignment to use. Can be `top`, `bottom`, `middle`, or `stretch`. Or, set it to `null` (the default) to not set vertical alignment. -@mixin flex-grid-column-align($y: null) { - @warn 'This mixin is being replaced by flex-align-self(). flex-grid-column-align() will be removed in Foundation 6.3.'; - @include flex-align-self($y); -} @mixin foundation-flex-grid { // Row @@ -308,14 +285,6 @@ max-width: 100%; } - // Vertical alignment using align-items and align-self - // Remove these in 6.3 - @each $vdir, $prop in $-zf-flex-align { - .column.align-#{$vdir} { - @include flex-align-self($vdir); - } - } - .columns { @extend .column; // sass-lint:disable-line placeholder-in-extend diff --git a/scss/grid/_grid.scss b/scss/grid/_grid.scss index eab0dc1c8..23fd33f89 100644 --- a/scss/grid/_grid.scss +++ b/scss/grid/_grid.scss @@ -33,14 +33,6 @@ $block-grid-max: 8 !default; // Internal value to store the end column float direction $-zf-end-float: if($grid-column-align-edge, $global-right, $global-left); -// The last piece to transition the responsive gutter feature -// Remove this in 6.3 -$grid-column-responsive-gutter: null !default; -@if $grid-column-responsive-gutter { - @warn 'Rename $grid-column-responsive-gutter to $grid-column-gutter to remove this warning.'; - $grid-column-gutter: $grid-column-responsive-gutter; -} - @import 'row'; @import 'column'; @import 'size'; diff --git a/scss/util/_breakpoint.scss b/scss/util/_breakpoint.scss index 50f6f22b9..fc2b6db53 100644 --- a/scss/util/_breakpoint.scss +++ b/scss/util/_breakpoint.scss @@ -248,19 +248,6 @@ $breakpoint-classes: (small medium large) !default; } } -// Legacy breakpoint variables -// These will be removed in 6.3 -$small-up: null; -$small-only: null; -$medium-up: null; -$medium-only: null; -$large-up: null; -$large-only: null; -$xlarge-up: null; -$xlarge-only: null; -$xxlarge-up: null; -$xxlarge-only: null; - @if map-has-key($breakpoints, small) { $small-up: screen; $small-only: unquote('screen and #{breakpoint(small only)}');