neat 1.0.0 → 1.0.1

data/NEWS.md

@@ -1,3 +1,7 @@
+1.0.1 (2012-11-06)
+
+  * Fix bug where the return type in the `em()` function was a string instead of a number
+  * Fix bug related to relative path imports in Rails
 
 1.0.0 (2012-10-29)
 

data/README.md

@@ -1,8 +1,8 @@
-[![Bourbon Neat](http://thoughtbot.com/neat/images/logotype.svg)](http://thoughtbot.com/neat)
+[![Bourbon Neat](http://neat.bourbon.io/images/logotype.svg)](http://thoughtbot.com/neat)
 
-**Neat** is an open source fluid grid framework built on top of [Bourbon](http://thoughtbot.com/bourbon) with the aim of being easy enough to use out of the box and flexible enough to customize down the road.
+**Neat** is an open source fluid grid framework built on top of [Bourbon](http://bourbon.io) with the aim of being easy enough to use out of the box and flexible enough to customize down the road.
 
-Learn more about Neat and why we built it [here](http://thoughtbot.com/neat/).
+Learn more about Neat and why we built it [here](http://neat.bourbon.io).
 
 Requirements
 ===
@@ -11,6 +11,12 @@ Requirements
 
 Non-Rails projects
 ===
+Install/update the dependencies first:
+
+```bash
+gem install sass #or gem update sass
+gem install bourbon #or gem update bourbon
+```
 Install Neat:
 
 ```bash
@@ -308,7 +314,7 @@ The `media()` mixin allows you to use media-queries to modify both the grid and
 }
 ```
 
-You can also use two ```@media``` features at the same time.
+You can also use two `@media` features at the same time.
 
 Here is a summary of possible argument combinations:
 
@@ -366,25 +372,32 @@ The `new-breakpoint` takes the same arguments as `media`.
 
 By setting `$visual-grid` to `true`, you can display the base grid in the background (default) or as an overlay. You can even change the color and opacity of the gridlines by overriding the default settings as detailed in the section below. Keep in mind that on Webkit, rounding errors in the fluid grid might result in the overlay being few pixels off.
 
-The visual grid reflects the changes applied to the grid via the `new-breakpoint()` mixin.
+The visual grid reflects the changes applied to the grid via the `new-breakpoint()` mixin, as long as the media contexts are defined *before* importing Neat.
 
 ### Changing the defaults
 
-All the default settings in Neat can be overridden in your stylesheets. The only thing you need to keep in mind is that these overrides should occur *before* importing Neat (failing to do so will cause the framework to use the default values):
+All the default settings in Neat can be modified, as long as these overrides occur *before* importing Neat (failing to do so will cause the framework to use the default values). The most straighforward way to achieve this is creating a `_grid-settings.scss` file in the root of your stylesheets folder, then importing it before Neat:
 
 ```scss
 @import "bourbon"; // or "bourbon/bourbon" when not in Rails
-@import "my-neat-overrides";
+@import "grid-settings";
 @import "neat"; // or "neat/neat" when not in Rails
 ```
-You need also to import `neat-helpers` (or `near/neat-helpers` in non-Rails projects) in your stylehseet (`_my-neat-overrides.scss` in the example above) if you want to use helper mixins and functions such as `new-breakpoint()` and `em()`:
+
+In your newly created  `_grid-settings.scss`:
 
 ```scss
 @import "neat-helpers"; // or "neat/neat-helpers" when not in Rails
 
+// Change the grid settings
 $column: 90px;
+$gutter: 30px;
 $grid-columns: 10;
-$mobile: new-breakpoint(max-width 480px 4); // Failing to import neat-helpers will cause this line to throw an error
+$max-width: em(1088);
+
+// Define your breakpoints
+$mobile: new-breakpoint(max-width 480px 4);
+$tablet: new-breakpoint(max-width 768px 8);
 ```
 
 Here is the list of the available settings:
@@ -398,7 +411,7 @@ Here is the list of the available settings:
 
 #### Visual grid settings
 
-- `$visual-grid`: Show the base grid. Defaults to `false`.
+- `$visual-grid`: Show the base grid when set to `true`. Defaults to `false`.
 - `$visual-grid-color`: Visual grid color. Defaults to `#EEEEEE`.
 - `$visual-grid-index`: If set to `front`, the grid is overlaid on the content.
 - `$visual-grid-opacity`: Visual grid opacity.

data/app/assets/stylesheets/_neat-helpers.scss

@@ -1,2 +1,8 @@
-@import "settings/default";
-@import "functions/helpers";
+// Functions
+@import "functions/private";
+@import "functions/new-breakpoint";
+@import "functions/px-to-em";
+
+// Settings
+@import "settings/grid";
+@import "settings/visual-grid";

data/app/assets/stylesheets/_neat.scss

@@ -2,9 +2,10 @@
 // MIT Licensed
 // Copyright (c) 2011 thoughtbot, inc.
 
-@import "functions/private";
-@import "functions/helpers";
-@import "settings/default";
+// Helpers
+@import "neat-helpers";
+
+// Grid
 @import "grid/global-variables";
 @import "grid/grid";
 @import "grid/visual-grid";

data/app/assets/stylesheets/functions/{helpers/_new-breakpoint.scss → _new-breakpoint.scss}

@@ -1,5 +1,3 @@
-@import "../private";
-
 @function new-breakpoint($query:$feature $value $columns, $total-columns: $grid-columns) {
 
   @if length($query) == 1 {

data/app/assets/stylesheets/functions/{helpers/_px-to-em.scss → _px-to-em.scss}

@@ -1,3 +1,3 @@
 @function em($pxval, $base: 16) {
-  @return #{$pxval / $base}em;
+  @return ($pxval / $base) * 1em;
 }

data/app/assets/stylesheets/grid/_grid.scss

@@ -13,7 +13,6 @@ $fg-max-width: $max-width;
 @mixin outer-container() {
   @include clearfix;
   max-width: $fg-max-width;
-  text-align: left;
   margin: {
     left: auto;
     right: auto;

data/app/assets/stylesheets/grid/_visual-grid.scss

@@ -7,7 +7,7 @@
   background-image: unquote("linear-gradient(left, #{$values})");
 }
 
-@if $visual-grid == true {
+@if $visual-grid == true or $visual-grid == yes {
   body:before {
     content: '';
     display: inline-block;

data/lib/neat/version.rb

@@ -1,3 +1,3 @@
 module Neat
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neat
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -97,16 +97,14 @@ files:
 - Rakefile
 - app/assets/stylesheets/_neat-helpers.scss
 - app/assets/stylesheets/_neat.scss
-- app/assets/stylesheets/functions/_helpers.scss
+- app/assets/stylesheets/functions/_new-breakpoint.scss
 - app/assets/stylesheets/functions/_private.scss
-- app/assets/stylesheets/functions/helpers/_new-breakpoint.scss
-- app/assets/stylesheets/functions/helpers/_px-to-em.scss
+- app/assets/stylesheets/functions/_px-to-em.scss
 - app/assets/stylesheets/grid/_global-variables.scss
 - app/assets/stylesheets/grid/_grid.scss
 - app/assets/stylesheets/grid/_visual-grid.scss
-- app/assets/stylesheets/settings/_default.scss
-- app/assets/stylesheets/settings/default/_grid.scss
-- app/assets/stylesheets/settings/default/_visual-grid.scss
+- app/assets/stylesheets/settings/_grid.scss
+- app/assets/stylesheets/settings/_visual-grid.scss
 - bin/neat
 - lib/neat.rb
 - lib/neat/engine.rb

data/app/assets/stylesheets/functions/_helpers.scss

@@ -1,2 +0,0 @@
-@import "helpers/new-breakpoint";
-@import "helpers/px-to-em";

data/app/assets/stylesheets/settings/_default.scss

@@ -1,3 +0,0 @@
-@import "../functions/helpers";
-@import "default/grid";
-@import "default/visual-grid";