rocks 0.0.3 → 0.0.4

data/.gitignore

@@ -1,4 +1,3 @@
 *.gem
 .bundle
-Gemfile.lock
 pkg/*

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.0.4
+
+* Removed use of @extend in a @mixin (deprecated in Sass)
+* Added new rhythm mixin for dealing with vertical rhythm
+* Added note in docs on adding Rocks to the Sass load path
+
 ## 0.0.3
 
 * Bugfixes:

data/Gemfile.lock

@@ -0,0 +1,16 @@
+PATH
+  remote: .
+  specs:
+    rocks (0.0.4)
+      sass (>= 3.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    sass (3.1.19)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rocks!

data/README.md

@@ -46,6 +46,20 @@ Unsupported so far. I may write a simple installer script one day that
 automatically copies all the stylesheets into a directory of your choosing. For
 now, you'll have to do that manually.
 
+If you are using Sass directly, you could try to just add the Rocks gem to
+`load_path`, using something like the following:
+
+```ruby
+Sass::Engine.new(my_stylesheet,
+  :syntax => :scss,
+  :load_path => [
+    File.join(`bundle show rocks`, 'app', 'assets', 'stylesheets')
+  ]
+ )
+```
+
+This would allow you to `@import 'rocks';` in the `my_stylesheet` file.
+
 # Contents
 
 ## Grid
@@ -173,6 +187,9 @@ Defines the following functions:
 
 It defines the following mixins:
 
+* `rhythm(...)`: apply various aspects of vertical rhythm in one go,
+  using a combination of arguments. See the inline docs for more
+  information.
 * `text-icon($img, $padding: $grid-margin, $x: 0, $y:0)`: give an element an
   icon by setting an image to the background and applying some padding.
 * `text-replace($img, $x: 0, $y: 0, $w: false, $h: false)`: replace an

data/app/assets/stylesheets/_layout.scss

@@ -53,10 +53,6 @@
 
 // Let an element automatically clear its containing floats.
 @mixin clearfix {
-    @extend .clearfix;
-}
-
-.clearfix {
     zoom: 1;
     &:after {
         visibility: hidden;
@@ -68,6 +64,10 @@
     }
 }
 
+.clearfix {
+    @include clearfix;
+}
+
 // Apply negative margin and equal, opposing padding, to the left of an element.
 @mixin outset-left($gutter: $grid-margin, $with-padding: false) {
     margin-left: -$gutter;

data/app/assets/stylesheets/_type.scss

@@ -13,6 +13,77 @@ $color-text: #444 !default;
     @return $line * $n;
 }
 
+// Apply vertical rhtythm to an element, setting top and bottom margins, padding and borders.
+//
+// You can either specify a single value to use for both the top and bottom, or specify two values:
+//
+//    @include rhythm($margin: 2);    // margin-top: lines(2); margin-bottom: lines(2);
+//    @include rhythm($margin: 2 0);  // margin-top: lines(2); margin-bottom: lines(0);
+//
+// You can also specify just the top or bottom part:
+//
+//    @include rhythm($padding-top: 2); // padding-top: lines(2);
+//
+// Margin and padding values are expressed in a number of lines using the `lines` function. Border values
+// will only set the width and should have unit, like `px`:
+//
+//    @include rhythm($border: 1px 3px); // border-top-width: 1px; border-bottom-width: 3px;
+//
+// By default, if you specify padding AND a border, the border width will be subtracted from the padding:
+//
+//    @include rhythm($padding: 2, $border: 2px 4px);
+//    // padding-top: lines(2) - 2px;
+//    // padding-bottom: lines(2) - 4px;
+//    // border-top-width: 2px;
+//    // border-bottom-width: 2px;
+//
+// You can disable this behaviour by specifying `$compensate-padding: false`.
+@mixin rhythm($margin: false, $padding: false, $border: false, $margin-top: false, $margin-bottom: false, $padding-top: false, $padding-bottom: false, $border-top: false, $border-bottom: false, $compensate-padding: true) {
+    $margin-top:      if($margin, nth($margin, 1), $margin-top);
+    $margin-bottom:   if($margin, if(length($margin) == 2, nth($margin, 2), $margin), $margin-bottom);
+    $padding-top:     if($padding, nth($padding, 1), $padding-top);
+    $padding-bottom:  if($padding, if(length($padding) == 2, nth($padding, 2), $padding), $padding-bottom);
+    $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) {
+        @warn 'You should provide border values with units (e.g. px)';
+    }
+    @if $padding && ($padding-top || $padding-bottom) {
+        @warn 'You should specify only $padding or $padding-(top|bottom)';
+    }
+    @if $margin && ($margin-top || $margin-bottom) {
+        @warn 'You should specify only $margin or $margin-(top|bottom)';
+    }
+
+    @if $margin-top {
+        margin-top: lines($margin-top);
+    }
+    @if $margin-bottom {
+        margin-bottom: lines($margin-bottom);
+    }
+    @if $border-top {
+        border-top-width: $border-top;
+    }
+    @if $border-bottom {
+        border-bottom-width: $border-bottom;
+    }
+    @if $padding-top {
+        @if $border-top && $compensate-padding {
+            padding-top: lines($padding-top) - $border-top;
+        } @else {
+            padding-top: lines($padding-top);
+        }
+    }
+    @if($padding-bottom) {
+        @if $border-bottom && $compensate-padding {
+            padding-bottom: lines($padding-bottom) - $border-bottom;
+        } @else {
+            padding-bottom: lines($padding-bottom);
+        }
+    }
+}
+
 // Use a background image to give an element an icon.
 //
 // $img is the image source.

data/lib/rocks/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocks
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-09 00:00:00.000000000 Z
+date: 2012-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70216378912060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70216378912060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
 description: ! 'Rocks provides a set of mixins and default styles that you can use
   to develop
 
@@ -41,6 +46,7 @@ files:
 - .gitignore
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -75,8 +81,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rocks
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Sass mixins using SCSS syntax that go one step further than Bourbon
 test_files: []
+has_rdoc: