shelves 0.5.0 → 0.6.0

data/README.md

@@ -3,8 +3,9 @@ Shelves CSS Grid
 
 **The only responsive, fluid CSS grid with infinitely nestable columns.**
 
-TODO: Add longer description & Feature list.
+[See the Demo](http://shelves.petebrowne.com/)
 
+TODO: Add longer description & Feature list.
 
 Installation
 ------------
@@ -13,7 +14,7 @@ Installation
 
 Download the latest distribution of [the CSS file](https://raw.github.com/petebrowne/shelves/master/css/shelves.css) and go to town.
 
-### For SCSS Users (Compass & Rails)
+### For Sass Users (Compass & Rails)
 
 Add the shelves gem to your Gemfile and import it:
 
@@ -28,13 +29,27 @@ gem 'shelves'
 @import "shelves-grid"; // Import mixins & default grid
 ```
 
+Custom CSS Build
+----------------
+
+To customize the CSS without using Sass, you can use the command line tool:
+
+``` bash
+$ gem install shelves
+$ shelves --width 1140px --columns 16 > grid.css
+```
+
+Run width `--help` to see all of the available options:
+
+``` bash
+$ shelves --help
+```
 
 Usage
 -----
 
 TODO...
 
-
 Copyright
 ---------
 

data/component.json

@@ -0,0 +1,13 @@
+{
+  "name": "shelves",
+  "version": "0.6.0",
+  "main": ["css/shelves.css", "scss/shelves.scss"],
+  "ignore": [
+    "*.gemspec",
+    "bin",
+    "lib",
+    "Gemfile",
+    "Gemfile.lock",
+    "Rakefile"
+  ]
+}

data/lib/shelves/version.rb

@@ -1,3 +1,3 @@
 module Shelves
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/scss/shelves/_functions.scss

@@ -10,10 +10,9 @@
 //              Defaults to the value of $shelves-gutter.
 //
 @function column-width(
-  $context: null,
-  $total: $shelves-columns,
-  $gutter: $shelves-gutter
-) {
+    $context: null,
+    $total: $shelves-columns,
+    $gutter: $shelves-gutter) {
   $context: $total !default;
 
   @if $context <= 1 {
@@ -41,10 +40,9 @@
 //              Defaults to the value of $shelves-gutter.
 //
 @function column-gutter(
-  $context: null,
-  $total: $shelves-columns,
-  $gutter: $shelves-gutter
-) {
+    $context: null,
+    $total: $shelves-columns,
+    $gutter: $shelves-gutter) {
   $context: $total !default;
 
   @if $context <= 1 {
@@ -72,11 +70,10 @@
 //              Defaults to the value of $shelves-gutter.
 //
 @function columns-width(
-  $n,
-  $context: null,
-  $total: $shelves-columns,
-  $gutter: $shelves-gutter
-) {
+    $n,
+    $context: null,
+    $total: $shelves-columns,
+    $gutter: $shelves-gutter) {
   $context: $total !default;
 
   @if $n <= 1 {
@@ -106,11 +103,10 @@
 //              Defaults to the value of $shelves-gutter.
 //
 @function columns-distance(
-  $n,
-  $context: null,
-  $total: $shelves-columns,
-  $gutter: $shelves-gutter
-) {
+    $n,
+    $context: null,
+    $total: $shelves-columns,
+    $gutter: $shelves-gutter) {
   @return columns-width($n, $context, $total, $gutter) + column-gutter($context, $total, $gutter);
 }
 

data/scss/shelves/_settings.scss

@@ -25,7 +25,6 @@ $shelves-mobile-gutter: $shelves-gutter * 2.375 !default;
 
 // Default Class Names
 // (Note the lack of the preceding ".")
-$shelves-container-name: "container" !default;
 $shelves-row-name: "row" !default;
 $shelves-column-name: "column" !default;
 $shelves-prefix-name: "prefix" !default;

data/scss/shelves/mixins/_base.scss

@@ -22,25 +22,19 @@
 //                      mobile sizes. Defaults to false.
 //
 @mixin row(
-  $max-width: $shelves-max-width,
-  $min-width: $shelves-min-width,
-  $reset-if-tablet: true,
-  $reset-if-mobile: false
-) {
+    $max-width: $shelves-max-width,
+    $min-width: $shelves-min-width,
+    $reset-if-tablet: true,
+    $reset-if-mobile: false) {
   @include shelves-clearfix;
-  width: 100%;
 
   @if type-of($max-width) == 'number' {
-    max-width: $max-width;
-    margin-left: auto;
     margin-right: auto;
+    margin-left: auto;
+    max-width: $max-width;
   }
   @if type-of($min-width) == 'number' {
     min-width: $min-width;
-
-    .#{$shelves-row-name} {
-      min-width: 0;
-    }
   }
   @if $reset-if-tablet {
     @media screen and (max-width: $shelves-tablet-breakpoint) {
@@ -70,13 +64,12 @@
 //                      mobile sizes. Defaults to false.
 //
 @mixin column(
-  $n,
-  $context: null,
-  $total: $shelves-columns,
-  $gutter: $shelves-gutter,
-  $reset-if-tablet: true,
-  $reset-if-mobile: false
-) {
+    $n,
+    $context: null,
+    $total: $shelves-columns,
+    $gutter: $shelves-gutter,
+    $reset-if-tablet: true,
+    $reset-if-mobile: false) {
   @include column-base($reset-if-tablet, $reset-if-mobile);
   @include column-gutter($context, $total, $gutter);
   @include columns-width($n, $context, $total, $gutter);
@@ -125,11 +118,10 @@
 //              Defaults to the value of $shelves-gutter.
 //
 @mixin columns-width(
-  $n,
-  $context: null,
-  $total: $shelves-columns,
-  $gutter: $shelves-gutter
-) {
+    $n,
+    $context: null,
+    $total: $shelves-columns,
+    $gutter: $shelves-gutter) {
   width: columns-width($n, $context, $total, $gutter);
 }
 
@@ -145,11 +137,10 @@
 //                  Defaults to true.
 //
 @mixin column-gutter(
-  $context: null,
-  $total: $shelves-columns,
-  $gutter: $shelves-gutter,
-  $reset-first: true
-) {
+    $context: null,
+    $total: $shelves-columns,
+    $gutter: $shelves-gutter,
+    $reset-first: true) {
   margin-left: column-gutter($context, $total, $gutter);
 
   @if $reset-first {

data/scss/shelves/mixins/_generators.scss

@@ -35,26 +35,25 @@
 //                      Defaults to false.
 //
 @mixin shelves(
-  $prefixes: $shelves-prefixes,
-  $suffixes: $shelves-suffixes,
-  $pushes: $shelves-pushes,
-  $pulls: $shelves-pulls,
-  $nested: $shelves-nested,
-  $nested-prefixes: $shelves-nested-prefixes,
-  $nested-suffixes: $shelves-nested-suffixes,
-  $nested-pushes: $shelves-nested-pushes,
-  $nested-pulls: $shelves-nested-pulls,
-  $tablet: $shelves-tablet,
-  $tablet-prefixes: $shelves-tablet-prefixes,
-  $tablet-suffixes: $shelves-tablet-suffixes,
-  $tablet-pushes: $shelves-tablet-pushes,
-  $tablet-pulls: $shelves-tablet-pulls,
-  $mobile: $shelves-mobile,
-  $mobile-prefixes: $shelves-mobile-prefixes,
-  $mobile-suffixes: $shelves-mobile-suffixes,
-  $mobile-pushes: $shelves-mobile-pushes,
-  $mobile-pulls: $shelves-mobile-pulls
-) {
+    $prefixes: $shelves-prefixes,
+    $suffixes: $shelves-suffixes,
+    $pushes: $shelves-pushes,
+    $pulls: $shelves-pulls,
+    $nested: $shelves-nested,
+    $nested-prefixes: $shelves-nested-prefixes,
+    $nested-suffixes: $shelves-nested-suffixes,
+    $nested-pushes: $shelves-nested-pushes,
+    $nested-pulls: $shelves-nested-pulls,
+    $tablet: $shelves-tablet,
+    $tablet-prefixes: $shelves-tablet-prefixes,
+    $tablet-suffixes: $shelves-tablet-suffixes,
+    $tablet-pushes: $shelves-tablet-pushes,
+    $tablet-pulls: $shelves-tablet-pulls,
+    $mobile: $shelves-mobile,
+    $mobile-prefixes: $shelves-mobile-prefixes,
+    $mobile-suffixes: $shelves-mobile-suffixes,
+    $mobile-pushes: $shelves-mobile-pushes,
+    $mobile-pulls: $shelves-mobile-pulls) {
   @include shelves-base($reset-if-tablet: false, $reset-if-mobile: false);
   @include shelves-columns(
     $prefixes: $prefixes,
@@ -88,7 +87,7 @@
   @if $tablet {
     @media screen and (max-width: $shelves-tablet-breakpoint) {
       @if $shelves-tablet-margin != $shelves-margin {
-        .#{$shelves-container-name} {
+        .#{$shelves-row-name} {
           @include container($shelves-tablet-margin);
         }
       }
@@ -119,7 +118,7 @@
   @if $mobile {
     @media screen and (max-width: $shelves-mobile-breakpoint) {
       @if $shelves-mobile-margin != if($tablet, $shelves-margin, $shelves-tablet-margin) {
-        .#{$shelves-container-name} {
+        .#{$shelves-row-name} {
           @include container($shelves-mobile-margin);
         }
       }
@@ -157,12 +156,14 @@
 //                      mobile sizes. Defaults to false.
 //
 @mixin shelves-base($reset-if-tablet: true, $reset-if-mobile: false) {
-  .#{$shelves-container-name} {
-    @include container;
-  }
-
   .#{$shelves-row-name} {
+    @include container;
     @include row($reset-if-tablet: $reset-if-tablet, $reset-if-mobile: $reset-if-mobile);
+
+    .#{$shelves-row-name} {
+      @include reset-container;
+      @include reset-row;
+    }
   }
 
   #{columns-selector($shelves-column-name)} {
@@ -200,17 +201,16 @@
 //   $pulls       - Include pull classes. Deafults to true.
 //
 @mixin shelves-columns(
-  $column-name: $shelves-column-name,
-  $start: 1,
-  $end: null,
-  $context: null,
-  $total: $shelves-columns,
-  $gutter: $shelves-gutter,
-  $prefixes: true,
-  $suffixes: true,
-  $pushes: true,
-  $pulls: true
-) {
+    $column-name: $shelves-column-name,
+    $start: 1,
+    $end: null,
+    $context: null,
+    $total: $shelves-columns,
+    $gutter: $shelves-gutter,
+    $prefixes: true,
+    $suffixes: true,
+    $pushes: true,
+    $pulls: true) {
   $context: $total !default;
   $end: $context !default;
 

data/scss/shelves/mixins/_modifiers.scss

@@ -10,11 +10,10 @@
 //              Defaults to the value of $shelves-gutter.
 //
 @mixin column-prefix(
-  $n,
-  $context: null,
-  $total: $shelves-columns,
-  $gutter: $shelves-gutter
-) {
+    $n,
+    $context: null,
+    $total: $shelves-columns,
+    $gutter: $shelves-gutter) {
   padding-left: columns-distance($n, $context, $total, $gutter);
 }
 
@@ -30,11 +29,10 @@
 //              Defaults to the value of $shelves-gutter.
 //
 @mixin column-suffix(
-  $n,
-  $context: null,
-  $total: $shelves-columns,
-  $gutter: $shelves-gutter
-) {
+    $n,
+    $context: null,
+    $total: $shelves-columns,
+    $gutter: $shelves-gutter) {
   padding-right: columns-distance($n, $context, $total, $gutter);
 }
 
@@ -50,11 +48,10 @@
 //              Defaults to the value of $shelves-gutter.
 //
 @mixin column-push(
-  $n,
-  $context: null,
-  $total: $shelves-columns,
-  $gutter: $shelves-gutter
-) {
+    $n,
+    $context: null,
+    $total: $shelves-columns,
+    $gutter: $shelves-gutter) {
   left: columns-distance($n, $context, $total, $gutter);
 }
 
@@ -70,10 +67,9 @@
 //              Defaults to the value of $shelves-gutter.
 //
 @mixin column-pull(
-  $n,
-  $context: null,
-  $total: $shelves-columns,
-  $gutter: $shelves-gutter
-) {
+    $n,
+    $context: null,
+    $total: $shelves-columns,
+    $gutter: $shelves-gutter) {
   right: columns-distance($n, $context, $total, $gutter);
 }

data/scss/shelves/mixins/_resets.scss

@@ -1,10 +1,16 @@
+// Reset container by removing the outer padding.
+@mixin reset-container {
+  padding-left: 0;
+  padding-right: 0;
+}
+
 // Reset a row to expand to the full width of
 // its container and remove margins.
 @mixin reset-row {
-  margin-left: 0;
   margin-right: 0;
-  width: 100%;
+  margin-left: 0;
   min-width: 0;
+  max-width: none;
 }
 
 // Resets a column to expand to the full width of

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelves
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70316886411000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70316886411000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: choice
-  requirement: &70316886410360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70316886410360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70316886409620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +53,12 @@ dependencies:
         version: '10.0'
   type: :development
   prerelease: false
-  version_requirements: *70316886409620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
 description: The only responsive, fluid CSS grid with infinitely nestable columns.
 email:
 - me@petebrowne.com
@@ -58,6 +73,7 @@ files:
 - README.md
 - Rakefile
 - bin/shelves
+- component.json
 - lib/shelves.rb
 - lib/shelves/cli.rb
 - lib/shelves/extensions/compass.rb
@@ -86,21 +102,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 602854420926794406
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 602854420926794406
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: The only responsive, fluid CSS grid with infinitely nestable columns.