Permalink
Browse files

Updated .sass to use unquote after hitting a bug that added empty quo…

…tes in place of the value, ran sass-convert to sync sass and scss, updated tests
  • Loading branch information...
1 parent 6c0468d commit 15ca6bac5628fb1dce65b5753bc96a1d86de90f3 @adamstac adamstac committed Aug 10, 2011
Showing with 22 additions and 6 deletions.
  1. +1 −1 stylesheets/_rem.sass
  2. +2 −2 stylesheets/_rem.scss
  3. +12 −2 test/css/screen.css
  4. +7 −1 test/sass/screen.sass
View
@@ -17,7 +17,7 @@ $baseline-px: 10px
@else
// Create an empty list that we can dump values into
- $rem-values: ""
+ $rem-values: unquote("")
@each $value in $px-values
View
@@ -14,10 +14,10 @@ $baseline-px: 10px;
#{$property}: $px-values / $baseline-rem; }
@else {
// Create an empty list that we can dump values into
- $rem-values: "";
+ $rem-values: unquote("");
@each $value in $px-values {
// If the value is zero, return 0
- @else if $value == 0 {
+ @if $value == 0 {
$rem-values: append($rem-values, $value); }
@else {
$rem-values: append($rem-values, $value / $baseline-rem); } }
View
@@ -1,4 +1,14 @@
.foo {
- font-size: 22px;
- font-size: 2.2rem;
+ font-size: 16px;
+ font-size: 1.6rem;
+}
+
+.bar {
+ margin: 15px 0 15px 0;
+ margin: 1.5rem 0 1.5rem 0;
+}
+
+.baz {
+ padding: 5px 15px 5px 15px;
+ padding: 0.5rem 1.5rem 0.5rem 1.5rem;
}
View
@@ -1,4 +1,10 @@
@import "../../stylesheets/rem"
.foo
- +rem(font-size, 22px)
+ +rem(font-size, 16px)
+
+.bar
+ +rem(margin, 15px 0 15px 0)
+
+.baz
+ +rem(padding, 5px 15px 5px 15px)

0 comments on commit 15ca6ba

Please sign in to comment.