From 4cfbbda56b139e3f77d4f083b688e67f712c628b Mon Sep 17 00:00:00 2001 From: Geoff Kimball Date: Wed, 17 Feb 2016 11:58:24 -0800 Subject: [PATCH] Remove deprecation warnings around new CSS export mixins, as it's hard to accurately guess if the user imported them or not --- scss/components/_flex.scss | 2 -- scss/components/_menu-icon.scss | 2 -- scss/components/_title-bar.scss | 6 ------ scss/grid/_flex-grid.scss | 7 +------ scss/grid/_grid.scss | 2 +- 5 files changed, 2 insertions(+), 17 deletions(-) diff --git a/scss/components/_flex.scss b/scss/components/_flex.scss index d2de620a2..36123952d 100644 --- a/scss/components/_flex.scss +++ b/scss/components/_flex.scss @@ -1,6 +1,4 @@ @mixin foundation-flex-classes { - $-zf-flex-classes-imported: true !global; - // Horizontal alignment using justify-content @each $hdir, $prop in map-remove($-zf-flex-justify, left) { .align-#{$hdir} { diff --git a/scss/components/_menu-icon.scss b/scss/components/_menu-icon.scss index e8f1e4e4b..b0df173bb 100644 --- a/scss/components/_menu-icon.scss +++ b/scss/components/_menu-icon.scss @@ -1,6 +1,4 @@ @mixin foundation-menu-icon { - $-zf-menu-icon-imported: true !global; - .menu-icon { @include hamburger($color: $titlebar-icon-color, $color-hover: $titlebar-icon-color-hover); } diff --git a/scss/components/_title-bar.scss b/scss/components/_title-bar.scss index eb194c962..8a268802a 100644 --- a/scss/components/_title-bar.scss +++ b/scss/components/_title-bar.scss @@ -83,12 +83,6 @@ $titlebar-icon-spacing: 0.25rem !default; display: inline-block; } - // Remove this in 6.3 - @if not $-zf-menu-icon-imported { - @warn 'In Foundation 6.2, a new component mixin was added called "foundation-menu-icon". Add "@import foundation-menu-icon" to the main Sass file of your project to remove this warning.'; - @include foundation-menu-icon; - } - .menu-icon.dark { @include hamburger; } diff --git a/scss/grid/_flex-grid.scss b/scss/grid/_flex-grid.scss index 57bd815dd..71fe71feb 100644 --- a/scss/grid/_flex-grid.scss +++ b/scss/grid/_flex-grid.scss @@ -197,6 +197,7 @@ .#{$-zf-size}-order-#{$i} { @include flex-order($i); } + .#{$-zf-size}-up-#{$i} { @include flex-grid-layout($i); } @@ -261,10 +262,4 @@ // scss-lint:disable PlaceholderInExtend @extend .column; } - - // Remove this in 6.3 - @if not $-zf-flex-classes-imported { - @warn 'In Foundation 6.2, a new component mixin was added called "foundation-flex-classes". Add "@import foundation-flex-classes" to the main Sass file of your project, above "@import foundation-flex-grid", to remove this warning.'; - @include foundation-flex-classes; - } } diff --git a/scss/grid/_grid.scss b/scss/grid/_grid.scss index 646cdaab6..0a8d879cf 100644 --- a/scss/grid/_grid.scss +++ b/scss/grid/_grid.scss @@ -38,7 +38,7 @@ $-zf-end-float: if($grid-column-align-edge, $global-right, $global-left); $grid-column-responsive-gutter: null !default; @if $grid-column-responsive-gutter { // scss-lint:disable DebugStatement - @debug 'Rename $grid-column-responsive-gutter to $grid-column-gutter to remove this warning.'; + @warn 'Rename $grid-column-responsive-gutter to $grid-column-gutter to remove this warning.'; $grid-column-gutter: $grid-column-responsive-gutter; } -- 2.47.2