neat 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f802639f3eb89eafca425f71ebbfbdb3ed8b1aff
-  data.tar.gz: 59b52dc35945401d1674dbd35c073cc220aebf61
+  metadata.gz: eb26b456c30e4c434a7cc8647c722e8ff437e57e
+  data.tar.gz: ac4e317c5cb46d3ef6508bfe9cd780b777d48392
 SHA512:
-  metadata.gz: 0ae72e905832fe0dcf0cada066bc786c92b320ae1be4197d8349da3002e7d451f1fda0a627154a2a92e2c24364be45662e1e2dc29d939045465b424578257252
-  data.tar.gz: 7e99d8de395b034489334a65a63fce9bd041823f6c617f1eeaf0205a54837444a7e8da99b971db60a323612a68cecf454973ccd67a231228628dcd1c64c88602
+  metadata.gz: f6a26d940e3a23528ebcf9a906be74c3603f9b9621fc069c3097cf9c7707540bf382f7b7c1ec7d684a209b5d7200bb5480d395ce53d6afd2eef64b22d0255be3
+  data.tar.gz: a1160e62fbdbe674ee29ec41b43c0f5255743cd82a5aa119fe532924b964b4f16c6f7d70f5d7ba8154abd810f336bb4dfbbda0366c38d45310769bffdce34701

data/.ruby-version

@@ -0,0 +1 @@
+2.3.1

data/README.md

