neat 2.0.0.beta.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0244ce326d07ed8e5a37123b8560c95683526b34
-  data.tar.gz: 1749d9865aeb8be2230fa47754ee2a55ae9d5a5f
+  metadata.gz: 23c144afb938b1528dc2e36a180cb80d7480ac81
+  data.tar.gz: c33ff2c82766d847ceb640c110e747f533a3e5e0
 SHA512:
-  metadata.gz: ceac4186355f6d0945795cdd97f61ac39fe07ff0e1148f1ee95eb77c6eee5301096eaadf8dd2bcc1cab0df1cd192488d281f23c8e18a7d20912611ad2d6a121b
-  data.tar.gz: e13819e5b69fddc15afe7d260f366725f48c047af3733ea4681a87f0afd60426715b7f032c64ae0264a9272d0894de8d532d16c6177003ca88d12a3de0b3c489
+  metadata.gz: 3b17dbcc1c974e5a32c38589fee5f7a94bd3772ea1f7c17eb7e8b589c548c7159acfd0ca7cb3e3af44642a3acc4ccb5cda8e3ed4d110cc71301fbbf324ab61e5
+  data.tar.gz: a56574e2c5db7f6ed15d32ed27d042462a7a0cc972a17cd08df81470def202b08a8f52cdbfe0abe09ef3817edab84dfa37b00719016d5f30081dc55284d97c55

data/.scss-lint.yml

@@ -167,6 +167,10 @@ linters:
     enabled: true
     style: one_space
 
+  SpaceAfterComment:
+    enabled: false
+    allow_empty_comments: true
+
   SpaceAfterPropertyColon:
     enabled: true
     style: one_space

data/CHANGELOG.md

@@ -5,6 +5,16 @@ project adheres to [Semantic Versioning](http://semver.org).
 
 ## [Unreleased]
 
+Nothing at the moment.
+
+## [2.0.0]
+
+### Fixed
+
+- Custom grids inherit undefined properties from global `$neat-grid`
+- Fixed instillation from CLI
+- Remove float property from `grid-collapse`
+
 ## [2.0.0.beta.2]
 
 ### Added
@@ -77,7 +87,6 @@ project adheres to [Semantic Versioning](http://semver.org).
     - `$visual-grid-index` has been removed
     - `$visual-grid-opacity` has been removed
 
-
 ## 1.8.0 - 2016-06-21
 
 ### Added
@@ -303,7 +312,8 @@ project adheres to [Semantic Versioning](http://semver.org).
 
 - Initial release
 
-[Unreleased]: https://github.com/thoughtbot/neat/compare/v2.0.0.beta.1...neat-2.0.0
+[Unreleased]: https://github.com/thoughtbot/neat/compare/v2.0.0...HEAD
+[2.0.0]: https://github.com/thoughtbot/neat/compare/v2.0.0.beta.2...v2.0.0
 [2.0.0.beta.2]: https://github.com/thoughtbot/neat/compare/v2.0.0.beta.1...v2.0.0.beta.2
 [2.0.0.beta.1]: https://github.com/thoughtbot/neat/compare/v2.0.0.alpha.1...v2.0.0.beta.1
 [2.0.0.alpha.1]: https://github.com/thoughtbot/neat/compare/v2.0.0.alpha.0...v2.0.0.alpha.1

data/Gulpfile.js

@@ -1,5 +1,4 @@
-var bourbon    = require("bourbon").includePaths,
-    autoprefix = require("gulp-autoprefixer"),
+var autoprefix = require("gulp-autoprefixer"),
     connect    = require("gulp-connect"),
     gulp       = require("gulp"),
     sass       = require("gulp-sass");
@@ -12,7 +11,9 @@ var paths = {
 
 gulp.task("sass", function () {
   return gulp.src(paths.scss)
-    .pipe(sass())
+    .pipe(sass({
+        sourcemaps: true
+    }))
     .pipe(autoprefix("last 2 versions"))
     .pipe(gulp.dest("./contrib"))
     .pipe(connect.reload());

data/README.md

@@ -1,6 +1,6 @@
-[![Neat](http://images.thoughtbot.com/bourbon/neat-logo.svg)](http://neat.bourbon.io)
+[<img src="http://images.thoughtbot.com/bourbon/neat-logo-v2.svg" width="200" alt="Neat logo">](http://neat.bourbon.io)
 
-## A lightweight grid framework
+## A lightweight and flexible Sass grid
 
 Neat is a fluid grid framework with the aim of being easy enough to use out of the box and flexible enough to customize down the road.
 
@@ -12,6 +12,15 @@ Neat is a fluid grid framework with the aim of being easy enough to use out of t
 Follow the [@bourbonsass](https://twitter.com/bourbonsass) Twitter account
 for updates.
 
+## Table of Contents
+
+- [Requirements](#requirements)
+- [Installation](#installation)
+- [The Bourbon Family](#the-bourbon-family)
+- [Contributing](#contributing)
+- [License](#license)
+- [About](#about)
+
 ## Requirements
 
 - Sass 3.4+ or LibSass 3.3+
@@ -48,7 +57,7 @@ For command line help, visit our wiki page on Neat’s [command line interface](
 
   It’s not recommended to add or modify the Neat files so that you can update them easily.
 
-## Installation for Ruby on Rails 4.2+
+### Installation for Ruby on Rails 4.2+
 
 1. Add Neat to your Gemfile:
 
@@ -76,7 +85,7 @@ For command line help, visit our wiki page on Neat’s [command line interface](
 
   It should be noted that `@import` rules are not compatible with Sprockets directives. You need to use one or the other.
 
-## Installing with npm and using a Node-based asset pipeline
+### Installing with npm and using a Node-based asset pipeline
 
 1. Add Neat as a dependency:
 
@@ -84,16 +93,15 @@ For command line help, visit our wiki page on Neat’s [command line interface](
   npm install --save bourbon-neat
   ```
 
-1. If you’re using [Eyeglass](http://eyeglass.rocks), skip to Step 3. Otherwise, you’ll need to add Bourbon and Neat to your node-sass `includePaths` option. `require("bourbon-neat").includePaths` is an array of directories that you should pass to node-sass. How you do this depends on how node-sass is integrated into your project. You will also need to ensure that Bourbon is in the `includePaths` passed to node-sass.
+1. If you’re using [Eyeglass](http://eyeglass.rocks), skip to Step 3. Otherwise, you’ll need to add Neat to your node-sass `includePaths` option. `require("bourbon-neat").includePaths` is an array of directories that you should pass to node-sass. How you do this depends on how node-sass is integrated into your project.
 
-1. Import Neat into your Sass files, after Bourbon:
+1. Import Neat into your Sass files:
 
   ```scss
-  @import "bourbon";
   @import "neat";
   ```
 
-## Installing older versions of Neat
+### Installing older versions of Neat
 
 1. Uninstall any Neat gem versions you already have:
 
@@ -104,26 +112,24 @@ For command line help, visit our wiki page on Neat’s [command line interface](
 2. Reinstall the Neat gem, using the `-v` flag to specify the version you need:
 
   ```bash
-  gem install neat -v 1.7.0
+  gem install neat -v 1.8.1
   ```
 
 3. Follow the [instructions above](#installation) to install Neat into your project.
 
 ## The Bourbon family
 
-- [Bourbon](https://github.com/thoughtbot/bourbon): A simple and lightweight mixin library for Sass
-- [Neat](https://github.com/thoughtbot/neat): A lightweight semantic grid framework for Sass and Bourbon
+- [Bourbon](https://github.com/thoughtbot/bourbon): A lightweight Sass tool set
+- [Neat](https://github.com/thoughtbot/neat): A lightweight and flexible Sass grid
 - [Bitters](https://github.com/thoughtbot/bitters): Scaffold styles, variables and structure for Bourbon projects
 - [Refills](https://github.com/thoughtbot/refills): Prepackaged patterns and components built with Bourbon, Neat and Bitters
 
-Also check out [Proteus](https://github.com/thoughtbot/proteus), a collection of useful starter kits to help you prototype faster. Each kit comes with Bourbon, Neat and Bitters out-of-the-box.
-
 ## Contributing
 
 See the [contributing] document. Thank you, [contributors]!
 
   [contributing]: CONTRIBUTING.md
-  [contributors]: https://github.com/thoughtbot/bourbon/graphs/contributors
+  [contributors]: https://github.com/thoughtbot/neat/graphs/contributors
 
 ## License
 
@@ -135,7 +141,7 @@ Neat is copyright © 2012 [thoughtbot, inc.][thoughtbot] It is free software, an
 
 Neat is maintained by the thoughtbot design team. It is funded by [thoughtbot, inc.][thoughtbot] and the names and logos for thoughtbot are trademarks of thoughtbot, inc.
 
-[<img src="http://thoughtbot.github.io/images/signature.svg" width="250" alt="thoughtbot logo">][thoughtbot]
+[<img src="http://presskit.thoughtbot.com/images/signature.svg" width="250" alt="thoughtbot logo">][thoughtbot]
 
 We love open-source software! See [our other projects][community] or [hire us][hire] to design, develop, and grow your product.
 

data/RELEASING.md

@@ -2,7 +2,7 @@
 
 1. Update the version number in these places:
   - `lib/neat/version.rb`
-  - `core/neat/_neat.scss`
+  - `core/_neat.scss`
   - `package.json`
   - `bower.json`
 
@@ -17,11 +17,12 @@
 1. Run `npm publish`, which pushes the new version to npm’s registry (if
    releasing a pre-release, run `npm publish --tag beta`).
 
-1. Add a [new GitHub release](//github.com/thoughtbot/neat/releases/new).
+1. Draft a [new GitHub release].
 
-1. Re-generate and publish
-   the [documentation website](//github.com/thoughtbot/neat-docs),
-   using the available Gulp tasks.
+1. Re-generate and publish the [documentation website].
 
 1. Announce the new release, making sure to say “thank you” to the contributors
    who helped shape this version!
+
+[new GitHub release]: https://github.com/thoughtbot/neat/releases/new
+[documentation website]: https://github.com/thoughtbot/neat.bourbon.io

data/bower.json

@@ -1,7 +1,7 @@
 {
   "name": "neat",
-  "description": "A lightweight, semantic grid framework built with Bourbon",
-  "version": "2.0.0-beta.2",
+  "description": "A lightweight, semantic grid framework",
+  "version": "2.0.0",
   "main": "core/_neat.scss",
   "license": "MIT",
   "ignore": [

data/circle.yml

@@ -1,11 +1,14 @@
 dependencies:
   override:
     - bundle install
-    - npm install -g sassdoc
+    - npm install -g sassdoc@2.2.0
 general:
   branches:
     ignore:
       - gh-pages
+machine:
+  node:
+    version: 6.9.5
 test:
   override:
     - bundle exec rake

data/contrib/patterns/_global.scss

@@ -2,4 +2,31 @@
 *::before,
 *::after {
   box-sizing: border-box;
+  font-family:
+    -apple-system,
+    BlinkMacSystemFont,
+    "Avenir Next",
+    "Avenir",
+    "Segoe UI",
+    "Lucida Grande",
+    "Helvetica Neue",
+    "Helvetica",
+    "Fira Sans",
+    "Roboto",
+    "Noto",
+    "Droid Sans",
+    "Cantarell",
+    "Oxygen",
+    "Ubuntu",
+    "Franklin Gothic Medium",
+    "Century Gothic",
+    "Liberation Sans",
+     sans-serif;
+}
+
+h1,
+h2,
+h3,
+h4 {
+  font-weight: 400;
 }

data/core/_neat.scss

@@ -1,5 +1,5 @@
 @charset "UTF-8";
-// Neat 2.0.0-beta.2
+// Neat 2.0.0
 // http://neat.bourbon.io
 // Copyright 2012 thoughtbot, inc.
 // MIT License
@@ -11,6 +11,7 @@
 @import "neat/functions/neat-column-width";
 @import "neat/functions/neat-column-ratio";
 @import "neat/functions/neat-float-direction";
+@import "neat/functions/neat-merge-defaults";
 @import "neat/functions/neat-opposite-direction";
 @import "neat/functions/neat-parse-columns";
 @import "neat/functions/neat-parse-media";

data/core/neat/functions/_neat-merge-defaults.scss

@@ -0,0 +1,23 @@
+@charset "UTF-8";
+/// Apply Neat's default properties to undefined values within a map.
+///
+/// @argument {map} $grid
+///
+/// @return {map}
+///
+/// @example scss
+///   _retrieve-neat-setting($neat-grid)
+///
+/// @access private
+
+@function _neat-merge-defaults($grid) {
+  $_merged-grid: map-merge((
+    columns: 12,
+    gutter: 20px,
+    media: null,
+    color: rgba(#00d4ff, 0.25),
+    direction: ltr,
+  ), $grid);
+
+  @return $_merged-grid;
+}

data/core/neat/functions/_retrieve-neat-settings.scss

@@ -1,5 +1,6 @@
 @charset "UTF-8";
-/// Return a Neat setting.
+/// This function recives a grid map and merges it with Neat's defauls.
+/// It then returns the value of the property that has been passed to it.
 ///
 /// @argument {map} $grid
 ///
@@ -13,6 +14,6 @@
 /// @access private
 
 @function _retrieve-neat-setting($grid, $setting) {
-  $_grid-settings: map-merge($_neat-grid-defaults, $grid);
+  $_grid-settings: map-merge(_neat-merge-defaults($neat-grid), $grid);
   @return map-get($_grid-settings, $setting);
 }

data/core/neat/mixins/_grid-collapse.scss

@@ -7,7 +7,8 @@
 /// @name Grid collapse
 ///
 /// @argument {map} $grid [$neat-grid]
-///   The grid used to determine gutter size.
+///   The grid to be used to generate the collapsed container.
+///   By default, the global `$neat-grid` will be used.
 ///
 /// @example scss
 ///   .element {
@@ -29,7 +30,6 @@
     @warn "`grid-collapse` is not compatible with percentage based gutters.";
   }
 
-  float: _neat-float-direction($grid);
   margin-#{_neat-float-direction($grid)}: -($_grid-gutter);
   margin-#{_neat-opposite-direction($grid)}: -($_grid-gutter);
   width: calc(100% + #{($_grid-gutter * 2)});

data/core/neat/mixins/_grid-column.scss

@@ -1,14 +1,20 @@
 @charset "UTF-8";
-/// Creates Neat a grid column of requested size.
+/// Creates a grid column of requested size.
 ///
 /// @group features
 ///
 /// @name Grid column
 ///
 /// @argument {number (unitless)} $columns [null]
+///   Specifies the number of columns an element should span based on the total
+///   columns of the grid.
+///
+///   This can also be defined in a shorthand syntaxt which also contains the
+///   total column count such as `3 of 5`.
 ///
 /// @argument {map} $grid [$neat-grid]
-///   The grid used to generate the column.
+///   The grid to be used to generate the column.
+///   By default, the global `$neat-grid` will be used.
 ///
 /// @example scss
 ///   .element {

data/core/neat/mixins/_grid-container.scss

@@ -1,12 +1,13 @@
 @charset "UTF-8";
-/// Creates a Neat grid container with clearfix.
+/// Creates a grid container with clearfix.
 ///
 /// @group features
 ///
-/// @name Grid containter
+/// @name Grid container
 ///
 /// @argument {map} $grid [$neat-grid]
-///   The type of grid for this column.
+///   The grid to be used to generate the container.
+///   By default, the global `$neat-grid` will be used.
 ///
 /// @example scss
 ///   .element {

data/core/neat/mixins/_grid-media.scss

@@ -1,15 +1,28 @@
 @charset "UTF-8";
-/// Creates a media query in which custom grid properties can be defined.
-/// Add the `media` property to your custom grid settings map and add the media
-/// you would like to scope to. If  only a number is defined, it is assumed this
-/// is a `min-with` value. Your custom grid can then be passed to the mixin.
+/// `grid-media` allows you to change your layout based on a media query.
+/// For example, an object can span 3 columns on small screens and 6 columns
+/// on large screens.
+///
+/// You can take this a step further and set different grid attributes like
+/// gutter size and total column count for each media query. So, for example,
+/// you can have a `1rem` gutter on small screens, and a `2rem` gutter on large
+/// screens.
 ///
 /// @group features
 ///
 /// @name Grid media
 ///
 /// @argument {map} $grid
-///   The grid used to generate the column.
+///   The grid to be used within the scope of the block.
+///   This grid should include the `media` property to determine the expression
+///   for the media query.
+///
+/// @content
+///   Grid media will temporarily the override the default grid with the
+///   attributes of the custom grid. This change is scoped to within the mixin
+///   block, and once the mixin has ended the default grid will revert to its
+///   original state as defined by `$neat-grid`. This allows for different
+///   gutter width and column count based on screen size or other properties.
 ///
 /// @example scss
 ///   $custom-neat-grid: (
@@ -47,7 +60,7 @@
 
   @media #{$_query} {
     $_default-neat-grid: $neat-grid;
-    $neat-grid: $grid !global;
+    $neat-grid: map-merge($neat-grid, $grid) !global;
     @content;
     $neat-grid: $_default-neat-grid !global;
   }

data/core/neat/mixins/_grid-push.scss

@@ -1,14 +1,15 @@
 @charset "UTF-8";
-/// Push or pull a Neat grid column by manipulating its left margin.
+/// Push or pull a grid column by manipulating its left margin.
 ///
 /// @group features
 ///
 /// @name Grid push
 ///
 /// @argument {number (unitless)} $push [false]
+///   The number of columns to push the column.
 ///
 /// @argument {map} $grid [$neat-grid]
-///   The grid to be used to generate the column.
+///   The grid to be used to detirmine how far to push the column.
 ///   By default, the global `$neat-grid` will be used.
 ///
 /// @example scss

data/core/neat/mixins/_grid-shift.scss

@@ -7,9 +7,10 @@
 /// @name Grid shift
 ///
 /// @argument {number (unitless)} $shift [false]
+///   The number of columns to shift the column.
 ///
 /// @argument {map} $grid [$neat-grid]
-///   The grid to be used to generate the column.
+///   The grid to be used to detirmine how far to shift the column.
 ///   By default, the global `$neat-grid` will be used.
 ///
 /// @example scss

data/core/neat/mixins/_grid-visual.scss

@@ -1,5 +1,6 @@
 @charset "UTF-8";
-/// Creates a guide on a grid container to visualise the columns.
+/// Creates a series of guide lines using the `background-image` property on a
+/// grid container to visualise the columns and gutters of the grid.
 ///
 /// @group features
 ///
@@ -9,7 +10,7 @@
 ///   The color of the guide lines created.
 ///
 /// @argument {map} $grid [$neat-grid]
-///   The grid used to determine the guide
+///   The grid used to determine the guides
 ///
 /// @example scss
 ///   .element {
@@ -18,7 +19,7 @@
 ///
 /// @example css
 ///   .element {
-///     background-image: … ;
+///     background-image: linear-gradient( … ) ;
 ///   }
 
 @mixin grid-visual($color: null, $grid: $neat-grid) {
@@ -31,11 +32,8 @@
   $_grid-visual-object: () !default;
   $_grid-visual:
     $color,
-    $color 1px,
-    transparent 1px,
+    $color $_grid-gutter,
     transparent $_grid-gutter,
-    $color calc(#{$_grid-gutter} + 1px),
-    transparent calc(#{$_grid-gutter} + 2px),
   ;
 
   @for $i from 1 to $_grid-columns {
@@ -50,36 +48,20 @@
     $_grid-visual-loop-list:
       transparent calc(#{$location}),
       $color calc(#{$location}),
-      $color calc(#{$location} + 1px),
-      transparent calc(#{$location} + 1px),
-      transparent calc(#{$location} + #{$_grid-gutter}),
       $color calc(#{$location} + #{$_grid-gutter}),
-      $color calc(#{$location} + #{$_grid-gutter} + 1px),
-      transparent calc(#{$location} + #{$_grid-gutter} + 1px),
+      transparent calc(#{$location} + #{$_grid-gutter}),
     ;
 
     $_grid-visual: _neat-append-grid-visual($_grid-visual, $_grid-visual-loop-list);
   }
 
   $_grid-visual-loop-list:
-    transparent calc(100% - #{$_grid-gutter}),
-    $color calc(100% - #{$_grid-gutter}),
-    $color calc(100% - #{$_grid-gutter} + 1px),
-    transparent calc(100% - #{$_grid-gutter} + 1px),
-    transparent calc(100% - 1px),
-    $color calc(100% - 1px),
+      transparent calc(100% - #{$_grid-gutter}),
+      $color calc(100% - #{$_grid-gutter}),
+      $color calc(100%),
   ;
 
   $_grid-visual: _neat-append-grid-visual($_grid-visual, $_grid-visual-loop-list);
 
-  background-image:
-    linear-gradient(to right, $_grid-visual),
-    linear-gradient(to bottom,
-      $color,
-      $color 1px,
-      transparent 1px,
-      transparent calc(100% - 1px),
-      $color calc(100% - 1px),
-      $color
-  );
+  background-image: linear-gradient(to right, $_grid-visual);
 }

data/core/neat/settings/_settings.scss

@@ -1,34 +1,4 @@
 @charset "UTF-8";
-/// Neat’s default grid.
-///
-/// @group settings
-///
-/// @type map
-///
-/// @name Default settings
-///
-/// @property {number (unitless)} columns [12]
-///   Default number of the total grid columns.
-///
-/// @property {number (with unit)} gutter [20px]
-///   Default grid gutter width between columns.
-///
-/// @property {string | number (with unit)} gutter [null]
-///   Grid media query.
-///
-/// @property {color} color [rgba(#00d4ff, 0.25)]
-///   Default visual grid color.
-///
-/// @access private
-
-$_neat-grid-defaults: (
-  columns: 12,
-  gutter: 20px,
-  media: null,
-  color: rgba(#00d4ff, 0.25),
-  direction: ltr,
-);
-
 /// This variable is a sass map that overrides Neat's default grid settings.
 /// Use this to define your project's grid properties incluting gutters and
 /// total column count.
@@ -40,10 +10,10 @@ $_neat-grid-defaults: (
 /// @name Neat grid
 ///
 /// @property {number (unitless)} columns [12]
-///   Number of the total grid columns.
+///   Default number of the total grid columns.
 ///
 /// @property {number (with unit)} gutter [20px]
-///   Grid gutter width between columns.
+///   Default grid gutter width between columns.
 ///
 /// @example scss
 ///   $neat-grid: (
@@ -53,15 +23,15 @@ $_neat-grid-defaults: (
 
 $neat-grid: () !default;
 
-/// If you would like to have multiple grids in a single project, you can do
+/// If you need multiple grids in a single project, you can do
 /// this by defining a new map stored within a variable of your choosing. This
 /// variable can then be passed directly in to any of Neat's mixins like
-/// [`grid-span(12, $my-custom-grid)`](#grid-span).
+/// [`grid-column(12, $my-custom-grid)`](#grid-column).
 ///
 /// Custom grids are especially useful with [`grid-media`](#grid-media). By
 /// defining a `media` attribute within your custom grid, you are able to easily
-/// define both the attributes of a grid as well as at what breakpoint this grid
-/// should activate.
+/// define gutter width and total column count as well the breakpoint at which
+/// they should activate.
 ///
 /// @type map
 ///
@@ -69,8 +39,6 @@ $neat-grid: () !default;
 ///
 /// @name Custom grids
 ///
-/// @see {mixin} Grid media
-///
 /// @property {number (unitless)} columns [12]
 ///   Number of the total grid columns.
 ///
@@ -81,11 +49,19 @@ $neat-grid: () !default;
 ///   The `@media` definition that is used by the [`grid-media`](#grid-media)
 ///   mixin to detirmine the media properties.
 ///
+/// @property {color} color [null]
+///   The color used by [`grid-visual`](#grid-visual) to create the guides.
+///
+/// @property {string} direction [ltr]
+///   The float direction used throughout the grid.
+///
 /// @example scss
 ///   $my-custom-grid: (
 ///     columns: 12,
 ///     gutter: 20px,
 ///     media: 1200px,
+///     color: rgba(#00d4ff, 0.25),
+///     direction: ltr,
 ///   );
 ///
 ///   $other-custom-grid-for-print: (

data/lib/neat/generator.rb

@@ -27,7 +27,7 @@ module Neat
       end
     end
 
-    desc "update", "Remove Neat"
+    desc "remove", "Remove Neat"
     def remove
       if neat_files_already_exist?
         remove_neat_directory
@@ -62,7 +62,7 @@ module Neat
     end
 
     def stylesheets_directory
-      File.join(top_level_directory, "app", "assets", "stylesheets")
+      File.join(top_level_directory, "core")
     end
 
     def top_level_directory

data/lib/neat/version.rb

@@ -1,3 +1,3 @@
 module Neat
-  VERSION = "2.0.0.beta.2"
+  VERSION = "2.0.0"
 end

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bourbon-neat",
-  "version": "2.0.0-beta.2",
-  "description": "A lightweight, semantic grid framework built with Bourbon",
+  "version": "2.0.0",
+  "description": "A lightweight, semantic grid framework",
   "keywords": [
     "columns",
     "grid",

data/spec/neat/mixins/grid_collapse_spec.rb

@@ -7,8 +7,7 @@ describe "grid-collapse" do
 
   context "called with default settings" do
     it "adds margin for just the gutter with no specified column" do
-      ruleset = "float: left; " +
-        "margin-left: -20px; " +
+      ruleset = "margin-left: -20px; " +
         "margin-right: -20px; " +
         "width: calc(100% + 40px);"
       expect(".grid-collapse-default").to have_ruleset(ruleset)
@@ -17,8 +16,7 @@ describe "grid-collapse" do
 
   context "called with custom settings" do
     it "adds margin for just the gutter with no specified column" do
-      ruleset = "float: left; " +
-        "margin-left: -4rem; " +
+      ruleset = "margin-left: -4rem; " +
         "margin-right: -4rem; " +
         "width: calc(100% + 8rem);"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neat
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Joel Oliveira
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -156,6 +156,7 @@ files:
 - core/neat/functions/_neat-column-ratio.scss
 - core/neat/functions/_neat-column-width.scss
 - core/neat/functions/_neat-float-direction.scss
+- core/neat/functions/_neat-merge-defaults.scss
 - core/neat/functions/_neat-opposite-direction.scss
 - core/neat/functions/_neat-parse-columns.scss
 - core/neat/functions/_neat-parse-media.scss
@@ -223,9 +224,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.8