rocks 0.0.4 → 0.0.5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.5
+
+* Bugfix: wrong boolean operators
+
 ## 0.0.4
 
 * Removed use of @extend in a @mixin (deprecated in Sass)

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    rocks (0.0.4)
+    rocks (0.0.5)
       sass (>= 3.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    sass (3.1.19)
+    sass (3.1.20)
 
 PLATFORMS
   ruby

data/app/assets/stylesheets/_type.scss

@@ -46,13 +46,13 @@ $color-text: #444 !default;
     $border-top:      if($border, nth($border, 1), $border-top);
     $border-bottom:   if($border, if(length($border) == 2, nth($border, 2), $border), $border-bottom);
 
-    @if $border-top && unitless($border-top) {
+    @if $border-top and unitless($border-top) {
         @warn 'You should provide border values with units (e.g. px)';
     }
-    @if $padding && ($padding-top || $padding-bottom) {
+    @if $padding and ($padding-top or $padding-bottom) {
         @warn 'You should specify only $padding or $padding-(top|bottom)';
     }
-    @if $margin && ($margin-top || $margin-bottom) {
+    @if $margin and ($margin-top or $margin-bottom) {
         @warn 'You should specify only $margin or $margin-(top|bottom)';
     }
 
@@ -69,14 +69,14 @@ $color-text: #444 !default;
         border-bottom-width: $border-bottom;
     }
     @if $padding-top {
-        @if $border-top && $compensate-padding {
+        @if $border-top and $compensate-padding {
             padding-top: lines($padding-top) - $border-top;
         } @else {
             padding-top: lines($padding-top);
         }
     }
     @if($padding-bottom) {
-        @if $border-bottom && $compensate-padding {
+        @if $border-bottom and $compensate-padding {
             padding-bottom: lines($padding-bottom) - $border-bottom;
         } @else {
             padding-bottom: lines($padding-bottom);

data/lib/rocks/version.rb

@@ -1,3 +1,3 @@
 module Rocks
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocks
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-30 00:00:00.000000000 Z
+date: 2012-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass