diff --git a/bin/upgrade.rb b/bin/upgrade.rb index ba93218..98c6c0b 100755 --- a/bin/upgrade.rb +++ b/bin/upgrade.rb @@ -56,3 +56,7 @@ "mobilePortraitWidth" => "mobile-portrait-width", "mobileLandscapeWidth" => "mobile-landscape-width" } + +variables.each do |key, value| + %x(ruby -p -e "gsub /#{key}/, '#{value}' #{Dir.pwd}#{filename}") +end diff --git a/bower.json b/bower.json index 7a452a9..ea876ab 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "skeleton-sass", - "version": "2.0.0", + "version": "2.0.0-b11", "author": "Dennis Thompson", "homepage": "http://atomicpages.github.io/skeleton-sass/", "repository": { @@ -13,6 +13,7 @@ "url": "http://opensource.org/licenses/MIT" } ], + "main": "", "ignore": [ ".gitignore", "sache.json" diff --git a/skeleton/themes/sphenoid/_base.scss b/skeleton/themes/sphenoid/_base.scss index 69b15fd..82da03d 100644 --- a/skeleton/themes/sphenoid/_base.scss +++ b/skeleton/themes/sphenoid/_base.scss @@ -285,7 +285,7 @@ select { } &:active { border: 1px solid darken(#aaa, 10%); - @include box_shadow(0 0 3px rgba(0,0,0,0.3)); + @include box-shadow(0 0 3px rgba(0,0,0,0.3)); } } select { padding: 0; } diff --git a/skeleton/themes/sphenoid/marrow/_public.scss b/skeleton/themes/sphenoid/marrow/_public.scss index 1312c9d..e430f69 100644 --- a/skeleton/themes/sphenoid/marrow/_public.scss +++ b/skeleton/themes/sphenoid/marrow/_public.scss @@ -42,12 +42,18 @@ // @see https://developer.mozilla.org/en-US/docs/Web/CSS/box-shadow // @box-shadow ( [ none | inset? && [ ? ? ? ] ] ] ) -@mixin box_shadow($shadow) { +@mixin box-shadow($shadow...) { + @if length($shadow) > 4 { + @warn("$shadow should only accept four argument for each side of the box. Using more may cause undesired results"); + } @include prefixer(box-shadow, $shadow, webkit moz ms o spec); } // @border-radius ( $radii... ) @mixin border-radius($radii...) { + @if length($shadow) > 4 { + @warn("$radii should only accept four argument for each side of the box. Using more may cause undesired results"); + } @include prefixer(border-radius, $radii, webkit moz ms o spec); } @@ -119,9 +125,8 @@ @include prefixer(transition, $transition, webkit moz ms o spec); } -// @transition ( list $transition ) -@mixin transition($transition) { - $transition: unquote($transition); //this helps with multiple tansitions +// @transition ( list $transition... ) +@mixin transition($transition...) { @include prefixer(transition, $transition, webkit moz ms o spec); }