@@ -1,11 +1,10 @@
 [![Neat](http://images.thoughtbot.com/bourbon/neat-logo.svg)](http://neat.bourbon.io)
 
-[![Gem Version](http://img.shields.io/gem/v/neat.svg?style=flat)](https://rubygems.org/gems/neat) [![Travis](http://img.shields.io/travis/thoughtbot/neat.svg?style=flat)](https://travis-ci.org/thoughtbot/neat)
-[![Gitter](http://img.shields.io/badge/gitter-neat-ae3dd2.svg?style=flat)](https://gitter.im/thoughtbot/neat)
-[![Stack Overflow](http://img.shields.io/badge/stack%20overflow-neat-ae3dd2.svg?style=flat)](http://stackoverflow.com/questions/tagged/neat)
-
 ## A lightweight, semantic grid framework
 
+**Note: This branch is an archive of Neat v1. The current release is v2 on
+`master`.**
+
 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.
 
 - **[Demo](http://neat.bourbon.io)**
@@ -269,7 +268,7 @@ Copyright © 2012–2015 [thoughtbot, inc](http://thoughtbot.com). Neat is free
 
 ## About thoughtbot
 
-[<img src="http://thoughtbot.github.io/images/signature.svg" width="250" alt="thoughtbot logo">][hire]
+[<img src="http://presskit.thoughtbot.com/images/signature.svg" width="250" alt="thoughtbot logo">][hire]
 
 Neat is maintained and funded by thoughtbot, inc.
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.

data/app/assets/stylesheets/_neat.scss

@@ -1,4 +1,4 @@
-// Neat 1.8.0
+// Neat 1.9.0
 // http://neat.bourbon.io
 // Copyright 2012-2015 thoughtbot, inc.
 // MIT License
@@ -17,6 +17,7 @@
 @import "grid/pad";
 @import "grid/fill-parent";
 @import "grid/media";
+@import "grid/reset-display";
 @import "grid/to-deprecate";
 @import "grid/visual-grid";
 @import "grid/display-context";

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

@@ -56,22 +56,26 @@
 // Generates a striped background
 @function gradient-stops($grid-columns, $color: $visual-grid-color) {
   $transparent: transparent;
+  $alt-color: darken($color, 10%);
 
   $column-width: flex-grid(1, $grid-columns);
   $gutter-width: flex-gutter($grid-columns);
   $column-offset: $column-width;
+  $alternate: false;
 
-  $values: ($transparent 0, $color 0);
+  $values: ($transparent 0, if($alternate, $color, $alt-color) 0);
 
   @for $i from 1 to $grid-columns*2 {
     @if is-even($i) {
       $values: append($values, $transparent $column-offset, comma);
-      $values: append($values, $color $column-offset, comma);
+      $values: append($values, if($alternate, $color, $alt-color) $column-offset, comma);
       $column-offset: $column-offset + $column-width;
     } @else {
-      $values: append($values, $color $column-offset, comma);
+      $values: append($values, if($alternate, $color, $alt-color) $column-offset, comma);
       $values: append($values, $transparent $column-offset, comma);
       $column-offset: $column-offset + $gutter-width;
+
+      $alternate: not $alternate;
     }
   }
 
@@ -112,3 +116,39 @@
 
   @return $opposite-direction;
 }
+
+
+@function to-number($string) {
+  $string: str-replace($string, " ", "");
+  $strings: "0" "1" "2" "3" "4" "5" "6" "7" "8" "9";
+  $numbers:  0 1 2 3 4 5 6 7 8 9;
+  $result: 0;
+
+  @for $i from 1 through str-length($string) {
+    $character: str-slice($string, $i, $i);
+    $index: index($strings, $character);
+
+    @if not $index {
+      @warn "Unknown character `#{$character}`.";
+      @return false;
+    }
+
+    $number: nth($numbers, $index);
+    $result: $result * 10 + $number;
+  }
+
+  @return $result;
+}
+
+@function str-replace($string, $search, $replace: "") {
+  $index: str-index($string, $search);
+
+  @if $index {
+    $first: str-slice($string, 1, $index - 1);
+    $last-slice: str-slice($string, $index + str-length($search));
+    $last: str-replace($last-slice, $search, $replace);
+    @return $first + $replace + $last;
+  }
+
+  @return $string;
+}

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

@@ -79,7 +79,32 @@
     margin-#{$direction}: 0;
   }
 
-  @if type-of($query) == number and unit($query) == "n" {
+  @if type-of($query) == string {
+    $query: str-replace($query, " ", "");
+    $operator: false;
+
+    @if str_index($query, "+") {
+      $operator: "+";
+    } @else if str_index($query, "-") {
+      $operator: "-";
+    }
+
+    @if $operator {
+      $operator-index: str_index($query, $operator);
+      $first: str-slice($query, 0, ($operator-index - 1));
+      $last: to-number(str-slice($query, ($operator-index + 1), -1));
+      @if $operator == "+" {
+        $last: $last + 1;
+      } @else if $operator == "-" {
+        $last: $last - 1;
+      }
+      $nth: "#{$first}#{$operator}#{$last}";
+
+      &:nth-child(#{$nth}) {
+        clear: $opposite-direction;
+      }
+    }
+  } @else if type-of($query) == number && unit($query) == "n" {
     &:nth-child(#{$query}+1) {
       clear: $opposite-direction;
     }

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

@@ -6,18 +6,18 @@ $container-display-table: false !default;
 $layout-direction: LTR !default;
 
 @function flex-grid($columns, $container-columns: $fg-max-columns) {
-  $width: $columns * $fg-column + ($columns - 1) * $fg-gutter;
-  $container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter;
+  $width: flex-width($columns);
+  $container-width: flex-width($container-columns);
   @return percentage($width / $container-width);
 }
 
 @function flex-gutter($container-columns: $fg-max-columns, $gutter: $fg-gutter) {
-  $container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter;
+  $container-width: flex-width($container-columns);
   @return percentage($gutter / $container-width);
 }
 
-@function grid-width($n) {
-  @return $n * $gw-column + ($n - 1) * $gw-gutter;
+@function flex-width($n, $column-width: $fg-column, $gutter-width: $fg-gutter) {
+  @return $n * $column-width + ($n - 1) * $gutter-width;
 }
 
 @function get-parent-columns($columns) {

data/app/assets/stylesheets/grid/_reset-display.scss

@@ -0,0 +1,14 @@
+/// Resets the active display property to `block`. Particularly useful when changing the display property in a single row.
+///
+/// @example scss - Usage
+///   .element {
+///     @include row(table);
+///     // Context changed to table display
+///   }
+///
+///   @include reset-display;
+///   // Context is reset to block display
+
+@mixin reset-display {
+  $container-display-table: false !global;
+}

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

@@ -29,16 +29,9 @@
 /// }
 
 @mixin row($display: default, $direction: $default-layout-direction) {
-  @if $direction != $default-layout-direction {
-    @include -neat-warn("The $direction argument will be deprecated in future versions in favor of the direction(){...} mixin.");
-  }
 
   $layout-direction: $direction !global;
 
-  @if $display != default {
-    @include -neat-warn("The $display argument will be deprecated in future versions in favor of the display(){...} mixin.");
-  }
-
   @if $display == table {
     display: table;
     @include fill-parent;

data/app/assets/stylesheets/grid/_to-deprecate.scss

@@ -48,22 +48,6 @@
   @include omega($nth $display, $direction);
 }
 
-/// Resets the active display property to `block`. Particularly useful when changing the display property in a single row.
-///
-/// @example scss - Usage
-///   .element {
-///     @include row(table);
-///     // Context changed to table display
-///   }
-///
-///   @include reset-display;
-///   // Context is reset to block display
-
-@mixin reset-display {
-  $container-display-table: false !global;
-  @include -neat-warn("Resetting $display will be deprecated in future versions in favor of the display(){...} mixin.");
-}
-
 /// Resets the active layout direction to the default value set in `$default-layout-direction`. Particularly useful when changing the layout direction in a single row.
 ///
 /// @example scss - Usage

data/bower.json

@@ -1,7 +1,7 @@
 {
   "name": "neat",
   "description": "A lightweight, semantic grid framework",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "main": "app/assets/stylesheets/_neat.scss",
   "license": "MIT",
   "ignore": [

data/contrib/styles.scss

@@ -1,4 +1,4 @@
-@import "../app/assets/stylesheets/neat";
+$visual-grid: true !global;
 
 // Grid Settings
 $column: 90px;
@@ -10,6 +10,8 @@ $max-width: 1200px;
 $medium-screen: 600px;
 $large-screen: 900px;
 
+@import "../app/assets/stylesheets/neat";
+
 $medium-screen-up: new-breakpoint(min-width $medium-screen 4);
 $large-screen-up: new-breakpoint(min-width $large-screen 8);
 
@@ -18,7 +20,7 @@ $base-line-height: 1.625;
 $base-spacing: $base-line-height * 1em;
 
 // Visual Grid
-$visual-grid: true;
+
 $visual-grid-color: #e6f6ff;
 $visual-grid-opacity: 0.4;
 

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

data/lib/neat/version.rb

@@ -1,3 +1,3 @@
 module Neat
-  VERSION = "1.8.0"
+  VERSION = "1.9.0"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bourbon-neat",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "A lightweight, semantic grid framework",
   "keywords": [
     "columns",
@@ -33,7 +33,7 @@
     "test": "echo \"No test specified\""
   },
   "dependencies": {
-    "node-sass": "^3.4"
+    "node-sass": "^4.1.1"
   },
   "devDependencies": {
     "gulp": "^3.9",

data/spec/neat/omega_spec.rb

@@ -7,36 +7,59 @@ describe "@include omega()" do
 
   context "with no argument" do
     it "removes right margin" do
-      expect(".omega-default").to have_rule("margin-right: 0")
+      selector = ".omega-default"
+      expect(selector).to have_rule("margin-right: 0")
     end
   end
 
   context "with argument (4n)" do
     it "removes right margin of nth-child(4n)" do
-      expect(".omega-nth-default:nth-child(4n)").to have_rule("margin-right: 0")
+      selector = ".omega-nth-default:nth-child(4n)"
+      expect(selector).to have_rule("margin-right: 0")
     end
 
     it "adds clear to nth-child(4n+1)" do
-      expect(".omega-nth-default:nth-child(4n+1)").to have_rule("clear: left")
+      selector = ".omega-nth-default:nth-child(4n+1)"
+      expect(selector).to have_rule("clear: left")
     end
   end
 
   context "with argument ('4n+1')" do
     it "removes right margin of nth-child(4n+1)" do
-      expect(".omega-complex-nth:nth-child(4n+1)").to have_rule("margin-right: 0")
+      selector = ".omega-complex-nth:nth-child(4n+1)"
+      expect(selector).to have_rule("margin-right: 0")
+    end
+
+    it "adds clear to nth-child('4n+2')" do
+      selector = ".omega-complex-nth:nth-child(4n+2)"
+      expect(selector).to have_rule("clear: left")
+    end
+  end
+
+  context "with argument ('3n-1')" do
+    it "removes right margin of nth-child(3n-1)" do
+      selector = ".omega-complex-nth-negative:nth-child(3n-1)"
+      expect(selector).to have_rule("margin-right: 0")
+    end
+
+    it "adds clear to nth-child('3n-0')" do
+      selector = ".omega-complex-nth-negative:nth-child(3n-0)"
+      expect(selector).to have_rule("clear: left")
     end
   end
 
   context "when called inside an RTL row" do
     context "with no argument" do
       it "removes left margin" do
-        expect("section .omega-default-left").to have_rule("margin-left: 0")
+        selector = "section .omega-default-left"
+        expect(selector).to have_rule("margin-left: 0")
       end
     end
 
     context "with argument (4n block)" do
       it "removes left margin of nth-child(4n)" do
-        expect("section .omega-nth-default-left:nth-child(4n)").to have_rule("margin-left: 0")
+        selector = "section .omega-nth-default-left:nth-child(4n)"
+        expect(selector).to have_rule("margin-left: 0")
       end
     end
   end

data/test/omega.scss

@@ -12,6 +12,10 @@
   @include omega("4n+1");
 }
 
+.omega-complex-nth-negative {
+  @include omega("3n-1");
+}
+
 section {
   @include row($direction: RTL);
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neat
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Joel Oliveira
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -164,6 +164,7 @@ files:
 - ".gitignore"
 - ".npmignore"
 - ".rspec"
+- ".ruby-version"
 - ".scss-lint.yml"
 - ".travis.yml"
 - CONTRIBUTING.md
@@ -186,6 +187,7 @@ files:
 - app/assets/stylesheets/grid/_outer-container.scss
 - app/assets/stylesheets/grid/_pad.scss
 - app/assets/stylesheets/grid/_private.scss
+- app/assets/stylesheets/grid/_reset-display.scss
 - app/assets/stylesheets/grid/_row.scss
 - app/assets/stylesheets/grid/_shift.scss
 - app/assets/stylesheets/grid/_span-columns.scss
@@ -258,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: neat
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A lightweight, semantic grid framework