zen-grids 2.0.0.beta.2 → 2.0.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81cf49e11ba72b0297fa7c6a7d343461a04cd7fb
-  data.tar.gz: 9cbeb9c3da2580d011d7a3b6e999b0eb0deea43a
+  metadata.gz: 8583a6425123fc8672fa50a06b101ed73999eaa6
+  data.tar.gz: bb2addbe8d5e1faa50a630f50f373e2b96c423d6
 SHA512:
-  metadata.gz: 6838aa469c56c868073050b99c6f964d0fdc58558ef65090045d74e23a87b8ab17777ffc24333a31b60c6e1746e6acaab666566992c9717f7d82c867ae8b6e3b
-  data.tar.gz: bcaa65d2fedf337c2d05de9d9281dd394a558d77a613acf21b09531aabfbc146f395e6845f2ff416f88f75abb1c474c2b0176edab6d6db4725f6bd17c88f894d
+  metadata.gz: a587bf7b7969ef1b6e7eaf9414efc3450ac58a95a0ff7c08c61c3f3bfc246ab3647eb773cc88f34dc7074f8d1f9e565d4b7b8f37d3882a190df11e4a81e020db
+  data.tar.gz: 84832d4948dfcc4799cd6e810d99c076efc98f194d0ab7b7ad0799cf9620ab17af565011d82ce619761b32f29ec7a1648c4b307f2ea09cd95452a0cb6becdfe0

data/README.md

@@ -71,7 +71,7 @@ You can then start using Zen Grids in your Sass files. Just add this line to one
 * Sass 3.3.0 or later
 
 For the zen-grids/background module only:
-* Compass 1.0.0.alpha.13 or later
+* Compass 1.0.0 or later
 
 
 ## LICENSE

data/lib/zen-grids.rb

@@ -1,7 +1,7 @@
 require 'compass'
 
 project_path     = File.join(File.dirname(__FILE__), '..')
-stylesheets_path = File.join(project_path)
+stylesheets_path = File.join(project_path, 'stylesheets')
 templates_path   = File.join(project_path, 'templates')
 
 Compass::Frameworks.register(

data/{zen-grids → stylesheets/zen-grids}/_background.scss

@@ -3,9 +3,11 @@
 //
 
 
-@import "zen-grids/functions";
-@import "zen-grids/internal/variables-background"; // Add the default set of background images.
-@import "compass/css3/images"; // Unlike the rest of Zen Grids, this module requires Compass.
+@import "./functions";
+// Add the default set of background images.
+@import "./internal/variables-background";
+// Unlike the rest of Zen Grids, this module requires Compass.
+@import "compass/css3/images";
 
 
 //

data/{zen-grids → stylesheets/zen-grids}/_flow.scss

@@ -3,7 +3,7 @@
 //
 
 
-@import "zen-grids/grids";
+@import "./grids";
 
 
 //

data/{zen-grids → stylesheets/zen-grids}/_functions.scss

@@ -3,7 +3,7 @@
 //
 
 
-@import "zen-grids/variables";
+@import "./variables";
 
 
 //
@@ -92,7 +92,7 @@
     $width: $width + (floor($column-span) - 1) * $gutters;
   }
   // For the original box model, remove the padding from the width.
