From: Nicolas Coden Date: Tue, 8 Nov 2016 01:36:20 +0000 (+0100) Subject: Sass lint: Sort grid properties X-Git-Tag: v6.3-rc1~18^2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ee5b7871f0bb726880d0ff6182690a11d97332d;p=thirdparty%2Ffoundation%2Ffoundation-sites.git Sass lint: Sort grid properties Sort grid properties following the Specific property sort order. But keep `margin`/`padding` `-left` before `-right` for now. See : https://gist.github.com/ncoden/d42f55df7c7970f548a02cd3468f9c86 --- diff --git a/scss/grid/_classes.scss b/scss/grid/_classes.scss index 2f3a999a1..e29759dfa 100644 --- a/scss/grid/_classes.scss +++ b/scss/grid/_classes.scss @@ -83,10 +83,10 @@ // To properly nest a column row, padding and margin is removed .#{$row} .#{$column}.#{$row}.#{$row} { - padding-left: 0; - padding-right: 0; margin-left: 0; margin-right: 0; + padding-left: 0; + padding-right: 0; } @include -zf-each-breakpoint { diff --git a/scss/grid/_flex-grid.scss b/scss/grid/_flex-grid.scss index 3a191d4bc..fc94825c9 100644 --- a/scss/grid/_flex-grid.scss +++ b/scss/grid/_flex-grid.scss @@ -193,10 +193,10 @@ // To properly nest a column row, padding and margin is removed .row .column.row.row { - padding-left: 0; - padding-right: 0; margin-left: 0; margin-right: 0; + padding-left: 0; + padding-right: 0; } @include -zf-each-breakpoint { diff --git a/scss/grid/_layout.scss b/scss/grid/_layout.scss index 41019b87e..03911e6a2 100644 --- a/scss/grid/_layout.scss +++ b/scss/grid/_layout.scss @@ -20,8 +20,8 @@ $gutter: null ) { & > #{$selector} { - width: percentage(1/$n); float: $global-left; + width: percentage(1/$n); // If a $gutter value is passed @if($gutter) { diff --git a/scss/grid/_position.scss b/scss/grid/_position.scss index a832a1387..90a1aa50f 100644 --- a/scss/grid/_position.scss +++ b/scss/grid/_position.scss @@ -32,9 +32,9 @@ /// Reset a position definition. @mixin grid-column-unposition { position: static; + float: left; margin-left: 0; margin-right: 0; - float: left; } /// Offsets a column to the right by `$n` columns.