Skip to content

Commit

Permalink
2.0.0-b11
Browse files Browse the repository at this point in the history
Fixed a few issues in the theme-scoped mixins.
  • Loading branch information
Dennis committed Jul 24, 2014
1 parent 2d885cd commit 444075c
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 6 deletions.
4 changes: 4 additions & 0 deletions bin/upgrade.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand All @@ -13,6 +13,7 @@
"url": "http://opensource.org/licenses/MIT"
}
],
"main": "",
"ignore": [
".gitignore",
"sache.json"
Expand Down
2 changes: 1 addition & 1 deletion skeleton/themes/sphenoid/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
13 changes: 9 additions & 4 deletions skeleton/themes/sphenoid/marrow/_public.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,18 @@

// @see https://developer.mozilla.org/en-US/docs/Web/CSS/box-shadow
// @box-shadow ( [ none | inset? && [ <offset-x> <offset-y> <blur-radius>? <spread-radius>? <color>? ] ] ] )
@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);
}

Expand Down Expand Up @@ -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);
}

Expand Down

0 comments on commit 444075c

Please sign in to comment.