From f318c90a12ff7f8fbde4be29475b782a534d59f6 Mon Sep 17 00:00:00 2001 From: Oleg Kuzava Date: Mon, 16 Apr 2018 13:51:49 +0300 Subject: [PATCH 1/3] Remove deprecation warning in sass 4.0 --- stylesheets/singularitygs/_api.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stylesheets/singularitygs/_api.scss b/stylesheets/singularitygs/_api.scss index 18f5940..c05db85 100644 --- a/stylesheets/singularitygs/_api.scss +++ b/stylesheets/singularitygs/_api.scss @@ -56,11 +56,11 @@ $Right: (); @if $Direction == 'both' or $From == 'left' or ($Direction == 'rtl' and $From == 'opposite') { - $Left: call('output-#{$output-style}', map-merge($Span-Map, ('direction': left))); + $Left: call(get-function('output-#{$output-style}'), map-merge($Span-Map, ('direction': left))); } @if $Direction == 'both' or $From == 'right' or ($Direction == 'ltr' and $From == 'opposite') { - $Right: call('output-#{$output-style}', map-merge($Span-Map, ('direction': right))); + $Right: call(get-function('output-#{$output-style}'), map-merge($Span-Map, ('direction': right))); } $Left-Keys: map-keys($Left); @@ -115,4 +115,4 @@ @include grid-span-build($property, $value); } } -} \ No newline at end of file +} From 01d8d6df6b26598a6388e2735678dd21b38f08c9 Mon Sep 17 00:00:00 2001 From: Oleg Kuzava Date: Mon, 16 Apr 2018 14:18:33 +0300 Subject: [PATCH 2/3] Upgrade node-sass to the latest stable (4.8.3) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5f29ede..8f3a53e 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "diff": "^1.2.1", "fs-extra": "^0.14.0", "glob": "^4.3.2", - "node-sass": "^3.0.0", + "node-sass": "^4.8.3", "semver": "^5.1.0", "yargs": "^4.1.0" }, From 853a63c52f9d83a73362f7b965e305df8bd29cc7 Mon Sep 17 00:00:00 2001 From: Oleg Kuzava Date: Mon, 16 Apr 2018 16:32:46 +0300 Subject: [PATCH 3/3] Support Sass 3.3.x and up --- stylesheets/singularitygs/_api.scss | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/stylesheets/singularitygs/_api.scss b/stylesheets/singularitygs/_api.scss index c05db85..5db6951 100644 --- a/stylesheets/singularitygs/_api.scss +++ b/stylesheets/singularitygs/_api.scss @@ -56,11 +56,19 @@ $Right: (); @if $Direction == 'both' or $From == 'left' or ($Direction == 'rtl' and $From == 'opposite') { - $Left: call(get-function('output-#{$output-style}'), map-merge($Span-Map, ('direction': left))); + @if (function-exists('get-function')) { + $Left: call(get-function('output-#{$output-style}'), map-merge($Span-Map, ('direction': left))); + } @else { + $Left: call('output-#{$output-style}', map-merge($Span-Map, ('direction': left))); + } } @if $Direction == 'both' or $From == 'right' or ($Direction == 'ltr' and $From == 'opposite') { - $Right: call(get-function('output-#{$output-style}'), map-merge($Span-Map, ('direction': right))); + @if (function-exists('get-function')) { + $Right: call(get-function('output-#{$output-style}'), map-merge($Span-Map, ('direction': right))); + } @else { + $Right: call('output-#{$output-style}', map-merge($Span-Map, ('direction': right))); + } } $Left-Keys: map-keys($Left);