-  @elseif $box-sizing == content-box {
+  @else if $box-sizing == content-box {
     $test: zen-compare-units('box-sizing: content-box', $gutters, $grid-width);
     $width: $width - $gutters;
   }

data/{zen-grids → stylesheets/zen-grids}/_grids.scss

@@ -3,9 +3,11 @@
 //
 
 
-@import "zen-grids/variables"; // Import the global variables needed by all of Zen Grids.
-@import "zen-grids/functions"; // Import the helper functions.
-@import "zen-grids/internal/functions-compass-polyfill";
+// Import the global variables needed by all of Zen Grids.
+@import "./variables";
+// Import the helper functions.
+@import "./functions";
+@import "./internal/functions-compass-polyfill";
 
 
 //
@@ -62,6 +64,7 @@
 
   // Prevent any padding from messing up the alignment of the nested grid.
   @if $context == grid-item or $context == flow {
+    // Copy of undo-zen-apply-gutter-padding()
     padding: {
       left: 0;
       right: 0;
@@ -126,15 +129,15 @@
 }
 
 //
-// Applies a standard set of properites to all grid items in the layout.
+// Applies a standard set of properites for grid items in the layout.
 // @see http://next.zengrids.com/reference/grids/#zen-grid-item-base
 //
 @mixin zen-grid-item-base(
-  $gutters                  : $zen-gutters,
-  $gutter-method            : $zen-gutter-method,
-  $box-sizing               : $zen-box-sizing,
-  $direction                : $zen-direction,
-  $switch-direction         : $zen-switch-direction
+  $gutters            : $zen-gutters,
+  $gutter-method      : $zen-gutter-method,
+  $box-sizing         : $zen-box-sizing,
+  $direction          : $zen-direction,
+  $switch-direction   : $zen-switch-direction
 ) {
 
   // Specify the padding if the gutter method uses padding.
@@ -150,7 +153,7 @@
     box-sizing: border-box;
   }
   // Prevent left/right borders since they'll break the layout with content-box.
-  @elseif $box-sizing == content-box {
+  @else if $box-sizing == content-box {
     border: {
       left: 0 !important;
       right: 0 !important;

data/stylesheets/zen-grids/_undo.scss

@@ -0,0 +1,156 @@
+//
+// Undo module for the Zen Grids system.
+//
+
+
+@import "./grids";
+
+
+//
+// Apply this to undo the grid container styling.
+// @see http://next.zengrids.com/reference/grids/#undo-zen-grid-container
+//
+// NOTE: if $context is flow, the zen-grid-container() set the left and right
+// padding to "0" to prevent it from messing up the alignment of the nested
+// grid. Since Zen Grids doesn't know what you previously used for this
+// element's padding, there is no way to undo that.
+//
+@mixin undo-zen-grid-container(
+  $context            : none,
+  $gutters            : $zen-gutters,
+  $gutter-method      : $zen-gutter-method,
+  $direction          : $zen-direction,
+  $switch-direction   : $zen-switch-direction
+) {
+
+  $dir: $direction;
+  @if $switch-direction {
+    $dir: zen-direction-switch($dir);
+  }
+
+  @if $context == flow-item {
+    @warn "zen-grid-container()'s $context cannot be set to: flow-item. It has been set to: flow.";
+    $context: flow;
+  }
+  @else if $context == grid {
+    @warn "zen-grid-container()'s $context cannot be set to: grid. It has been set to: grid-item.";
+    $context: grid-item;
+  }
+
+  // @TODO: This is a pre-IE8 line of code; don't remember why its needed.
+  @if zen-support-for(ie, "7") {
+    *position: static;
+  }
+
+  // Un-do the "micro clearfix".
+  &:before,
+  &:after {
+    content: normal;
+    display: inline;
+  }
+  &:after {
+    clear: none;
+  }
+  @if zen-support-for(ie, "7") {
+    *zoom: normal;
+  }
+
+  // Reset the negative margins that un-did the gutter padding of the parent
+  // grid item.
+  @if $context == flow and $gutter-method == padding {
+    margin: {
+      left: 0;
+      right: 0;
+    }
+  }
+
+  // Re-add the original gutters to the grid item.
+  @if $context == grid-item and $gutter-method == padding {
+    @include zen-apply-gutter-padding($gutters, $direction, $switch-direction);
+  }
+}
+
+//
+// Apply this to undo the grid item styling. @see http://next.zengrids.com/reference/grids/#undo-zen-grid-item
+//
+@mixin undo-zen-grid-item(
+  $gutters            : $zen-gutters,
+  $gutter-method      : $zen-gutter-method,
+  $box-sizing         : $zen-box-sizing,
+  $include-base       : $zen-auto-include-grid-item-base
+) {
+
+  float: none;
+  width: auto;
+  margin: {
+    left:  0;
+    right: 0;
+  }
+
+  // Include the grid item base mixin.
+  @if $include-base {
+    @include undo-zen-grid-item-base($gutter-method, $box-sizing);
+  }
+  // If the $gutters parameter has been used, undo the gutters even if
+  // $include-base is false.
+  @else if $gutters != $zen-gutters and $gutter-method == padding {
+    @include undo-zen-apply-gutter-padding();
+  }
+}
+
+//
+// Undoes the standard set of properites for grid items in the layout.
+// @see http://next.zengrids.com/reference/grids/#undo-zen-grid-item-base
+//
+// NOTE: if $box-sizing == content-box, the zen-grid-item-base() will add
+// left and right borders and padding of "0 !important" since non-zero values
+// would break the layout. There is no way to undo that.
+//
+@mixin undo-zen-grid-item-base(
+  $gutter-method      : $zen-gutter-method,
+  $box-sizing         : $zen-box-sizing
+) {
+
+  // Specify the padding if the gutter method uses padding.
+  @if $gutter-method == padding {
+    @include undo-zen-apply-gutter-padding();
+  }
+
+  // Specify the border-box properties.
+  @if $box-sizing == border-box {
+    -moz-box-sizing: content-box;
+    -webkit-box-sizing: content-box;
+    -ms-box-sizing: content-box;
+    box-sizing: content-box;
+  }
+
+  @if zen-support-for(ie, "7") {
+    @if $box-sizing-polyfill-path != "" {
+      *behavior: none;
+    }
+    @if zen-support-for(ie, "6") {
+      _display: block;
+      _overflow: visible;
+    }
+    *word-wrap: normal;
+  }
+}
+
+//
+// Apply this to prevent a grid item from starting a new row.
+// @see http://next.zengrids.com/reference/grids/#undo-zen-new-row
+//
+@mixin undo-zen-new-row() {
+  clear: none;
+}
+
+//
+// Undoes the gutter on a grid item when using the padding gutter method.
+// @see http://next.zengrids.com/reference/grids/#undo-zen-apply-gutter-padding
+//
+@mixin undo-zen-apply-gutter-padding() {
+  padding: {
+    left: 0;
+    right: 0;
+  }
+}

data/{zen-grids → stylesheets/zen-grids}/internal/_functions-compass-polyfill.scss

@@ -7,12 +7,11 @@
 // Determines if the project has declared a minimum supported version number for
 // the specified browser. This is a wrapper function that uses Compass'
 // support-legacy-browser() if available.
-// @see http://beta.compass-style.org/reference/compass/support/#function-support-legacy-browser
+// @see http://compass-style.org/reference/compass/support/#function-support-legacy-browser
 //
 @function zen-support-for($browser, $min-version) {
   @if function-exists('support-legacy-browser') {
-    // @TODO Use the non-monkey patched version after it's fixed in Compass.
-    @return patched-support-legacy-browser($browser, $min-version);
+    @return support-legacy-browser($browser, $min-version);
   }
   @else {
     @return zen-support-legacy-browser($browser, $min-version);
@@ -46,25 +45,3 @@
   $integers: ("1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50", "51", "52", "53", "54", "55", "56", "57", "58", "59", "60", "61", "62", "63", "64", "65", "66", "67", "68", "69", "70", "71", "72", "73", "74", "75", "76", "77", "78", "79", "80", "81", "82", "83", "84", "85", "86", "87", "88", "89", "90", "91", "92", "93", "94", "95", "96", "97", "98", "99", "100");
   @return index($integers, $string);
 }
-
-// To work around a bug in compass-core 1.0.0-alpha.18, we override Compass'
-// support-legacy-browser() function with a version of our own.
-// @TODO Remove this monkey patch after it's fixed in Compass.
-// @see https://github.com/chriseppstein/compass/pull/1524
-// @see also https://github.com/chriseppstein/compass/pull/1520
-@function patched-support-legacy-browser($browser, $min-version, $max-version: null, $threshold: $critical-usage-threshold) {
-  @if not index($supported-browsers, $browser) {
-    @return false;
-  }
-  // Check against declared minimums.
-  $min-required-version: map-get($browser-minimum-versions, $browser);
-  @if $min-required-version {
-    @return compare-browser-versions($browser, $max-version or $min-version, $min-required-version) >= 0;
-  } @else {
-    // Check against usage stats.
-    $usage: if($max-version,
-               omitted-usage($browser, $min-version, $max-version),
-               omitted-usage($browser, $min-version));
-    @return $usage > $threshold;
-  }
-}

data/zen-grids.gemspec

@@ -1,22 +1,27 @@
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name        = 'zen-grids'
+Gem::Specification.new do |spec|
+  spec.name         = 'zen-grids'
 
-  s.summary     = %q{A Compass plugin for Zen Grids, a fluid responsive grid system}
-  s.description = %q{Zen Grids is an intuitive, flexible grid system that leverages the natural source order of your content to make it easier to create fluid responsive designs. With an easy-to-use Sass mixin set, the Zen Grids system can be applied to an infinite number of layouts, including responsive, adaptive, fluid and fixed-width layouts.}
+  spec.summary      = %q{A Compass plugin for Zen Grids, a fluid responsive grid system}
+  spec.description  = %q{Zen Grids is an intuitive, flexible grid system that leverages the natural source order of your content to make it easier to create fluid responsive designs. With an easy-to-use Sass mixin set, the Zen Grids system can be applied to an infinite number of layouts, including responsive, adaptive, fluid and fixed-width layouts.}
 
-  s.homepage    = 'http://zengrids.com'
-  s.rubyforge_project =
+  spec.homepage     = 'http://zengrids.com'
+  spec.rubyforge_project =
 
-  s.version     = '2.0.0.beta.2'
-  s.date        = '2014-03-11'
-  s.licenses    = ['GPL-2']
+  spec.version      = '2.0.0.beta.3'
+  spec.date         = '2014-09-03'
+  spec.licenses     = ['GPL-2']
 
-  s.authors     = ['John Albin Wilkins']
-  s.email       = 'virtually.johnalbin@gmail.com'
+  spec.authors      = ['John Albin Wilkins']
+  spec.email        = 'virtually.johnalbin@gmail.com'
 
-  s.add_runtime_dependency('sass', ">= 3.3")
+  spec.add_runtime_dependency('sass', "~> 3.3")
 
-  s.files       = `git ls-files -z`.split "\0"
+  spec.files        = `git ls-files`.split($/).select {|f| File.exist?(f) && f =~ %r{^(lib|stylesheets|templates)/} }
+  spec.files        += %w(
+    LICENSE.txt
+    README.md
+    zen-grids.gemspec
+  )
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: zen-grids
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.2
+  version: 2.0.0.beta.3
 platform: ruby
 authors:
 - John Albin Wilkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
 description: Zen Grids is an intuitive, flexible grid system that leverages the natural
@@ -33,13 +33,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .travis.yml
 - LICENSE.txt
 - README.md
-- _zen-grids.scss
-- bower.json
 - lib/zen-grids.rb
-- sache.json
+- stylesheets/_zen-grids.scss
+- stylesheets/zen-grids/_background.scss
+- stylesheets/zen-grids/_flow.scss
+- stylesheets/zen-grids/_functions.scss
+- stylesheets/zen-grids/_grids.scss
+- stylesheets/zen-grids/_undo.scss
+- stylesheets/zen-grids/_variables.scss
+- stylesheets/zen-grids/internal/_functions-compass-polyfill.scss
+- stylesheets/zen-grids/internal/_variables-background.scss
 - templates/project/_base-elements.scss
 - templates/project/_components.scss
 - templates/project/_init.scss
@@ -48,43 +53,7 @@ files:
 - templates/project/example.html
 - templates/project/manifest.rb
 - templates/project/styles.scss
-- tests/Gemfile
-- tests/README.md
-- tests/Rakefile
-- tests/config.rb
-- tests/controls/compass-compatibility.css
-- tests/controls/function-zen-direction-switch.css
-- tests/controls/function-zen-grid-item-width.css
-- tests/controls/function-zen-half-gutter.css
-- tests/controls/function-zen-unit-width.css
-- tests/controls/zen-float.css
-- tests/controls/zen-flow-item-width.css
-- tests/controls/zen-grid-background.css
-- tests/controls/zen-grid-container.css
-- tests/controls/zen-grid-item-base.css
-- tests/controls/zen-grid-item.css
-- tests/controls/zen-new-row.css
-- tests/tests/compass-compatibility.scss
-- tests/tests/function-zen-direction-switch.scss
-- tests/tests/function-zen-grid-item-width.scss
-- tests/tests/function-zen-half-gutter.scss
-- tests/tests/function-zen-unit-width.scss
-- tests/tests/zen-float.scss
-- tests/tests/zen-flow-item-width.scss
-- tests/tests/zen-grid-background.scss
-- tests/tests/zen-grid-container.scss
-- tests/tests/zen-grid-item-base.scss
-- tests/tests/zen-grid-item.scss
-- tests/tests/zen-new-row.scss
-- tests/unit_tests.rb
 - zen-grids.gemspec
-- zen-grids/_background.scss
-- zen-grids/_flow.scss
-- zen-grids/_functions.scss
-- zen-grids/_grids.scss
-- zen-grids/_variables.scss
-- zen-grids/internal/_functions-compass-polyfill.scss
-- zen-grids/internal/_variables-background.scss
 homepage: http://zengrids.com
 licenses:
 - GPL-2
@@ -95,17 +64,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 2.0.0.beta.2
-rubygems_version: 2.2.2
+rubyforge_project: 2.0.0.beta.3
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: A Compass plugin for Zen Grids, a fluid responsive grid system