+
+ @include span-columns(4);
-
-
- @include outer-container;
- $mobile: new-breakpoint(max-width 500px 4);
-
-
-
- @include span-columns(4);
-
- @include media($mobile) {
- @include span-columns(3);
- }
-
-
-
- @include span-columns(8);
-
- @include media($mobile) {
- @include span-columns(3);
- }
-
+ @include media($mobile) {
+ @include span-columns(3);
+ }
+
+
+
+ @include span-columns(8);
+ @include media($mobile) {
+ @include span-columns(3);
+ }
+
][hire]
+[
][hire]
Neat is maintained and funded by thoughtbot, inc.
The names and logos for thoughtbot are trademarks of thoughtbot, inc.
From 22b451f5062a0d4370f655c598d0191d96782a3b Mon Sep 17 00:00:00 2001
From: Mehdi Lahmam
Date: Sun, 16 Aug 2015 00:22:15 +0200
Subject: [PATCH 099/269] Let `pad` mixin accept `null` to skip a side
Because this mixin was only outputting `padding` property, it was hard
to avoid overriding inherited padding values.
Now, we can skip any side by passing `null` in the list of values.
`pad` now requires Bourbon's `directional-property` mixin.
Fix #113
---
app/assets/stylesheets/grid/_pad.scss | 8 ++++----
spec/neat/pad_spec.rb | 24 +++++++++++++++++++++++-
spec/support/matchers/have_ruleset.rb | 20 ++++++++++++++++++++
test/pad.scss | 8 ++++++++
4 files changed, 55 insertions(+), 5 deletions(-)
create mode 100644 spec/support/matchers/have_ruleset.rb
diff --git a/app/assets/stylesheets/grid/_pad.scss b/app/assets/stylesheets/grid/_pad.scss
index d697e1b9..91502c4e 100644
--- a/app/assets/stylesheets/grid/_pad.scss
+++ b/app/assets/stylesheets/grid/_pad.scss
@@ -3,7 +3,7 @@
/// Adds padding to the element.
///
/// @param {List} $padding [flex-gutter()]
-/// A list of padding value(s) to use. Passing `default` in the list will result in using the gutter width as a padding value.
+/// A list of padding value(s) to use. Passing `default` in the list will result in using the gutter width as a padding value. Use a `null` value to “skip” a side.
///
/// @example scss - Usage
/// .element {
@@ -16,10 +16,10 @@
/// }
@mixin pad($padding: flex-gutter()) {
- $padding-list: null;
+ $vals: ();
@each $value in $padding {
$value: if($value == 'default', flex-gutter(), $value);
- $padding-list: join($padding-list, $value);
+ $vals: append($vals, $value);
}
- padding: $padding-list;
+ @include directional-property(padding, false, $vals);
}
diff --git a/spec/neat/pad_spec.rb b/spec/neat/pad_spec.rb
index 72685620..755ac822 100644
--- a/spec/neat/pad_spec.rb
+++ b/spec/neat/pad_spec.rb
@@ -25,7 +25,29 @@
context "with argument (default)" do
it "uses default gutter percentage" do
- expect(".pad-shorthand-default").to have_rule("padding: 30px 2.35765% 10px 2.35765%")
+ expect(".pad-shorthand-default").to have_rule("padding: 30px 2.35765% 10px")
+ end
+ end
+
+ context "with argument (null)" do
+ it "ignores rules with null values" do
+ ruleset = "padding-right: 10px; " +
+ "padding-left: 10px;"
+ bad_rule = "padding-top: null;"
+
+ expect(".pad-null-values").to have_ruleset(ruleset)
+ expect(".pad-null-values").to_not have_rule(bad_rule)
+ end
+ end
+
+ context "with argument (null default)" do
+ it "sets right and left paddings to gutter percentage" do
+ ruleset = "padding-right: 2.35765%; " +
+ "padding-left: 2.35765%;"
+ bad_rule = "padding-top: null;"
+
+ expect(".pad-null-and-default").to have_ruleset(ruleset)
+ expect(".pad-null-and-default").to_not have_rule(bad_rule)
end
end
end
diff --git a/spec/support/matchers/have_ruleset.rb b/spec/support/matchers/have_ruleset.rb
new file mode 100644
index 00000000..c2218823
--- /dev/null
+++ b/spec/support/matchers/have_ruleset.rb
@@ -0,0 +1,20 @@
+RSpec::Matchers.define :have_ruleset do |expected|
+ match do |selector|
+ @ruleset = rules_from_selector(selector)
+ @ruleset.join("; ") == expected
+ end
+
+ failure_message do |selector|
+ if @ruleset.empty?
+ %{no CSS for selector #{selector} were found}
+ else
+ ruleset = @ruleset.join("; ")
+ %{Expected selector #{selector} to have CSS rule "#{expected}".
+ Had "#{ruleset}".}
+ end
+ end
+
+ def rules_from_selector(selector)
+ ParserSupport.parser.find_by_selector(selector)
+ end
+end
diff --git a/test/pad.scss b/test/pad.scss
index d9441e6e..33a63d77 100644
--- a/test/pad.scss
+++ b/test/pad.scss
@@ -15,3 +15,11 @@
.pad-shorthand-default {
@include pad(30px default 10px default);
}
+
+.pad-null-values {
+ @include pad(null 10px null 10px);
+}
+
+.pad-null-and-default {
+ @include pad(null default);
+}
From e9b3f36c27fc07019938dcea793a78fa2b5bbeae Mon Sep 17 00:00:00 2001
From: Will H McMahan
Date: Thu, 7 Jul 2016 14:22:17 -0400
Subject: [PATCH 100/269] Revert "Let `pad` mixin accept `null` to skip a side"
This reverts commit 22b451f5062a0d4370f655c598d0191d96782a3b.
Unfortely, now that bourbon is no longer a dependancy, this chage no longer
functions. If this functionality is required for your project, use bourbon and
import the `padding()` mixin.
---
app/assets/stylesheets/grid/_pad.scss | 8 ++++----
spec/neat/pad_spec.rb | 24 +-----------------------
spec/support/matchers/have_ruleset.rb | 20 --------------------
test/pad.scss | 8 --------
4 files changed, 5 insertions(+), 55 deletions(-)
delete mode 100644 spec/support/matchers/have_ruleset.rb
diff --git a/app/assets/stylesheets/grid/_pad.scss b/app/assets/stylesheets/grid/_pad.scss
index 91502c4e..d697e1b9 100644
--- a/app/assets/stylesheets/grid/_pad.scss
+++ b/app/assets/stylesheets/grid/_pad.scss
@@ -3,7 +3,7 @@
/// Adds padding to the element.
///
/// @param {List} $padding [flex-gutter()]
-/// A list of padding value(s) to use. Passing `default` in the list will result in using the gutter width as a padding value. Use a `null` value to “skip” a side.
+/// A list of padding value(s) to use. Passing `default` in the list will result in using the gutter width as a padding value.
///
/// @example scss - Usage
/// .element {
@@ -16,10 +16,10 @@
/// }
@mixin pad($padding: flex-gutter()) {
- $vals: ();
+ $padding-list: null;
@each $value in $padding {
$value: if($value == 'default', flex-gutter(), $value);
- $vals: append($vals, $value);
+ $padding-list: join($padding-list, $value);
}
- @include directional-property(padding, false, $vals);
+ padding: $padding-list;
}
diff --git a/spec/neat/pad_spec.rb b/spec/neat/pad_spec.rb
index 755ac822..72685620 100644
--- a/spec/neat/pad_spec.rb
+++ b/spec/neat/pad_spec.rb
@@ -25,29 +25,7 @@
context "with argument (default)" do
it "uses default gutter percentage" do
- expect(".pad-shorthand-default").to have_rule("padding: 30px 2.35765% 10px")
- end
- end
-
- context "with argument (null)" do
- it "ignores rules with null values" do
- ruleset = "padding-right: 10px; " +
- "padding-left: 10px;"
- bad_rule = "padding-top: null;"
-
- expect(".pad-null-values").to have_ruleset(ruleset)
- expect(".pad-null-values").to_not have_rule(bad_rule)
- end
- end
-
- context "with argument (null default)" do
- it "sets right and left paddings to gutter percentage" do
- ruleset = "padding-right: 2.35765%; " +
- "padding-left: 2.35765%;"
- bad_rule = "padding-top: null;"
-
- expect(".pad-null-and-default").to have_ruleset(ruleset)
- expect(".pad-null-and-default").to_not have_rule(bad_rule)
+ expect(".pad-shorthand-default").to have_rule("padding: 30px 2.35765% 10px 2.35765%")
end
end
end
diff --git a/spec/support/matchers/have_ruleset.rb b/spec/support/matchers/have_ruleset.rb
deleted file mode 100644
index c2218823..00000000
--- a/spec/support/matchers/have_ruleset.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-RSpec::Matchers.define :have_ruleset do |expected|
- match do |selector|
- @ruleset = rules_from_selector(selector)
- @ruleset.join("; ") == expected
- end
-
- failure_message do |selector|
- if @ruleset.empty?
- %{no CSS for selector #{selector} were found}
- else
- ruleset = @ruleset.join("; ")
- %{Expected selector #{selector} to have CSS rule "#{expected}".
- Had "#{ruleset}".}
- end
- end
-
- def rules_from_selector(selector)
- ParserSupport.parser.find_by_selector(selector)
- end
-end
diff --git a/test/pad.scss b/test/pad.scss
index 33a63d77..d9441e6e 100644
--- a/test/pad.scss
+++ b/test/pad.scss
@@ -15,11 +15,3 @@
.pad-shorthand-default {
@include pad(30px default 10px default);
}
-
-.pad-null-values {
- @include pad(null 10px null 10px);
-}
-
-.pad-null-and-default {
- @include pad(null default);
-}
From 80a98eea1ad44f627c3cf6454c025a8cd32af9c2 Mon Sep 17 00:00:00 2001
From: Will H McMahan
Date: Thu, 7 Jul 2016 13:20:13 -0400
Subject: [PATCH 101/269] Remove deprecation warning from reset-display
- https://github.com/thoughtbot/neat/issues/338
---
app/assets/stylesheets/_neat.scss | 1 +
app/assets/stylesheets/grid/_reset-display.scss | 14 ++++++++++++++
app/assets/stylesheets/grid/_row.scss | 7 -------
app/assets/stylesheets/grid/_to-deprecate.scss | 16 ----------------
contrib/styles.scss | 6 ++++--
5 files changed, 19 insertions(+), 25 deletions(-)
create mode 100644 app/assets/stylesheets/grid/_reset-display.scss
diff --git a/app/assets/stylesheets/_neat.scss b/app/assets/stylesheets/_neat.scss
index e1721712..a44f6e2c 100644
--- a/app/assets/stylesheets/_neat.scss
+++ b/app/assets/stylesheets/_neat.scss
@@ -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";
diff --git a/app/assets/stylesheets/grid/_reset-display.scss b/app/assets/stylesheets/grid/_reset-display.scss
new file mode 100644
index 00000000..b8332b87
--- /dev/null
+++ b/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;
+}
diff --git a/app/assets/stylesheets/grid/_row.scss b/app/assets/stylesheets/grid/_row.scss
index 4d913a92..81501607 100644
--- a/app/assets/stylesheets/grid/_row.scss
+++ b/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;
diff --git a/app/assets/stylesheets/grid/_to-deprecate.scss b/app/assets/stylesheets/grid/_to-deprecate.scss
index aeea0795..b46d9760 100644
--- a/app/assets/stylesheets/grid/_to-deprecate.scss
+++ b/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
diff --git a/contrib/styles.scss b/contrib/styles.scss
index 9d97a2fc..0576b53b 100644
--- a/contrib/styles.scss
+++ b/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;
From 443c44bb65bfc9d477738a9926a8c5428d00140b Mon Sep 17 00:00:00 2001
From: Mehdi Lahmam
Date: Sat, 15 Aug 2015 19:45:34 +0200
Subject: [PATCH 102/269] Alternate the background color for visual grid
columns
Based on @aubricus suggestion in #164
---
app/assets/stylesheets/functions/_private.scss | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/app/assets/stylesheets/functions/_private.scss b/app/assets/stylesheets/functions/_private.scss
index 872d4dc5..a61acc1d 100644
--- a/app/assets/stylesheets/functions/_private.scss
+++ b/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;
}
}
From a818981c7c172882383c8d4c6fc1638749d99019 Mon Sep 17 00:00:00 2001
From: Kite
Date: Sun, 3 Jul 2016 19:52:42 +0900
Subject: [PATCH 103/269] Fix the description of `neat remove`
---
lib/neat/generator.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/neat/generator.rb b/lib/neat/generator.rb
index 6d57febb..417bef4f 100644
--- a/lib/neat/generator.rb
+++ b/lib/neat/generator.rb
@@ -27,7 +27,7 @@ def update
end
end
- desc "update", "Remove Neat"
+ desc "remove", "Remove Neat"
def remove
if neat_files_already_exist?
remove_neat_directory
From 1047d6ed99fb7ece8a599f54b11bd55cf534f229 Mon Sep 17 00:00:00 2001
From: Tobias Adam
Date: Wed, 6 Apr 2016 16:00:53 +0200
Subject: [PATCH 104/269] Clarify how the grid calculation functions works
The function `grid-width` was unused but defined. I renamed it to
`flex-width` to be consistent in naming with the other grid functions
and used it to calculate the width values that are used in `flex-grid` and
`flex-gutter` because the way these calculations work is always the
same.
---
app/assets/stylesheets/grid/_private.scss | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/assets/stylesheets/grid/_private.scss b/app/assets/stylesheets/grid/_private.scss
index 4c4e18c1..51224274 100644
--- a/app/assets/stylesheets/grid/_private.scss
+++ b/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) {
From 0bd8027f7f29aa19e17df1205fa8f5cba1ab68a3 Mon Sep 17 00:00:00 2001
From: Joshua Ogle
Date: Mon, 27 Apr 2015 15:55:07 -0600
Subject: [PATCH 105/269] Add support for complex nth-child selectors in
omega()
---
.../stylesheets/functions/_private.scss | 36 +++++++++++++++++++
app/assets/stylesheets/grid/_omega.scss | 27 +++++++++++++-
spec/neat/omega_spec.rb | 35 ++++++++++++++----
test/omega.scss | 4 +++
4 files changed, 95 insertions(+), 7 deletions(-)
diff --git a/app/assets/stylesheets/functions/_private.scss b/app/assets/stylesheets/functions/_private.scss
index a61acc1d..9a6cd2f1 100644
--- a/app/assets/stylesheets/functions/_private.scss
+++ b/app/assets/stylesheets/functions/_private.scss
@@ -116,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;
+}
diff --git a/app/assets/stylesheets/grid/_omega.scss b/app/assets/stylesheets/grid/_omega.scss
index 80f918ab..f18e0f00 100644
--- a/app/assets/stylesheets/grid/_omega.scss
+++ b/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;
}
diff --git a/spec/neat/omega_spec.rb b/spec/neat/omega_spec.rb
index 68519139..137d2673 100644
--- a/spec/neat/omega_spec.rb
+++ b/spec/neat/omega_spec.rb
@@ -7,36 +7,59 @@
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
diff --git a/test/omega.scss b/test/omega.scss
index 7e82617c..c527bf10 100644
--- a/test/omega.scss
+++ b/test/omega.scss
@@ -12,6 +12,10 @@
@include omega("4n+1");
}
+.omega-complex-nth-negative {
+ @include omega("3n-1");
+}
+
section {
@include row($direction: RTL);
From 624d1b8c19769dfed6f2d1d60f9f8148cee4de33 Mon Sep 17 00:00:00 2001
From: Will H McMahan
Date: Mon, 12 Sep 2016 10:49:44 -0400
Subject: [PATCH 106/269] Update logo thoughtbot logo
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 9856ea68..04d77a2b 100644
--- a/README.md
+++ b/README.md
@@ -269,7 +269,7 @@ Copyright © 2012–2015 [thoughtbot, inc](http://thoughtbot.com). Neat is free
## About thoughtbot
-[][hire]
+[
][hire]
Neat is maintained and funded by thoughtbot, inc.
The names and logos for thoughtbot are trademarks of thoughtbot, inc.
From dc32fe6bef6722a78366a63acf6177132febcd9c Mon Sep 17 00:00:00 2001
From: Tyson Gach
Date: Mon, 7 Nov 2016 19:38:39 -0500
Subject: [PATCH 107/269] Specify Ruby version
---
.ruby-version | 1 +
1 file changed, 1 insertion(+)
create mode 100644 .ruby-version
diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 00000000..2bf1c1cc
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+2.3.1
From bf871e1b806db79c85d61b9c57b16c9a132cf6d0 Mon Sep 17 00:00:00 2001
From: Tyson Gach
Date: Sun, 24 Jan 2016 11:46:23 -0500
Subject: [PATCH 108/269] Remove all Neat Sass
---
app/assets/stylesheets/_neat-helpers.scss | 11 --
app/assets/stylesheets/_neat.scss | 24 ---
.../functions/_new-breakpoint.scss | 49 ------
.../stylesheets/functions/_private.scss | 154 ------------------
app/assets/stylesheets/grid/_box-sizing.scss | 15 --
.../stylesheets/grid/_direction-context.scss | 33 ----
.../stylesheets/grid/_display-context.scss | 28 ----
app/assets/stylesheets/grid/_fill-parent.scss | 22 ---
app/assets/stylesheets/grid/_media.scss | 92 -----------
app/assets/stylesheets/grid/_omega.scss | 112 -------------
.../stylesheets/grid/_outer-container.scss | 34 ----
app/assets/stylesheets/grid/_pad.scss | 25 ---
app/assets/stylesheets/grid/_private.scss | 35 ----
.../stylesheets/grid/_reset-display.scss | 14 --
app/assets/stylesheets/grid/_row.scss | 45 -----
app/assets/stylesheets/grid/_shift.scss | 50 ------
.../stylesheets/grid/_span-columns.scss | 94 -----------
.../stylesheets/grid/_to-deprecate.scss | 81 ---------
app/assets/stylesheets/grid/_visual-grid.scss | 42 -----
app/assets/stylesheets/mixins/_clearfix.scss | 25 ---
.../settings/_disable-warnings.scss | 13 --
app/assets/stylesheets/settings/_grid.scss | 51 ------
.../stylesheets/settings/_visual-grid.scss | 27 ---
23 files changed, 1076 deletions(-)
delete mode 100644 app/assets/stylesheets/_neat-helpers.scss
delete mode 100644 app/assets/stylesheets/_neat.scss
delete mode 100644 app/assets/stylesheets/functions/_new-breakpoint.scss
delete mode 100644 app/assets/stylesheets/functions/_private.scss
delete mode 100644 app/assets/stylesheets/grid/_box-sizing.scss
delete mode 100644 app/assets/stylesheets/grid/_direction-context.scss
delete mode 100644 app/assets/stylesheets/grid/_display-context.scss
delete mode 100644 app/assets/stylesheets/grid/_fill-parent.scss
delete mode 100644 app/assets/stylesheets/grid/_media.scss
delete mode 100644 app/assets/stylesheets/grid/_omega.scss
delete mode 100644 app/assets/stylesheets/grid/_outer-container.scss
delete mode 100644 app/assets/stylesheets/grid/_pad.scss
delete mode 100644 app/assets/stylesheets/grid/_private.scss
delete mode 100644 app/assets/stylesheets/grid/_reset-display.scss
delete mode 100644 app/assets/stylesheets/grid/_row.scss
delete mode 100644 app/assets/stylesheets/grid/_shift.scss
delete mode 100644 app/assets/stylesheets/grid/_span-columns.scss
delete mode 100644 app/assets/stylesheets/grid/_to-deprecate.scss
delete mode 100644 app/assets/stylesheets/grid/_visual-grid.scss
delete mode 100644 app/assets/stylesheets/mixins/_clearfix.scss
delete mode 100644 app/assets/stylesheets/settings/_disable-warnings.scss
delete mode 100644 app/assets/stylesheets/settings/_grid.scss
delete mode 100644 app/assets/stylesheets/settings/_visual-grid.scss
diff --git a/app/assets/stylesheets/_neat-helpers.scss b/app/assets/stylesheets/_neat-helpers.scss
deleted file mode 100644
index 2d6d808a..00000000
--- a/app/assets/stylesheets/_neat-helpers.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-// Mixins
-@import "mixins/clearfix";
-
-// Functions
-@import "functions/private";
-@import "functions/new-breakpoint";
-
-// Settings
-@import "settings/grid";
-@import "settings/visual-grid";
-@import "settings/disable-warnings";
diff --git a/app/assets/stylesheets/_neat.scss b/app/assets/stylesheets/_neat.scss
deleted file mode 100644
index a44f6e2c..00000000
--- a/app/assets/stylesheets/_neat.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-// Neat 1.8.0
-// http://neat.bourbon.io
-// Copyright 2012-2015 thoughtbot, inc.
-// MIT License
-
-// Helpers
-@import "neat-helpers";
-
-// Grid
-@import "grid/private";
-@import "grid/box-sizing";
-@import "grid/omega";
-@import "grid/outer-container";
-@import "grid/span-columns";
-@import "grid/row";
-@import "grid/shift";
-@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";
-@import "grid/direction-context";
diff --git a/app/assets/stylesheets/functions/_new-breakpoint.scss b/app/assets/stylesheets/functions/_new-breakpoint.scss
deleted file mode 100644
index 41ab9556..00000000
--- a/app/assets/stylesheets/functions/_new-breakpoint.scss
+++ /dev/null
@@ -1,49 +0,0 @@
-@charset "UTF-8";
-
-/// Returns a media context (media query / grid context) that can be stored in a variable and passed to `media()` as a single-keyword argument. Media contexts defined using `new-breakpoint` are used by the visual grid, as long as they are defined before importing Neat.
-///
-/// @param {List} $query
-/// A list of media query features and values. Each `$feature` should have a corresponding `$value`.
-///
-/// If there is only a single `$value` in `$query`, `$default-feature` is going to be used.
-///
-/// The number of total columns in the grid can be set by passing `$columns` at the end of the list (overrides `$total-columns`). For a list of valid values for `$feature`, click [here](http://www.w3.org/TR/css3-mediaqueries/#media1).
-///
-/// @param {Number (unitless)} $total-columns [$grid-columns]
-/// - Number of columns to use in the new grid context. Can be set as a shorthand in the first parameter.
-///
-/// @example scss - Usage
-/// $mobile: new-breakpoint(max-width 480px 4);
-///
-/// .element {
-/// @include media($mobile) {
-/// @include span-columns(4);
-/// }
-/// }
-///
-/// @example css - CSS Output
-/// @media screen and (max-width: 480px) {
-/// .element {
-/// display: block;
-/// float: left;
-/// margin-right: 7.42297%;
-/// width: 100%;
-/// }
-/// .element:last-child {
-/// margin-right: 0;
-/// }
-/// }
-
-@function new-breakpoint($query: $feature $value $columns, $total-columns: $grid-columns) {
- @if length($query) == 1 {
- $query: $default-feature nth($query, 1) $total-columns;
- } @else if is-even(length($query)) {
- $query: append($query, $total-columns);
- }
-
- @if is-not(belongs-to($query, $visual-grid-breakpoints)) {
- $visual-grid-breakpoints: append($visual-grid-breakpoints, $query, comma) !global;
- }
-
- @return $query;
-}
diff --git a/app/assets/stylesheets/functions/_private.scss b/app/assets/stylesheets/functions/_private.scss
deleted file mode 100644
index 9a6cd2f1..00000000
--- a/app/assets/stylesheets/functions/_private.scss
+++ /dev/null
@@ -1,154 +0,0 @@
-// Not function for Libsass compatibility
-// https://github.com/sass/libsass/issues/368
-@function is-not($value) {
- @return if($value, false, true);
-}
-
-// Checks if a number is even
-@function is-even($int) {
- @return $int % 2 == 0;
-}
-
-// Checks if an element belongs to a list or not
-@function belongs-to($tested-item, $list) {
- @return is-not(not-belongs-to($tested-item, $list));
-}
-
-@function not-belongs-to($tested-item, $list) {
- @return is-not(index($list, $tested-item));
-}
-
-// Contains display value
-@function contains-display-value($query) {
- @return belongs-to(table, $query)
- or belongs-to(block, $query)
- or belongs-to(inline-block, $query)
- or belongs-to(inline, $query);
-}
-
-// Parses the first argument of span-columns()
-@function container-span($span: $span) {
- @if length($span) == 3 {
- $container-columns: nth($span, 3);
- @return $container-columns;
- } @else if length($span) == 2 {
- $container-columns: nth($span, 2);
- @return $container-columns;
- }
-
- @return $grid-columns;
-}
-
-@function container-shift($shift: $shift) {
- $parent-columns: $grid-columns !default !global;
-
- @if length($shift) == 3 {
- $container-columns: nth($shift, 3);
- @return $container-columns;
- } @else if length($shift) == 2 {
- $container-columns: nth($shift, 2);
- @return $container-columns;
- }
-
- @return $parent-columns;
-}
-
-// 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, 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, if($alternate, $color, $alt-color) $column-offset, comma);
- $column-offset: $column-offset + $column-width;
- } @else {
- $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;
- }
- }
-
- @return $values;
-}
-
-// Layout direction
-@function get-direction($layout, $default) {
- $direction: null;
-
- @if to-upper-case($layout) == "LTR" or to-upper-case($layout) == "RTL" {
- $direction: direction-from-layout($layout);
- } @else {
- $direction: direction-from-layout($default);
- }
-
- @return $direction;
-}
-
-@function direction-from-layout($layout) {
- $direction: null;
-
- @if to-upper-case($layout) == "LTR" {
- $direction: right;
- } @else {
- $direction: left;
- }
-
- @return $direction;
-}
-
-@function get-opposite-direction($direction) {
- $opposite-direction: left;
-
- @if $direction == "left" {
- $opposite-direction: right;
- }
-
- @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;
-}
diff --git a/app/assets/stylesheets/grid/_box-sizing.scss b/app/assets/stylesheets/grid/_box-sizing.scss
deleted file mode 100644
index b6d3fec3..00000000
--- a/app/assets/stylesheets/grid/_box-sizing.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-@charset "UTF-8";
-
-@if $border-box-sizing == true {
- html { // http://bit.ly/1qk2tVR
- box-sizing: border-box;
- }
-
- * {
- &,
- &::after,
- &::before {
- box-sizing: inherit;
- }
- }
-}
diff --git a/app/assets/stylesheets/grid/_direction-context.scss b/app/assets/stylesheets/grid/_direction-context.scss
deleted file mode 100644
index 7b0d46e8..00000000
--- a/app/assets/stylesheets/grid/_direction-context.scss
+++ /dev/null
@@ -1,33 +0,0 @@
-@charset "UTF-8";
-
-/// Changes the direction property used by other mixins called in the code block argument.
-///
-/// @param {String} $direction [left-to-right]
-/// Layout direction to be used within the block. Can be `left-to-right` or `right-to-left`.
-///
-/// @example scss - Usage
-/// @include direction-context(right-to-left) {
-/// .right-to-left-block {
-/// @include span-columns(6);
-/// }
-/// }
-///
-/// @example css - CSS Output
-/// .right-to-left-block {
-/// float: right;
-/// ...
-/// }
-
-@mixin direction-context($direction: left-to-right) {
- $scope-direction: $layout-direction;
-
- @if to-lower-case($direction) == "left-to-right" {
- $layout-direction: LTR !global;
- } @else if to-lower-case($direction) == "right-to-left" {
- $layout-direction: RTL !global;
- }
-
- @content;
-
- $layout-direction: $scope-direction !global;
-}
diff --git a/app/assets/stylesheets/grid/_display-context.scss b/app/assets/stylesheets/grid/_display-context.scss
deleted file mode 100644
index ed9b0637..00000000
--- a/app/assets/stylesheets/grid/_display-context.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-@charset "UTF-8";
-
-/// Changes the display property used by other mixins called in the code block argument.
-///
-/// @param {String} $display [block]
-/// Display value to be used within the block. Can be `table` or `block`.
-///
-/// @example scss
-/// @include display-context(table) {
-/// .display-table {
-/// @include span-columns(6);
-/// }
-/// }
-///
-/// @example css
-/// .display-table {
-/// display: table-cell;
-/// ...
-/// }
-
-@mixin display-context($display: block) {
- $scope-display: $container-display-table;
- $container-display-table: $display == table !global;
-
- @content;
-
- $container-display-table: $scope-display !global;
-}
diff --git a/app/assets/stylesheets/grid/_fill-parent.scss b/app/assets/stylesheets/grid/_fill-parent.scss
deleted file mode 100644
index 415f0b1e..00000000
--- a/app/assets/stylesheets/grid/_fill-parent.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-@charset "UTF-8";
-
-/// Forces the element to fill its parent container.
-///
-/// @example scss - Usage
-/// .element {
-/// @include fill-parent;
-/// }
-///
-/// @example css - CSS Output
-/// .element {
-/// width: 100%;
-/// box-sizing: border-box;
-/// }
-
-@mixin fill-parent() {
- width: 100%;
-
- @if $border-box-sizing == false {
- box-sizing: border-box;
- }
-}
diff --git a/app/assets/stylesheets/grid/_media.scss b/app/assets/stylesheets/grid/_media.scss
deleted file mode 100644
index bd516e99..00000000
--- a/app/assets/stylesheets/grid/_media.scss
+++ /dev/null
@@ -1,92 +0,0 @@
-@charset "UTF-8";
-
-/// Outputs a media-query block with an optional grid context (the total number of columns used in the grid).
-///
-/// @param {List} $query
-/// A list of media query features and values, where each `$feature` should have a corresponding `$value`.
-/// For a list of valid values for `$feature`, click [here](http://www.w3.org/TR/css3-mediaqueries/#media1).
-///
-/// If there is only a single `$value` in `$query`, `$default-feature` is going to be used.
-///
-/// The number of total columns in the grid can be set by passing `$columns` at the end of the list (overrides `$total-columns`).
-///
-///
-/// @param {Number (unitless)} $total-columns [$grid-columns]
-/// - Number of columns to use in the new grid context. Can be set as a shorthand in the first parameter.
-///
-/// @example scss - Usage
-/// .responsive-element {
-/// @include media(769px) {
-/// @include span-columns(6);
-/// }
-/// }
-///
-/// .new-context-element {
-/// @include media(min-width 320px max-width 480px, 6) {
-/// @include span-columns(6);
-/// }
-/// }
-///
-/// @example css - CSS Output
-/// @media screen and (min-width: 769px) {
-/// .responsive-element {
-/// display: block;
-/// float: left;
-/// margin-right: 2.35765%;
-/// width: 48.82117%;
-/// }
-///
-/// .responsive-element:last-child {
-/// margin-right: 0;
-/// }
-/// }
-///
-/// @media screen and (min-width: 320px) and (max-width: 480px) {
-/// .new-context-element {
-/// display: block;
-/// float: left;
-/// margin-right: 4.82916%;
-/// width: 100%;
-/// }
-///
-/// .new-context-element:last-child {
-/// margin-right: 0;
-/// }
-/// }
-
-@mixin media($query: $feature $value $columns, $total-columns: $grid-columns) {
- @if length($query) == 1 {
- @media screen and ($default-feature: nth($query, 1)) {
- $default-grid-columns: $grid-columns;
- $grid-columns: $total-columns !global;
- @content;
- $grid-columns: $default-grid-columns !global;
- }
- } @else {
- $loop-to: length($query);
- $media-query: "screen and ";
- $default-grid-columns: $grid-columns;
- $grid-columns: $total-columns !global;
-
- @if is-not(is-even(length($query))) {
- $grid-columns: nth($query, $loop-to) !global;
- $loop-to: $loop-to - 1;
- }
-
- $i: 1;
- @while $i <= $loop-to {
- $media-query: $media-query + "(" + nth($query, $i) + ": " + nth($query, $i + 1) + ") ";
-
- @if ($i + 1) != $loop-to {
- $media-query: $media-query + "and ";
- }
-
- $i: $i + 2;
- }
-
- @media #{$media-query} {
- @content;
- $grid-columns: $default-grid-columns !global;
- }
- }
-}
diff --git a/app/assets/stylesheets/grid/_omega.scss b/app/assets/stylesheets/grid/_omega.scss
deleted file mode 100644
index f18e0f00..00000000
--- a/app/assets/stylesheets/grid/_omega.scss
+++ /dev/null
@@ -1,112 +0,0 @@
-@charset "UTF-8";
-
-/// Removes the element's gutter margin, regardless of its position in the grid hierarchy or display property. It can target a specific element, or every `nth-child` occurrence. Works only with `block` layouts.
-///
-/// @param {List} $query [block]
-/// List of arguments. Supported arguments are `nth-child` selectors (targets a specific pseudo element) and `auto` (targets `last-child`).
-///
-/// When passed an `nth-child` argument of type `*n` with `block` display, the omega mixin automatically adds a clear to the `*n+1` th element. Note that composite arguments such as `2n+1` do not support this feature.
-///
-/// **Deprecation warning**: The omega mixin will no longer take a `$direction` argument. To change the layout direction, use `row($direction)` or set `$default-layout-direction` instead.
-///
-/// @example scss - Usage
-/// .element {
-/// @include omega;
-/// }
-///
-/// .nth-element {
-/// @include omega(4n);
-/// }
-///
-/// @example css - CSS Output
-/// .element {
-/// margin-right: 0;
-/// }
-///
-/// .nth-element:nth-child(4n) {
-/// margin-right: 0;
-/// }
-///
-/// .nth-element:nth-child(4n+1) {
-/// clear: left;
-/// }
-
-@mixin omega($query: block, $direction: default) {
- $table: belongs-to(table, $query);
- $auto: belongs-to(auto, $query);
-
- @if $direction != default {
- @include -neat-warn("The omega mixin will no longer take a $direction argument. To change the layout direction, use the direction(){...} mixin.");
- } @else {
- $direction: get-direction($layout-direction, $default-layout-direction);
- }
-
- @if $table {
- @include -neat-warn("The omega mixin no longer removes padding in table layouts.");
- }
-
- @if length($query) == 1 {
- @if $auto {
- &:last-child {
- margin-#{$direction}: 0;
- }
- }
-
- @else if contains-display-value($query) and $table == false {
- margin-#{$direction}: 0;
- }
-
- @else {
- @include nth-child($query, $direction);
- }
- } @else if length($query) == 2 {
- @if $auto {
- &:last-child {
- margin-#{$direction}: 0;
- }
- } @else {
- @include nth-child(nth($query, 1), $direction);
- }
- } @else {
- @include -neat-warn("Too many arguments passed to the omega() mixin.");
- }
-}
-
-@mixin nth-child($query, $direction) {
- $opposite-direction: get-opposite-direction($direction);
-
- &:nth-child(#{$query}) {
- margin-#{$direction}: 0;
- }
-
- @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;
- }
- }
-}
diff --git a/app/assets/stylesheets/grid/_outer-container.scss b/app/assets/stylesheets/grid/_outer-container.scss
deleted file mode 100644
index d3f62674..00000000
--- a/app/assets/stylesheets/grid/_outer-container.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-@charset "UTF-8";
-
-/// Makes an element a outer container by centering it in the viewport, clearing its floats, and setting its `max-width`.
-/// Although optional, using `outer-container` is recommended. The mixin can be called on more than one element per page, as long as they are not nested.
-///
-/// @param {Number [unit]} $local-max-width [$max-width]
-/// Max width to be applied to the element. Can be a percentage or a measure.
-///
-/// @example scss - Usage
-/// .element {
-/// @include outer-container(100%);
-/// }
-///
-/// @example css - CSS Output
-/// .element {
-/// max-width: 100%;
-/// margin-left: auto;
-/// margin-right: auto;
-/// }
-///
-/// .element::after {
-/// clear: both;
-/// content: "";
-/// display: table;
-/// }
-
-@mixin outer-container($local-max-width: $max-width) {
- @include clearfix;
- max-width: $local-max-width;
- margin: {
- left: auto;
- right: auto;
- }
-}
diff --git a/app/assets/stylesheets/grid/_pad.scss b/app/assets/stylesheets/grid/_pad.scss
deleted file mode 100644
index d697e1b9..00000000
--- a/app/assets/stylesheets/grid/_pad.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-@charset "UTF-8";
-
-/// Adds padding to the element.
-///
-/// @param {List} $padding [flex-gutter()]
-/// A list of padding value(s) to use. Passing `default` in the list will result in using the gutter width as a padding value.
-///
-/// @example scss - Usage
-/// .element {
-/// @include pad(30px -20px 10px default);
-/// }
-///
-/// @example css - CSS Output
-/// .element {
-/// padding: 30px -20px 10px 2.35765%;
-/// }
-
-@mixin pad($padding: flex-gutter()) {
- $padding-list: null;
- @each $value in $padding {
- $value: if($value == 'default', flex-gutter(), $value);
- $padding-list: join($padding-list, $value);
- }
- padding: $padding-list;
-}
diff --git a/app/assets/stylesheets/grid/_private.scss b/app/assets/stylesheets/grid/_private.scss
deleted file mode 100644
index 51224274..00000000
--- a/app/assets/stylesheets/grid/_private.scss
+++ /dev/null
@@ -1,35 +0,0 @@
-$parent-columns: $grid-columns !default;
-$fg-column: $column;
-$fg-gutter: $gutter;
-$fg-max-columns: $grid-columns;
-$container-display-table: false !default;
-$layout-direction: LTR !default;
-
-@function flex-grid($columns, $container-columns: $fg-max-columns) {
- $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: flex-width($container-columns);
- @return percentage($gutter / $container-width);
-}
-
-@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) {
- @if $columns != $grid-columns {
- $parent-columns: $columns !global;
- } @else {
- $parent-columns: $grid-columns !global;
- }
-
- @return $parent-columns;
-}
-
-@function is-display-table($container-is-display-table, $display) {
- @return $container-is-display-table == true or $display == table;
-}
diff --git a/app/assets/stylesheets/grid/_reset-display.scss b/app/assets/stylesheets/grid/_reset-display.scss
deleted file mode 100644
index b8332b87..00000000
--- a/app/assets/stylesheets/grid/_reset-display.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-/// 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;
-}
diff --git a/app/assets/stylesheets/grid/_row.scss b/app/assets/stylesheets/grid/_row.scss
deleted file mode 100644
index 81501607..00000000
--- a/app/assets/stylesheets/grid/_row.scss
+++ /dev/null
@@ -1,45 +0,0 @@
-@charset "UTF-8";
-
-/// Designates the element as a row of columns in the grid layout. It clears the floats on the element and sets its display property. Rows can't be nested, but there can be more than one row element—with different display properties—per layout.
-///
-/// @param {String} $display [default]
-/// Sets the display property of the element and the display context that will be used by its children. Can be `block` or `table`.
-///
-/// @param {String} $direction [$default-layout-direction]
-/// Sets the layout direction. Can be `LTR` (left-to-right) or `RTL` (right-to-left).
-///
-/// @example scss - Usage
-/// .element {
-/// @include row();
-/// }
-///
-/// @example css - CSS Output
-/// .element {
-/// *zoom: 1;
-/// display: block;
-/// }
-///
-/// .element:before, .element:after {
-/// content: " ";
-/// display: table;
-/// }
-///
-/// .element:after {
-/// clear: both;
-/// }
-
-@mixin row($display: default, $direction: $default-layout-direction) {
-
- $layout-direction: $direction !global;
-
- @if $display == table {
- display: table;
- @include fill-parent;
- table-layout: fixed;
- $container-display-table: true !global;
- } @else {
- @include clearfix;
- display: block;
- $container-display-table: false !global;
- }
-}
diff --git a/app/assets/stylesheets/grid/_shift.scss b/app/assets/stylesheets/grid/_shift.scss
deleted file mode 100644
index c0f24cd8..00000000
--- a/app/assets/stylesheets/grid/_shift.scss
+++ /dev/null
@@ -1,50 +0,0 @@
-@charset "UTF-8";
-
-/// Translates an element horizontally by a number of columns. Positive arguments shift the element to the active layout direction, while negative ones shift it to the opposite direction.
-///
-/// @param {Number (unitless)} $n-columns [1]
-/// Number of columns by which the element shifts.
-///
-/// @example scss - Usage
-/// .element {
-/// @include shift(-3);
-/// }
-///
-/// @example css - CSS output
-/// .element {
-/// margin-left: -25.58941%;
-/// }
-
-@mixin shift($n-columns: 1) {
- @include shift-in-context($n-columns);
-}
-
-/// Translates an element horizontally by a number of columns, in a specific nesting context.
-///
-/// @param {List} $shift
-/// A list containing the number of columns to shift (`$columns`) and the number of columns of the parent element (`$container-columns`).
-///
-/// The two values can be separated with any string such as `of`, `/`, etc.
-///
-/// @example scss - Usage
-/// .element {
-/// @include shift(-3 of 6);
-/// }
-///
-/// @example css - CSS output
-/// .element {
-/// margin-left: -52.41458%;
-/// }
-
-@mixin shift-in-context($shift: $columns of $container-columns) {
- $n-columns: nth($shift, 1);
- $parent-columns: container-shift($shift) !global;
-
- $direction: get-direction($layout-direction, $default-layout-direction);
- $opposite-direction: get-opposite-direction($direction);
-
- margin-#{$opposite-direction}: $n-columns * flex-grid(1, $parent-columns) + $n-columns * flex-gutter($parent-columns);
-
- // Reset nesting context
- $parent-columns: $grid-columns !global;
-}
diff --git a/app/assets/stylesheets/grid/_span-columns.scss b/app/assets/stylesheets/grid/_span-columns.scss
deleted file mode 100644
index a7f9b003..00000000
--- a/app/assets/stylesheets/grid/_span-columns.scss
+++ /dev/null
@@ -1,94 +0,0 @@
-@charset "UTF-8";
-
-/// Specifies the number of columns an element should span. If the selector is nested the number of columns of its parent element should be passed as an argument as well.
-///
-/// @param {List} $span
-/// A list containing `$columns`, the unitless number of columns the element spans (required), and `$container-columns`, the number of columns the parent element spans (optional).
-///
-/// If only one value is passed, it is assumed that it's `$columns` and that that `$container-columns` is equal to `$grid-columns`, the total number of columns in the grid.
-///
-/// The values can be separated with any string such as `of`, `/`, etc.
-///
-/// `$columns` also accepts decimals for when it's necessary to break out of the standard grid. E.g. Passing `2.4` in a standard 12 column grid will divide the row into 5 columns.
-///
-/// @param {String} $display [block]
-/// Sets the display property of the element. By default it sets the display property of the element to `block`.
-///
-/// If passed `block-collapse`, it also removes the margin gutter by adding it to the element width.
-///
-/// If passed `table`, it sets the display property to `table-cell` and calculates the width of the element without taking gutters into consideration. The result does not align with the block-based grid.
-///
-/// @example scss - Usage
-/// .element {
-/// @include span-columns(6);
-///
-/// .nested-element {
-/// @include span-columns(2 of 6);
-/// }
-/// }
-///
-/// @example css - CSS Output
-/// .element {
-/// display: block;
-/// float: left;
-/// margin-right: 2.35765%;
-/// width: 48.82117%;
-/// }
-///
-/// .element:last-child {
-/// margin-right: 0;
-/// }
-///
-/// .element .nested-element {
-/// display: block;
-/// float: left;
-/// margin-right: 4.82916%;
-/// width: 30.11389%;
-/// }
-///
-/// .element .nested-element:last-child {
-/// margin-right: 0;
-/// }
-
-@mixin span-columns($span: $columns of $container-columns, $display: block) {
- $columns: nth($span, 1);
- $container-columns: container-span($span);
-
- $parent-columns: get-parent-columns($container-columns) !global;
-
- $direction: get-direction($layout-direction, $default-layout-direction);
- $opposite-direction: get-opposite-direction($direction);
-
- $display-table: is-display-table($container-display-table, $display);
-
- @if $display-table {
- display: table-cell;
- width: percentage($columns / $container-columns);
- } @else {
- float: #{$opposite-direction};
-
- @if $display != no-display {
- display: block;
- }
-
- @if $display == collapse {
- @include -neat-warn("The 'collapse' argument will be deprecated. Use 'block-collapse' instead.");
- }
-
- @if $display == collapse or $display == block-collapse {
- width: flex-grid($columns, $container-columns) + flex-gutter($container-columns);
-
- &:last-child {
- width: flex-grid($columns, $container-columns);
- }
-
- } @else {
- margin-#{$direction}: flex-gutter($container-columns);
- width: flex-grid($columns, $container-columns);
-
- &:last-child {
- margin-#{$direction}: 0;
- }
- }
- }
-}
diff --git a/app/assets/stylesheets/grid/_to-deprecate.scss b/app/assets/stylesheets/grid/_to-deprecate.scss
deleted file mode 100644
index b46d9760..00000000
--- a/app/assets/stylesheets/grid/_to-deprecate.scss
+++ /dev/null
@@ -1,81 +0,0 @@
-@charset "UTF-8";
-
-@mixin breakpoint($query:$feature $value $columns, $total-columns: $grid-columns) {
- @include -neat-warn("The breakpoint() mixin was renamed to media() in Neat 1.0. Please update your project with the new syntax before the next version bump.");
-
- @if length($query) == 1 {
- @media screen and ($default-feature: nth($query, 1)) {
- $default-grid-columns: $grid-columns;
- $grid-columns: $total-columns;
- @content;
- $grid-columns: $default-grid-columns;
- }
- } @else if length($query) == 2 {
- @media screen and (nth($query, 1): nth($query, 2)) {
- $default-grid-columns: $grid-columns;
- $grid-columns: $total-columns;
- @content;
- $grid-columns: $default-grid-columns;
- }
- } @else if length($query) == 3 {
- @media screen and (nth($query, 1): nth($query, 2)) {
- $default-grid-columns: $grid-columns;
- $grid-columns: nth($query, 3);
- @content;
- $grid-columns: $default-grid-columns;
- }
- } @else if length($query) == 4 {
- @media screen and (nth($query, 1): nth($query, 2)) and (nth($query, 3): nth($query, 4)) {
- $default-grid-columns: $grid-columns;
- $grid-columns: $total-columns;
- @content;
- $grid-columns: $default-grid-columns;
- }
- } @else if length($query) == 5 {
- @media screen and (nth($query, 1): nth($query, 2)) and (nth($query, 3): nth($query, 4)) {
- $default-grid-columns: $grid-columns;
- $grid-columns: nth($query, 5);
- @content;
- $grid-columns: $default-grid-columns;
- }
- } @else {
- @include -neat-warn("Wrong number of arguments for breakpoint(). Read the documentation for more details.");
- }
-}
-
-@mixin nth-omega($nth, $display: block, $direction: default) {
- @include -neat-warn("The nth-omega() mixin is deprecated. Please use omega() instead.");
- @include omega($nth $display, $direction);
-}
-
-/// 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
-/// .element {
-/// @include row($direction: RTL);
-/// // Context changed to right-to-left
-/// }
-///
-/// @include reset-layout-direction;
-/// // Context is reset to left-to-right
-
-@mixin reset-layout-direction {
- $layout-direction: $default-layout-direction !global;
- @include -neat-warn("Resetting $direction will be deprecated in future versions in favor of the direction(){...} mixin.");
-}
-
-/// Resets both the active layout direction and the active display property.
-///
-/// @example scss - Usage
-/// .element {
-/// @include row(table, RTL);
-/// // Context changed to table table and right-to-left
-/// }
-///
-/// @include reset-all;
-/// // Context is reset to block display and left-to-right
-
-@mixin reset-all {
- @include reset-display;
- @include reset-layout-direction;
-}
diff --git a/app/assets/stylesheets/grid/_visual-grid.scss b/app/assets/stylesheets/grid/_visual-grid.scss
deleted file mode 100644
index 1192d828..00000000
--- a/app/assets/stylesheets/grid/_visual-grid.scss
+++ /dev/null
@@ -1,42 +0,0 @@
-@charset "UTF-8";
-
-@mixin grid-column-gradient($values...) {
- background-image: -webkit-linear-gradient(left, $values);
- background-image: -moz-linear-gradient(left, $values);
- background-image: -ms-linear-gradient(left, $values);
- background-image: -o-linear-gradient(left, $values);
- background-image: unquote("linear-gradient(to left, #{$values})");
-}
-
-@if $visual-grid == true or $visual-grid == yes {
- body:before {
- @include grid-column-gradient(gradient-stops($grid-columns));
- content: "";
- display: inline-block;
- height: 100%;
- left: 0;
- margin: 0 auto;
- max-width: $max-width;
- opacity: $visual-grid-opacity;
- pointer-events: none;
- position: fixed;
- right: 0;
- width: 100%;
-
- @if $visual-grid-index == back {
- z-index: -1;
- }
-
- @else if $visual-grid-index == front {
- z-index: 9999;
- }
-
- @each $breakpoint in $visual-grid-breakpoints {
- @if $breakpoint {
- @include media($breakpoint) {
- @include grid-column-gradient(gradient-stops($grid-columns));
- }
- }
- }
- }
-}
diff --git a/app/assets/stylesheets/mixins/_clearfix.scss b/app/assets/stylesheets/mixins/_clearfix.scss
deleted file mode 100644
index e68efc44..00000000
--- a/app/assets/stylesheets/mixins/_clearfix.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-@charset "UTF-8";
-
-/// Provides an easy way to include a clearfix for containing floats.
-///
-/// @link http://goo.gl/yP5hiZ
-///
-/// @example scss
-/// .element {
-/// @include clearfix;
-/// }
-///
-/// @example css
-/// .element::after {
-/// clear: both;
-/// content: "";
-/// display: block;
-/// }
-
-@mixin clearfix {
- &::after {
- clear: both;
- content: "";
- display: block;
- }
-}
diff --git a/app/assets/stylesheets/settings/_disable-warnings.scss b/app/assets/stylesheets/settings/_disable-warnings.scss
deleted file mode 100644
index 3f9b92a6..00000000
--- a/app/assets/stylesheets/settings/_disable-warnings.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-@charset "UTF-8";
-
-/// Disable all deprecation warnings. Defaults to `false`. Set with a `!global` flag.
-///
-/// @type Bool
-
-$disable-warnings: false !default;
-
-@mixin -neat-warn($message) {
- @if $disable-warnings == false {
- @warn "#{$message}";
- }
-}
diff --git a/app/assets/stylesheets/settings/_grid.scss b/app/assets/stylesheets/settings/_grid.scss
deleted file mode 100644
index c1ab7fdc..00000000
--- a/app/assets/stylesheets/settings/_grid.scss
+++ /dev/null
@@ -1,51 +0,0 @@
-@charset "UTF-8";
-
-/// Sets the relative width of a single grid column. The unit used should be the same one used to define `$gutter`. Set with a `!global` flag.
-///
-/// @type Number (Unit)
-
-$column: 4.2358em !default;
-
-/// Sets the relative width of a single grid gutter. The unit used should be the same one used to define `$column`. Set with the `!global` flag.
-///
-/// @type Number (Unit)
-
-$gutter: 1.618em !default;
-
-/// Sets the total number of columns in the grid. Its value can be overridden inside a media query using the `media()` mixin. Set with the `!global` flag.
-///
-/// @type Number (Unitless)
-
-$grid-columns: 12 !default;
-
-/// Sets the max-width property of the element that includes `outer-container()`. Set with the `!global` flag.
-///
-/// @type Number (Unit)
-///
-$max-width: 1200px !default;
-
-/// When set to true, it sets the box-sizing property of all elements to `border-box`. Set with a `!global` flag.
-///
-/// @type Bool
-///
-/// @example css - CSS Output
-/// html {
-/// box-sizing: border-box; }
-///
-/// *, *::after, *::before {
-/// box-sizing: inherit;
-/// }
-
-$border-box-sizing: true !default;
-
-/// Sets the default [media feature](http://www.w3.org/TR/css3-mediaqueries/#media) that `media()` and `new-breakpoint()` revert to when only a breakpoint value is passed. Set with a `!global` flag.
-///
-/// @type String
-
-$default-feature: min-width; // Default @media feature for the breakpoint() mixin
-
-///Sets the default layout direction of the grid. Can be `LTR` or `RTL`. Set with a `!global` flag.
-///
-///@type String
-
-$default-layout-direction: LTR !default;
diff --git a/app/assets/stylesheets/settings/_visual-grid.scss b/app/assets/stylesheets/settings/_visual-grid.scss
deleted file mode 100644
index 9cd1815a..00000000
--- a/app/assets/stylesheets/settings/_visual-grid.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-@charset "UTF-8";
-
-/// Displays the visual grid when set to true. The overlaid grid may be few pixels off depending on the browser's rendering engine and pixel rounding algorithm. Set with the `!global` flag.
-///
-/// @type Bool
-
-$visual-grid: false !default;
-
-/// Sets the visual grid color. Set with `!global` flag.
-///
-/// @type Color
-
-$visual-grid-color: #eee !default;
-
-/// Sets the `z-index` property of the visual grid. Can be `back` (behind content) or `front` (in front of content). Set with `!global` flag.
-///
-/// @type String
-
-$visual-grid-index: back !default;
-
-/// Sets the opacity property of the visual grid. Set with `!global` flag.
-///
-/// @type Number (unitless)
-
-$visual-grid-opacity: 0.4 !default;
-
-$visual-grid-breakpoints: () !default;
From 164d908ba695bba4b7cbc394a12441ed4ced2542 Mon Sep 17 00:00:00 2001
From: Tyson Gach
Date: Sun, 24 Jan 2016 11:47:12 -0500
Subject: [PATCH 109/269] Remove all tests
---
.npmignore | 2 -
.rspec | 1 -
bower.json | 3 +-
spec/.keep | 0
spec/neat/columns_spec.rb | 73 ------------------------
spec/neat/container_spec.rb | 21 -------
spec/neat/default_spec.rb | 15 -----
spec/neat/direction_spec.rb | 19 ------
spec/neat/display_spec.rb | 19 ------
spec/neat/media_spec.rb | 55 ------------------
spec/neat/new_breakpoint_spec.rb | 17 ------
spec/neat/omega_spec.rb | 66 ---------------------
spec/neat/pad_spec.rb | 32 -----------
spec/neat/row_spec.rb | 39 -------------
spec/neat/shift_spec.rb | 41 -------------
spec/spec_helper.rb | 22 -------
spec/support/matchers/be_contained_in.rb | 10 ----
spec/support/matchers/have_rule.rb | 35 ------------
spec/support/matchers/have_value.rb | 15 -----
spec/support/parser_support.rb | 9 ---
spec/support/sass_support.rb | 10 ----
test/default.scss | 1 -
test/direction-context.scss | 13 -----
test/display-context.scss | 15 -----
test/media.scss | 39 -------------
test/new-breakpoint.scss | 13 -----
test/outer-container.scss | 11 ----
test/pad.scss | 17 ------
test/row.scss | 26 ---------
test/shift.scss | 36 ------------
test/span-columns.scss | 21 -------
31 files changed, 1 insertion(+), 695 deletions(-)
delete mode 100644 .rspec
create mode 100644 spec/.keep
delete mode 100644 spec/neat/columns_spec.rb
delete mode 100644 spec/neat/container_spec.rb
delete mode 100644 spec/neat/default_spec.rb
delete mode 100644 spec/neat/direction_spec.rb
delete mode 100644 spec/neat/display_spec.rb
delete mode 100644 spec/neat/media_spec.rb
delete mode 100644 spec/neat/new_breakpoint_spec.rb
delete mode 100644 spec/neat/omega_spec.rb
delete mode 100644 spec/neat/pad_spec.rb
delete mode 100644 spec/neat/row_spec.rb
delete mode 100644 spec/neat/shift_spec.rb
delete mode 100644 spec/spec_helper.rb
delete mode 100644 spec/support/matchers/be_contained_in.rb
delete mode 100644 spec/support/matchers/have_rule.rb
delete mode 100644 spec/support/matchers/have_value.rb
delete mode 100644 spec/support/parser_support.rb
delete mode 100644 spec/support/sass_support.rb
delete mode 100644 test/default.scss
delete mode 100644 test/direction-context.scss
delete mode 100644 test/display-context.scss
delete mode 100644 test/media.scss
delete mode 100644 test/new-breakpoint.scss
delete mode 100644 test/outer-container.scss
delete mode 100644 test/pad.scss
delete mode 100644 test/row.scss
delete mode 100644 test/shift.scss
delete mode 100644 test/span-columns.scss
diff --git a/.npmignore b/.npmignore
index 36acfcec..d4ee49e6 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,5 +1,4 @@
.gitignore
-.rspec
.sass-cache
.scss-lint.yml
.travis.yml
@@ -16,4 +15,3 @@ pkg/
Rakefile
sache.json
spec/
-test/
diff --git a/.rspec b/.rspec
deleted file mode 100644
index 4e1e0d2f..00000000
--- a/.rspec
+++ /dev/null
@@ -1 +0,0 @@
---color
diff --git a/bower.json b/bower.json
index 4869697c..ae4ff9b1 100644
--- a/bower.json
+++ b/bower.json
@@ -15,8 +15,7 @@
"lib",
"neat.gemspec",
"sache.json",
- "spec",
- "test"
+ "spec"
],
"keywords": [
"columns",
diff --git a/spec/.keep b/spec/.keep
new file mode 100644
index 00000000..e69de29b
diff --git a/spec/neat/columns_spec.rb b/spec/neat/columns_spec.rb
deleted file mode 100644
index af526f96..00000000
--- a/spec/neat/columns_spec.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-require "spec_helper"
-
-describe "@include span-columns()" do
- before(:all) do
- ParserSupport.parse_file("span-columns")
- end
-
- context "with argument (6) in a twelve-column grid" do
- it "sets width in percentage" do
- expect(".span-columns-default").to have_rule("width: 48.82117%")
- end
-
- it "sets gutter in percentage" do
- expect(".span-columns-default").to have_rule("margin-right: 2.35765%")
- end
-
- it "sets display to block" do
- expect(".span-columns-default").to have_rule("display: block")
- end
-
- it "sets float to left" do
- expect(".span-columns-default").to have_rule("float: left")
- end
-
- it "removes gutter from last element" do
- expect(".span-columns-default:last-child").to have_rule("margin-right: 0")
- end
- end
-
- context "when nested" do
- it "sets relative width in percentage" do
- expect(".span-columns-default .span-columns-nested").to have_rule("width: 30.11389%")
- end
-
- it "sets relative gutter in percentage" do
- expect(".span-columns-default .span-columns-nested").to have_rule("margin-right: 4.82916%")
- end
- end
-
- context "with argument (table)" do
- it "sets display to table-cell" do
- expect(".span-columns-table").to have_rule("display: table-cell")
- end
-
- it "sets width evenly between elements" do
- expect(".span-columns-table").to have_rule("width: 50%")
- end
- end
-
- context "with argument (block-collapse)" do
- it "appends gutter width to column width" do
- expect(".span-columns-collapse").to have_rule("width: 51.17883%")
- end
-
- it "removes the next gutter" do
- expect(".span-columns-collapse").to_not have_rule("margin-right: 2.35765%")
- end
-
- it "removes gutter percentage from the width of the last child" do
- expect(".span-columns-collapse:last-child").to have_rule("width: 48.82117%")
- end
- end
-
- context "with argument (no-display)" do
- it "doesn't set display property" do
- expect(".span-columns-no-display").to_not have_rule("display: block")
- end
-
- it "sets width in percentage based on a block layout" do
- expect(".span-columns-no-display").to have_rule("width: 48.82117%")
- end
- end
-end
diff --git a/spec/neat/container_spec.rb b/spec/neat/container_spec.rb
deleted file mode 100644
index 147f1cec..00000000
--- a/spec/neat/container_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require "spec_helper"
-
-describe "@include outer-container()" do
- before(:all) do
- ParserSupport.parse_file("outer-container")
- end
-
- it "adds clearfix" do
- expect(".container-default::after").to have_rule("clear: both")
- end
-
- it "sets max-width" do
- expect(".container-default").to have_rule("max-width: 960px")
- end
-
- context "with max-width argument: 100%" do
- it "sets max-width to 100%" do
- expect(".container-custom-width").to have_rule("max-width: 100%")
- end
- end
-end
diff --git a/spec/neat/default_spec.rb b/spec/neat/default_spec.rb
deleted file mode 100644
index 5714457f..00000000
--- a/spec/neat/default_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require "spec_helper"
-
-describe "By default" do
- before(:all) do
- ParserSupport.parse_file("default")
- end
-
- it "sets sizing on the html element to border-box" do
- expect("html").to have_rule("box-sizing: border-box")
- end
-
- it "sets sizing on the global selector to inherit" do
- expect("*::after").to have_rule("box-sizing: inherit")
- end
-end
diff --git a/spec/neat/direction_spec.rb b/spec/neat/direction_spec.rb
deleted file mode 100644
index 1a39c322..00000000
--- a/spec/neat/direction_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require "spec_helper"
-
-describe "@include direction-context() {...}" do
- before(:all) do
- ParserSupport.parse_file("direction-context")
- end
-
- context "with no argument" do
- it "uses default direction setting" do
- expect(".default-block").to have_rule("float: left")
- end
- end
-
- context "whith argument (right-to-left)" do
- it "changes direction setting inside the block" do
- expect(".right-to-left-block").to have_rule("float: right")
- end
- end
-end
diff --git a/spec/neat/display_spec.rb b/spec/neat/display_spec.rb
deleted file mode 100644
index 51070a2e..00000000
--- a/spec/neat/display_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require "spec_helper"
-
-describe "@include display-context() {...}" do
- before(:all) do
- ParserSupport.parse_file("display-context")
- end
-
- context "with argument (table)" do
- it "changes display value to table" do
- expect(".display-table-block").to have_rule("display: table-cell")
- end
- end
-
- context "whith nested call and argument (block)" do
- it "changes display value to block" do
- expect(".display-nested-block").to have_rule("display: block")
- end
- end
-end
diff --git a/spec/neat/media_spec.rb b/spec/neat/media_spec.rb
deleted file mode 100644
index 620b9c76..00000000
--- a/spec/neat/media_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-require "spec_helper"
-
-describe "@include media() {...}" do
- before(:all) do
- ParserSupport.parse_file("media")
- end
-
- context "with argument (481px)" do
- it "outputs @media screen and (min-width: 481px)" do
- expect(".media-default").to be_contained_in("screen and (min-width: 481px)")
- end
- end
-
- context "with argument (max-width 480px)" do
- it "outputs @media screen and (max-width: 480px)" do
- expect(".media-max-width").to be_contained_in("screen and (max-width: 480px)")
- end
- end
-
- context "with argument (min-width 320px max-width 480px)" do
- it "outputs @media screen and (min-width: 320px) and (max-width: 480px)" do
- expect(".media-min-max-width").to be_contained_in("screen and (min-width: 320px) and (max-width: 480px)")
- end
- end
-
- context "with argument (481px, 6)" do
- it "outputs @media screen and (min-width: 481px)" do
- expect(".change-media-context").to be_contained_in("screen and (min-width: 481px)")
- end
-
- it "uses a 6-column grid" do
- expect(".change-media-context").to have_rule("width: 100%")
- end
- end
-
- context "with shorthand argument (max-width 480px 6)" do
- it "outputs @media screen and (max-width: 480px)" do
- expect(".change-media-context-shorthand").to be_contained_in("screen and (max-width: 480px)")
- end
-
- it "uses a 6-column grid" do
- expect(".change-media-context-shorthand").to have_rule("width: 100%")
- end
- end
-
- context "with composite argument (max-width 768px min-width 110px orientation portait 6)" do
- it "outputs @media screen and (max-width: 768px) and (min-width: 110px) and (orientation: portait)" do
- expect(".composite-media-query").to be_contained_in("screen and (max-width: 768px) and (min-width: 110px) and (orientation: portait)")
- end
-
- it "uses a 6-column grid" do
- expect(".composite-media-query").to have_rule("width: 100%")
- end
- end
-end
diff --git a/spec/neat/new_breakpoint_spec.rb b/spec/neat/new_breakpoint_spec.rb
deleted file mode 100644
index 6b577e7d..00000000
--- a/spec/neat/new_breakpoint_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require "spec_helper"
-
-describe "new-breakpoint()" do
- before(:all) do
- ParserSupport.parse_file("new-breakpoint")
- end
-
- context "with argument (max-width 768px 12)" do
- it "outputs (max-width 768px)" do
- expect(".responsive-element").to be_contained_in("screen and (max-width: 768px)")
- end
-
- it "adds (max-width 768px 12) to visual grid breakpoints" do
- expect("$visual-grid-breakpoints").to have_value("max-width 768px 12")
- end
- end
-end
diff --git a/spec/neat/omega_spec.rb b/spec/neat/omega_spec.rb
deleted file mode 100644
index 137d2673..00000000
--- a/spec/neat/omega_spec.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-require "spec_helper"
-
-describe "@include omega()" do
- before(:all) do
- ParserSupport.parse_file("omega")
- end
-
- context "with no argument" do
- it "removes right margin" do
- 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
- 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
- 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
- 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
- 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
- selector = "section .omega-nth-default-left:nth-child(4n)"
- expect(selector).to have_rule("margin-left: 0")
- end
- end
- end
-end
diff --git a/spec/neat/pad_spec.rb b/spec/neat/pad_spec.rb
deleted file mode 100644
index 72685620..00000000
--- a/spec/neat/pad_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require "spec_helper"
-
-describe "@include pad()" do
- before(:all) do
- ParserSupport.parse_file("pad")
- end
-
- context "with no argument" do
- it "sets padding to gutter percentage" do
- expect(".pad-default").to have_rule("padding: 2.35765%")
- end
- end
-
- context "with argument (20px)" do
- it "sets padding to 20px" do
- expect(".pad-explicit").to have_rule("padding: 20px")
- end
- end
-
- context "with argument (30px 20px 10px 5px)" do
- it "sets padding to 30px 20px 10px 5px" do
- expect(".pad-shorthand").to have_rule("padding: 30px 20px 10px 5px")
- end
- end
-
- context "with argument (default)" do
- it "uses default gutter percentage" do
- expect(".pad-shorthand-default").to have_rule("padding: 30px 2.35765% 10px 2.35765%")
- end
- end
-end
-
diff --git a/spec/neat/row_spec.rb b/spec/neat/row_spec.rb
deleted file mode 100644
index 321f0848..00000000
--- a/spec/neat/row_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require "spec_helper"
-
-describe "@include row()" do
- before(:all) do
- ParserSupport.parse_file("row")
- end
-
- context "with no argument" do
- it "adds clearfix" do
- expect(".row-default::after").to have_rule("clear: both")
- end
-
- it "sets display to block" do
- expect(".row-default").to have_rule("display: block")
- end
- end
-
- context "with argument (table)" do
- it "sets display to table" do
- expect(".row-table").to have_rule("display: table")
- end
-
- it "forces table-cell display on child elements" do
- expect(".row-table-reset .block-child").to have_rule("display: table-cell")
- end
- end
-
- context "with reset-display()" do
- it "resets display to block" do
- expect(".no-row").to have_rule("display: block")
- end
- end
-
- context "with invalid display argument" do
- it "sets display to block" do
- expect(".row-invalid-display").to have_rule("display: block")
- end
- end
-end
diff --git a/spec/neat/shift_spec.rb b/spec/neat/shift_spec.rb
deleted file mode 100644
index 23a40fac..00000000
--- a/spec/neat/shift_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require "spec_helper"
-
-describe "@include shift()" do
- before(:all) do
- ParserSupport.parse_file("shift")
- end
-
- context "with no argument" do
- it "shifts element one column in the default direction" do
- expect(".shift-default").to have_rule("margin-left: 8.5298%")
- end
- end
-
- context "with argument (2)" do
- it "shifts element 2 columns in the default direction" do
- expect(".shift-positive").to have_rule("margin-left: 17.05961%")
- end
- end
-
- context "with argument (-3)" do
- it "shifts element 3 columns in the opposite direction" do
- expect(".shift-negative").to have_rule("margin-left: -25.58941%")
- end
- end
-
- context "when nested" do
- it "shifts element relative to its parent" do
- expect(".shifted-parent .shifted-child").to have_rule("margin-left: 34.94305%")
- end
-
- it "resets nesting context" do
- expect(".post-nested-shift").to have_rule("margin-left: 17.05961%")
- end
- end
-
- context "when layout direction changes" do
- it "shifts element in the corresponding direction" do
- expect("section .shift-negative").to have_rule("margin-right: -25.58941%")
- end
- end
-end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
deleted file mode 100644
index fbed5955..00000000
--- a/spec/spec_helper.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require "rspec"
-require "neat"
-require "aruba/api"
-require "css_parser"
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-RSpec.configure do |config|
- config.include SassSupport
- config.include CssParser
- config.include ParserSupport
- config.include Aruba::Api
-
- config.before(:all) do
- generate_css
- end
-
- config.after(:all) do
- clean_up
- end
-end
diff --git a/spec/support/matchers/be_contained_in.rb b/spec/support/matchers/be_contained_in.rb
deleted file mode 100644
index 01a99f96..00000000
--- a/spec/support/matchers/be_contained_in.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-RSpec::Matchers.define :be_contained_in do |expected|
- match do |actual|
- @query = ParserSupport.parser.find_by_selector(actual, expected)
- @query.any?
- end
-
- failure_message do |actual|
- %{expected selector #{actual} to be contained in #{expected}}
- end
-end
diff --git a/spec/support/matchers/have_rule.rb b/spec/support/matchers/have_rule.rb
deleted file mode 100644
index f202f34a..00000000
--- a/spec/support/matchers/have_rule.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-RSpec::Matchers.define :have_rule do |expected|
- match do |selector|
- @rules = rules_from_selector(selector)
- @rules.include? expected
- end
-
- failure_message do |selector|
- if @rules.empty?
- %{no CSS for selector #{selector} were found}
- else
- rules = @rules.join("; ")
- %{Expected selector #{selector} to have CSS rule "#{expected}".
- Had "#{rules}".}
- end
- end
-
- def rules_from_selector(selector)
- rulesets = ParserSupport.parser.find_by_selector(selector)
- if rulesets.empty?
- []
- else
- rules(rulesets)
- end
- end
-
- def rules(rulesets)
- rules = []
- rulesets.map do |ruleset|
- ruleset.split(";").each do |rule|
- rules << rule.strip
- end
- end
- rules
- end
-end
diff --git a/spec/support/matchers/have_value.rb b/spec/support/matchers/have_value.rb
deleted file mode 100644
index 8643ec12..00000000
--- a/spec/support/matchers/have_value.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-RSpec::Matchers.define :have_value do |expected|
- match do |actual|
- selector_id = actual.sub("$","#")
- value_attribute = ParserSupport.parser.find_by_selector(selector_id)[0]
-
- unless value_attribute.nil?
- actual_value = value_attribute.split(":")[1].strip.sub(";", "")
- actual_value == expected
- end
- end
-
- failure_message do |actual|
- %{expected variable #{actual} to have value "#{expected}"}
- end
-end
diff --git a/spec/support/parser_support.rb b/spec/support/parser_support.rb
deleted file mode 100644
index 3f68df42..00000000
--- a/spec/support/parser_support.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module ParserSupport
- def self.parser
- @parser ||= CssParser::Parser.new
- end
-
- def self.parse_file(identifier)
- self.parser.load_file!("tmp/#{identifier}.css")
- end
-end
diff --git a/spec/support/sass_support.rb b/spec/support/sass_support.rb
deleted file mode 100644
index bad4a7df..00000000
--- a/spec/support/sass_support.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module SassSupport
- def generate_css
- _mkdir("tmp")
- `sass -I . --update test:tmp`
- end
-
- def clean_up
- FileUtils.rm_rf("tmp")
- end
-end
diff --git a/test/default.scss b/test/default.scss
deleted file mode 100644
index 3fe02488..00000000
--- a/test/default.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import "setup";
diff --git a/test/direction-context.scss b/test/direction-context.scss
deleted file mode 100644
index 6ee9b5bf..00000000
--- a/test/direction-context.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-@import "setup";
-
-@include direction-context() {
- .default-block {
- @include span-columns(6);
- }
-}
-
-@include direction-context(right-to-left) {
- .right-to-left-block {
- @include span-columns(6);
- }
-}
diff --git a/test/display-context.scss b/test/display-context.scss
deleted file mode 100644
index 42097ed4..00000000
--- a/test/display-context.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-@import "setup";
-
-@include display-context(table) {
- .display-table-block {
- @include span-columns(6);
- }
-}
-
-@include display-context(table) {
- @include display-context(block) {
- .display-nested-block {
- @include span-columns(6);
- }
- }
-}
diff --git a/test/media.scss b/test/media.scss
deleted file mode 100644
index 96437e61..00000000
--- a/test/media.scss
+++ /dev/null
@@ -1,39 +0,0 @@
-@import "setup";
-
-$composite: new-breakpoint(max-width 768px min-width 110px orientation portait 6);
-
-.media-default {
- @include media(481px) {
- color: #000;
- }
-}
-
-.media-max-width {
- @include media(max-width 480px) {
- position: relative;
- }
-}
-
-.media-min-max-width {
- @include media(min-width 320px max-width 480px) {
- position: relative;
- }
-}
-
-.change-media-context {
- @include media(481px, 6) {
- @include span-columns(6);
- }
-}
-
-.change-media-context-shorthand {
- @include media(max-width 480px 6) {
- @include span-columns(6);
- }
-}
-
-.composite-media-query {
- @include media($composite) {
- @include span-columns(6);
- }
-}
diff --git a/test/new-breakpoint.scss b/test/new-breakpoint.scss
deleted file mode 100644
index 2b3fc18b..00000000
--- a/test/new-breakpoint.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-@import "setup";
-
-$tablet: new-breakpoint(max-width 768px 12);
-
-.responsive-element {
- @include media($tablet) {
- color: #000;
- }
-}
-
-#visual-grid-breakpoints {
- value: $visual-grid-breakpoints
-}
diff --git a/test/outer-container.scss b/test/outer-container.scss
deleted file mode 100644
index b9a72ca3..00000000
--- a/test/outer-container.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-@import "setup";
-
-$max-width: 960px;
-
-.container-default {
- @include outer-container();
-}
-
-.container-custom-width {
- @include outer-container(100%);
-}
diff --git a/test/pad.scss b/test/pad.scss
deleted file mode 100644
index d9441e6e..00000000
--- a/test/pad.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-@import "setup";
-
-.pad-default {
- @include pad;
-}
-
-.pad-explicit {
- @include pad(20px);
-}
-
-.pad-shorthand {
- @include pad(30px 20px 10px 5px);
-}
-
-.pad-shorthand-default {
- @include pad(30px default 10px default);
-}
diff --git a/test/row.scss b/test/row.scss
deleted file mode 100644
index aaba8254..00000000
--- a/test/row.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-@import "setup";
-
-.row-default {
- @include row;
-}
-
-.row-table {
- @include row(table);
-}
-
-.row-invalid-display {
- @include row(invalid-argument);
-}
-
-.row-table-reset {
- @include row(table);
-
- .block-child {
- @include span-columns(4, block);
- @include reset-display;
- }
-}
-
-.no-row {
- @include span-columns(4);
-}
diff --git a/test/shift.scss b/test/shift.scss
deleted file mode 100644
index 6a01b4c1..00000000
--- a/test/shift.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-@import "setup";
-
-.shift-default {
- @include shift;
-}
-
-.shift-positive {
- @include shift(2);
-}
-
-.shift-negative {
- @include shift(-3);
-}
-
-// Nesting
-.shifted-parent {
- @include span-columns(6);
-
- .shifted-child {
- @include shift(2 of 6);
- }
-}
-
-.post-nested-shift {
- @include shift(2);
-}
-
-// Changing direction
-section {
- @include row($direction: RTL);
-
- .shift-negative {
- @include shift(-3);
- @include reset-layout-direction;
- }
-}
diff --git a/test/span-columns.scss b/test/span-columns.scss
deleted file mode 100644
index e85bd663..00000000
--- a/test/span-columns.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-@import "setup";
-
-.span-columns-default {
- @include span-columns(6);
-
- .span-columns-nested {
- @include span-columns(2 of 6);
- }
-}
-
-.span-columns-table {
- @include span-columns(6, table);
-}
-
-.span-columns-collapse {
- @include span-columns(6, block-collapse);
-}
-
-.span-columns-no-display {
- @include span-columns(6, no-display);
-}
From 5da00ce3d2e652be3fc774e087ec178379ace9c2 Mon Sep 17 00:00:00 2001
From: Tyson Gach
Date: Sun, 24 Jan 2016 11:51:04 -0500
Subject: [PATCH 110/269] Remove Sache
---
.npmignore | 1 -
bower.json | 1 -
sache.json | 5 -----
3 files changed, 7 deletions(-)
delete mode 100644 sache.json
diff --git a/.npmignore b/.npmignore
index d4ee49e6..04903abc 100644
--- a/.npmignore
+++ b/.npmignore
@@ -13,5 +13,4 @@ neat.gemspec
NEWS.md
pkg/
Rakefile
-sache.json
spec/
diff --git a/bower.json b/bower.json
index ae4ff9b1..293dfcf6 100644
--- a/bower.json
+++ b/bower.json
@@ -14,7 +14,6 @@
"bin",
"lib",
"neat.gemspec",
- "sache.json",
"spec"
],
"keywords": [
diff --git a/sache.json b/sache.json
deleted file mode 100644
index fe982e16..00000000
--- a/sache.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "name": "Neat",
- "description": "A lightweight, semantic grid framework",
- "tags": ["columns", "grid", "layout", "media", "media-queries", "neat", "queries", "sass", "scss", "semantic"]
-}
From 33c840a41daea1234ace6da19fac1fe4d851b439 Mon Sep 17 00:00:00 2001
From: Tyson Gach
Date: Sun, 24 Jan 2016 11:53:08 -0500
Subject: [PATCH 111/269] Clear out contributing files
---
.gitignore | 8 +-
Gulpfile.js | 2 +-
contrib/styles.scss | 294 +-------------------------------------------
3 files changed, 6 insertions(+), 298 deletions(-)
diff --git a/.gitignore b/.gitignore
index 493eb9a1..500787ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
-.DS_store
-.sass-cache
*gem
*swp
+.DS_store
+.sass-cache
+contrib/*.css
Gemfile.lock
+node_modules
public
tmp
-contrib/*.css
-node_modules
diff --git a/Gulpfile.js b/Gulpfile.js
index 979d6226..fac7baa3 100644
--- a/Gulpfile.js
+++ b/Gulpfile.js
@@ -5,7 +5,7 @@ var autoprefix = require("gulp-autoprefixer"),
var paths = {
scss: [
- "./app/assets/stylesheets/**/*.scss",
+ "./core/**/*.scss",
"./contrib/styles.scss"]
};
diff --git a/contrib/styles.scss b/contrib/styles.scss
index 0576b53b..b2a82536 100644
--- a/contrib/styles.scss
+++ b/contrib/styles.scss
@@ -1,293 +1 @@
-$visual-grid: true !global;
-
-// Grid Settings
-$column: 90px;
-$gutter: 30px;
-$grid-columns: 12;
-$max-width: 1200px;
-
-// Media
-$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);
-
-// Base
-$base-line-height: 1.625;
-$base-spacing: $base-line-height * 1em;
-
-// Visual Grid
-
-$visual-grid-color: #e6f6ff;
-$visual-grid-opacity: 0.4;
-
-// Colors
-$white: #fafafa;
-$lightblue: #d5eefb;
-$blue: #aadbf5;
-$darkblue: #41a8df;
-$darkerblue: #072f44;
-
-// Base
-// ============================================
-
-body {
- color: $darkerblue;
- font-family: sans-serif;
- line-height: $base-line-height;
- margin: 0 0 (1.5rem * 2);
- text-align: center;
-}
-
-h3 {
- margin: 1em;
-}
-
-a,
-a:visited {
- color: inherit;
-}
-
-pre {
- line-height: 1.6em;
-}
-
-code {
- display: block;
-}
-
-// Header
-// ============================================
-
-.container {
- margin: 0 auto;
- max-width: 500px;
- padding: 0 $gutter;
- position: relative;
-}
-
-.welcome-message {
- @include clearfix();
- background-color: $blue;
- margin-bottom: 1.5rem;
- padding: $base-spacing 0;
- text-align: center;
-}
-
-.welcome-message-title {
- font-weight: 200;
- line-height: 1;
-}
-
-// ============================================
-
-.code {
- @include outer-container();
- background-color: $lightblue;
- padding: 0.5em;
- text-align: center;
-}
-
-.page-section {
- @include outer-container;
- background-color: $lightblue;
- line-height: $base-line-height * 1.5;
- margin-bottom: 3em;
- text-align: center;
-}
-
-.page-section-inner {
- background-color: $blue;
- font-size: 0.8em;
- height: $base-line-height * 4rem;
- line-height: $base-line-height;
- margin-bottom: 2em;
- padding: 1em;
- text-align: left;
-}
-
-// Zero
-// ============================================
-
-.zero-alpha,
-.zero-beta {
- @include span-columns(6);
- height: $base-line-height * 4rem;
- line-height: $base-line-height;
- padding: 1em;
- text-align: left;
-}
-
-// First
-// ============================================
-
-.first-alpha {
- @include span-columns(1);
-}
-
-.first-beta {
- @include span-columns(11);
-}
-
-.first-gamma {
- @include span-columns(2);
-}
-
-.first-delta {
- @include span-columns(10);
-}
-
-.first-epsilon {
- @include span-columns(3);
-}
-
-.first-zeta {
- @include span-columns(9);
-}
-
-.first-eta {
- @include span-columns(4);
-}
-
-.first-theta {
- @include span-columns(8);
-}
-
-.first-iota {
- @include span-columns(5);
-}
-
-.first-kappa {
- @include span-columns(7);
-}
-
-.first-lambda {
- @include span-columns(6);
-}
-
-.first-mu {
- @include span-columns(6);
-}
-
-.first-beta,
-.first-delta,
-.first-zeta,
-.first-theta,
-.first-kappa,
-.first-mu {
- @include omega;
-}
-
-// Second
-// ============================================
-
-.second-alpha {
- @include span-columns(4);
-}
-
-.second-beta {
- @include span-columns(8);
- line-height: $base-line-height * 2;
- padding: 0;
- text-align: center;
-}
-
-.second-beta-alpha,
-.second-beta-beta {
- @include span-columns(4 of 8);
- background-color: $lightblue;
- height: 84%;
- padding: 1em;
-}
-
-// Third
-// ===================================
-
-.third-dummy {
- border-bottom: 0;
- height: 5.5em;
- text-align: center;
-}
-
-.third-alpha {
- @include fill-parent();
- @include row(table);
- margin-bottom: 0;
- padding: 0;
-}
-
-.third-alpha-alpha {
- @include span-columns(4);
- border-right: 1px solid rgba($white, 0.5);
-}
-
-.third-alpha-beta {
- @include reset-display;
- @include span-columns(8);
- height: 20em;
-}
-
-// Fourth
-// ===================================
-
-.fourth {
-
- .fourth-alpha {
- @include span-columns(6);
- @include shift(3);
- height: 20em;
- text-align: center;
- }
-}
-
-// Fifth
-// ===================================
-
-.fifth-box {
- @include omega(4n);
- @include span-columns(3);
- font-size: 0.78em;
- height: 8em;
- margin-top: 2em;
-}
-
-// Fifth
-// ===================================
-
-.sixth {
- @include media($medium-screen) {
- font-size: 0.9em;
- line-height: 1.5em;
- }
-
- pre {
- padding: 10px 0;
- }
-}
-
-.sixth-alpha,
-.sixth-beta {
- line-height: 2em;
- min-height: 20em;
- padding: 1em;
- text-align: left;
-}
-
-.sixth-alpha {
- @include span-columns(4);
-
- @include media($medium-screen) {
- @include span-columns(3);
- }
-}
-
-.sixth-beta {
- @include span-columns(8);
-
- @include media($medium-screen) {
- @include span-columns(3);
- }
-}
+@import "../core/neat";
From f87b3ae17c32b488a3fb5a23b7dee39fd0b0da0a Mon Sep 17 00:00:00 2001
From: Tyson Gach
Date: Sun, 24 Jan 2016 11:53:30 -0500
Subject: [PATCH 112/269] Use https for RubyGems gem source
---
Gemfile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Gemfile b/Gemfile
index 755701e0..b4e2a20b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,3 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
-# Specify your gem's dependencies in neat.gemspec
gemspec
From 89a4576b2ce78ec6ba44fa213abee0510c0338d3 Mon Sep 17 00:00:00 2001
From: Tyson Gach
Date: Sun, 24 Jan 2016 11:54:26 -0500
Subject: [PATCH 113/269] ABC
---
bower.json | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/bower.json b/bower.json
index 293dfcf6..14281e35 100644
--- a/bower.json
+++ b/bower.json
@@ -6,14 +6,15 @@
"license": "MIT",
"ignore": [
"**/.*",
+ "bin",
+ "bin",
"CONTRIBUTING.md",
"Gemfile",
"Gemfile.lock",
- "NEWS.md",
- "Rakefile",
- "bin",
"lib",
"neat.gemspec",
+ "NEWS.md",
+ "Rakefile",
"spec"
],
"keywords": [
From 8c23faa3fd5afd05e2d7b5a8497d5f30ccd974e8 Mon Sep 17 00:00:00 2001
From: Tyson Gach
Date: Fri, 3 Feb 2017 17:10:15 -0500
Subject: [PATCH 114/269] Remove Bourbon dependency
---
neat.gemspec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/neat.gemspec b/neat.gemspec
index 733862ab..5ea24c20 100644
--- a/neat.gemspec
+++ b/neat.gemspec
@@ -9,11 +9,11 @@ Gem::Specification.new do |s|
s.authors = ['Joel Oliveira', 'Kyle Fiedler', 'Reda Lemeden']
s.email = 'design+bourbon@thoughtbot.com'
s.homepage = 'http://neat.bourbon.io'
- s.summary = 'A lightweight, semantic grid framework'
+ s.summary = 'A lightweight grid framework'
s.license = 'MIT'
s.description = <<-DESC
-Neat is a fluid grid framework built with the aim of being easy enough to use
-out of the box and flexible enough to customize down the road.
+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.
DESC
s.rubyforge_project = 'neat'
From fd8efe97beac9e543e351994b1d38c4c110d409c Mon Sep 17 00:00:00 2001
From: Tyson Gach
Date: Sun, 24 Jan 2016 12:03:06 -0500
Subject: [PATCH 115/269] Update and clear out readme
---
README.md | 174 +++++++-----------------------------------------------
1 file changed, 20 insertions(+), 154 deletions(-)
diff --git a/README.md b/README.md
index 04d77a2b..92e8a612 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ For command line help, visit our wiki page on Neat’s [command line interface](
1. Add Neat to your Gemfile:
```ruby
- gem 'neat'
+ gem "neat"
```
2. Then run:
@@ -113,149 +113,6 @@ For command line help, visit our wiki page on Neat’s [command line interface](
3. Follow the [instructions above](#installation) to install Neat into your project.
-## Using Neat
-
-First off, if you are planning to override the default grid settings (12 columns), it is recommended to create a `_grid-settings.scss` file for that purpose. Make sure to import it right *before* importing Neat:
-
-```scss
-@import "grid-settings";
-@import "neat/neat"; // or "neat" when in Rails
-```
-
-In your newly created `_grid-settings.scss`, import `neat-helpers` if you are planning to use `new-breakpoint()`, then define your new variables:
-
-```scss
-@import "neat/neat-helpers"; // or "neat-helpers" when in Rails
-
-// Change the grid settings
-$column: 90px;
-$gutter: 30px;
-$grid-columns: 10;
-$max-width: 1200px;
-
-// Define your breakpoints
-$tablet: new-breakpoint(max-width 768px 8);
-$mobile: new-breakpoint(max-width 480px 4);
-```
-
-See the [docs](http://thoughtbot.github.io/neat-docs/latest/#variable) for a full list of settings.
-
-Next, include the `outer-container` mixin in the topmost container (to which the `max-width` setting will be applied):
-
-```scss
-div.container {
- @include outer-container;
-}
-```
-
-Then use `span-columns` on any element to specify the number of columns it should span:
-
-```scss
-div.element {
- @include span-columns(6);
-}
-```
-
-If the element’s parent isn’t the top-most container, you need to add the number of columns of the parent element to keep the right proportions:
-
-```scss
-div.container {
- @include outer-container;
-
- div.parent-element {
- @include span-columns(8);
-
- div.element {
- @include span-columns(6 of 8);
- }
- }
-}
-```
-
-To make your layout responsive, use the `media()` mixin to modify both the grid and the layout:
-
-```scss
-.my-class {
- @include media($mobile) { // As defined in _grid-settings.scss
- @include span-columns(2);
- }
-}
-
-// Compiled CSS
-@media screen and (max-width: 480px) {
- .my-class {
- display: block;
- float: left;
- margin-right: 7.42297%;
- width: 46.28851%; // 2 columns of the total 4 in this media context
- }
- .my-class:last-child {
- margin-right: 0;
- }
-}
-```
-
-By setting `$visual-grid` to `true` in a file that is imported before
-`neat-helpers` (or prior to `neat` itself if you are using the default
-breakpoints), you can display the base grid in the background (default) or as an
-overlay. You can even change the color and opacity of the grid-lines by
-overriding the default settings as detailed in the section below.
-
-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.
-
-## FAQ
-
-#### How do I use `omega()` in a mobile-first workflow?
-
-Using `omega()` with an `nth-child` pseudo selector in a mobile-first workflow will cause the style to be applied to wider-viewport media queries as well. That is the cascading nature of CSS.
-
-One solution would be to provide an `omega-reset()` mixin that negates the effect of `omega()` on that specific `nth-child` pseudo selector. While this is often the most suggested solution, it is also a lazy hack that outputs ugly code and can quickly get out of hand in complex layouts. As a general rule, having to *undo* CSS styles is a sign of poor stylesheet architecture (more about [CSS code smells](http://csswizardry.com/2012/11/code-smells-in-css/)).
-
-The other, more elegant, solution is to use mutually exclusive media queries, also referred to as [media-query
-splitting](http://simurai.com/blog/2012/08/29/media-query-splitting). This would guarantee that `omega()` styles are only applied where desired.
-
-```scss
-$first-breakpoint-value: 400px;
-$second-breakpoint-value: 700px;
-$medium-viewport: new-breakpoint(min-width $first-breakpoint-value max-width $second-breakpoint-value);
-$large-viewport: new-breakpoint(min-width $second-breakpoint-value + 1);
-
-.element {
- @include media($medium-viewport) {
- @include span-columns(6);
- @include omega(2n);
- }
-
- @include media($large-viewport) {
- @include span-columns(4);
- @include omega(3n);
- }
-}
-```
-
-If, for some reason, you still think that `omega-reset` is the only way you want to go, check out Josh Fry’s [omega-reset](http://joshfry.me/blog/2013/05/13/omega-reset-for-bourbon-neat).
-
-#### Why are the elements not properly aligned with the visual grid?
-
-The visual grid is built using CSS gradients whose stops might contain decimal values depending on the default settings of your grid. In order to render the gradient, browsers round the pixel values since they can’t deal with pixel fractions.
-
-As a result the visual grid might be few pixels off in some browsers. The result is also inconsistent across browsers. For best results, preview your website on Firefox as it renders closest to the expected outcome.
-
-At this point, writing an internal rounding mechanism is not high priority.
-
-#### Framework X has this feature that Neat seems to be missing. Can you add it?
-
-Unless you [open a pull request](https://github.com/thoughtbot/neat/compare/), the answer is most likely going to be no. Neat is lightweight and simple compared to other grid frameworks, and strives to remain so. We have plans for adding new features in future versions of the framework, but these will be most likely to support new ways of working with layouts on the Web, not patches to existing ones.
-
-## Browser support
-
-- Chrome 10+
-- Firefox 29+
-- Internet Explorer 9+ (visual grid is IE 10 only)
-- Internet Explorer 8 with [selectivizr](http://selectivizr.com) (no `media()` support)
-- Opera 9.5+
-- Safari 5.1+
-
## The Bourbon family
- [Bourbon](https://github.com/thoughtbot/bourbon): A simple and lightweight mixin library for Sass
@@ -263,20 +120,29 @@ Unless you [open a pull request](https://github.com/thoughtbot/neat/compare/), t
- [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
+
## License
-Copyright © 2012–2015 [thoughtbot, inc](http://thoughtbot.com). Neat is free software, and may be redistributed under the terms specified in the [license](LICENSE.md).
+Neat is copyright © 2011 [thoughtbot, inc.][thoughtbot] It is free software, and may be redistributed under the terms specified in the [license].
+
+ [license]: LICENSE.md
-## About thoughtbot
+## About
-[][hire]
+Bourbon 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.
-Neat is maintained and funded by thoughtbot, inc.
-The names and logos for thoughtbot are trademarks of thoughtbot, inc.
+[][thoughtbot]
-We love open source software!
-See [our other projects][community]
-or [hire us][hire] to design, develop, and grow your product.
+We love open-source software! See [our other projects][community] or [hire us][hire] to design, develop, and grow your product.
-[community]: https://thoughtbot.com/community?utm_source=github
-[hire]: https://thoughtbot.com/hire-us?utm_source=github
+ [thoughtbot]: https://thoughtbot.com?utm_source=github
+ [community]: https://thoughtbot.com/community?utm_source=github
+ [hire]: https://thoughtbot.com/hire-us?utm_source=github
From f44d3eb20d651439bc05fa977b316ce916540280 Mon Sep 17 00:00:00 2001
From: Tyson Gach
Date: Sun, 24 Jan 2016 12:04:16 -0500
Subject: [PATCH 116/269] Update SCSS-Lint to 0.44
---
.scss-lint.yml | 2 ++
neat.gemspec | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.scss-lint.yml b/.scss-lint.yml
index 13455e27..e9144049 100644
--- a/.scss-lint.yml
+++ b/.scss-lint.yml
@@ -1,5 +1,7 @@
scss_files: "**/*.scss"
+severity: warning
+
linters:
BangFormat:
enabled: true
diff --git a/neat.gemspec b/neat.gemspec
index 5ea24c20..3e2009dc 100644
--- a/neat.gemspec
+++ b/neat.gemspec
@@ -26,7 +26,7 @@ enough to use out of the box and flexible enough to customize down the road.
s.add_dependency('sass', '>= 3.3')
s.add_dependency("thor", "~> 0.19")
- s.add_development_dependency("scss_lint", "~> 0.43")
+ s.add_development_dependency("scss_lint", "~> 0.44")
s.add_development_dependency('aruba', '~> 0.5.0')
s.add_development_dependency('bundler')
s.add_development_dependency('css_parser')
From 377f62e4cf4b6f412b2e7efcf48532978857beb0 Mon Sep 17 00:00:00 2001
From: Tyson Gach
Date: Sun, 24 Jan 2016 12:14:52 -0500
Subject: [PATCH 117/269] Update gemspec
Reference: http://guides.rubygems.org/specification-reference/
---
neat.gemspec | 60 +++++++++++++++++++++++-----------------------------
1 file changed, 27 insertions(+), 33 deletions(-)
diff --git a/neat.gemspec b/neat.gemspec
index 3e2009dc..21da1e2f 100644
--- a/neat.gemspec
+++ b/neat.gemspec
@@ -1,37 +1,31 @@
-# coding: utf-8
-$:.push File.expand_path('../lib', __FILE__)
-require 'neat/version'
+$:.push File.expand_path("../lib", __FILE__)
+require "neat/version"
Gem::Specification.new do |s|
- s.name = 'neat'
- s.version = Neat::VERSION
- s.platform = Gem::Platform::RUBY
- s.authors = ['Joel Oliveira', 'Kyle Fiedler', 'Reda Lemeden']
- s.email = 'design+bourbon@thoughtbot.com'
- s.homepage = 'http://neat.bourbon.io'
- s.summary = 'A lightweight grid framework'
- s.license = 'MIT'
- s.description = <<-DESC
-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.
- DESC
-
- s.rubyforge_project = 'neat'
-
- s.files = `git ls-files`.split("\n")
- s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+ s.add_development_dependency "aruba", "~> 0.5.0"
+ s.add_development_dependency "css_parser"
+ s.add_development_dependency "rake"
+ s.add_development_dependency "rspec"
+ s.add_development_dependency "scss_lint", "~> 0.44"
+ s.add_runtime_dependency "sass", "~> 3.4"
+ s.add_runtime_dependency "thor", "~> 0.19"
+ s.authors = [
+ "Joel Oliveira",
+ "Joshua Ogle",
+ "Kyle Fiedler",
+ "Reda Lemeden",
+ "Tyson Gach",
+ "Ward Penney",
+ "Will McMahan"
+ ]
+ s.email = "design+neat@thoughtbot.com"
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
- s.require_paths = ['lib']
-
- s.add_dependency('sass', '>= 3.3')
- s.add_dependency("thor", "~> 0.19")
-
- s.add_development_dependency("scss_lint", "~> 0.44")
- s.add_development_dependency('aruba', '~> 0.5.0')
- s.add_development_dependency('bundler')
- s.add_development_dependency('css_parser')
- s.add_development_dependency('rake')
- s.add_development_dependency('rb-fsevent', '~> 0.9.1')
- s.add_development_dependency('rdoc')
- s.add_development_dependency('rspec')
+ s.files = `git ls-files`.split("\n")
+ s.homepage = "http://neat.bourbon.io"
+ s.license = "MIT"
+ s.name = "neat"
+ s.platform = Gem::Platform::RUBY
+ s.require_paths = ["lib"]
+ s.summary = "A lightweight Sass grid framework"
+ s.version = Neat::VERSION
end
From c3166e9b9bf0a8f98b1d9afe38fb3c02b876a5c0 Mon Sep 17 00:00:00 2001
From: Tyson Gach
Date: Fri, 29 Jan 2016 17:01:57 -0500
Subject: [PATCH 118/269] Use core/ as the primary Neat source directory
---
bower.json | 2 +-
core/.keep | 0
core/_neat.scss | 0
lib/neat.rb | 2 +-
lib/tasks/install.rake | 2 +-
5 files changed, 3 insertions(+), 3 deletions(-)
create mode 100644 core/.keep
create mode 100644 core/_neat.scss
diff --git a/bower.json b/bower.json
index 14281e35..73cea63a 100644
--- a/bower.json
+++ b/bower.json
@@ -2,7 +2,7 @@
"name": "neat",
"description": "A lightweight, semantic grid framework",
"version": "1.8.0",
- "main": "app/assets/stylesheets/_neat.scss",
+ "main": "core/_neat.scss",
"license": "MIT",
"ignore": [
"**/.*",
diff --git a/core/.keep b/core/.keep
new file mode 100644
index 00000000..e69de29b
diff --git a/core/_neat.scss b/core/_neat.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/lib/neat.rb b/lib/neat.rb
index 3507c0a1..82aeada4 100644
--- a/lib/neat.rb
+++ b/lib/neat.rb
@@ -15,6 +15,6 @@ class Railtie < ::Rails::Railtie
end
end
else
- Sass.load_paths << File.expand_path("../../app/assets/stylesheets", __FILE__)
+ Sass.load_paths << File.expand_path("../../core", __FILE__)
end
end
diff --git a/lib/tasks/install.rake b/lib/tasks/install.rake
index 9097f7a8..c0ae7d70 100644
--- a/lib/tasks/install.rake
+++ b/lib/tasks/install.rake
@@ -7,7 +7,7 @@ namespace :neat do
args.with_defaults(:sass_path => 'public/stylesheets/sass')
source_root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
FileUtils.mkdir_p("#{Rails.root}/#{args.sass_path}/neat")
- FileUtils.cp_r("#{source_root}/app/assets/stylesheets/.", "#{Rails.root}/#{args.sass_path}/neat", { :preserve => true })
+ FileUtils.cp_r("#{source_root}/core/.", "#{Rails.root}/#{args.sass_path}/neat", { :preserve => true })
Find.find("#{Rails.root}/#{args.sass_path}/neat") do |path|
if path.end_with?(".css.scss")
From 813a6931910fa34f4a136b92a2c87dcab92e1dfb Mon Sep 17 00:00:00 2001
From: Tyson Gach
Date: Sun, 28 Feb 2016 17:37:26 -0500
Subject: [PATCH 119/269] Remove Travis
---
.npmignore | 1 -
.travis.yml | 10 ----------
README.md | 2 +-
3 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 .travis.yml
diff --git a/.npmignore b/.npmignore
index 04903abc..329ad9d6 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,7 +1,6 @@
.gitignore
.sass-cache
.scss-lint.yml
-.travis.yml
_site
bin/
bower.json
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index f730332b..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-language: ruby
-rvm: 2.0.0
-sudo: false
-branches:
- except:
- - gh-pages
- - gh-pages-dev
-notifications:
- slack:
- secure: ROE+Zo+A6JmTjxCRGG539YaoEcLrsInEIrTDQMgtn5ucLaiPiau96VO+GJ4MyxZm2M5qlSRMFCxb3jFexCRVZctuUF2hFcXVi6a/+JGhMmYLd6XMNezhlxWwOoSx6ufSAlrlXEalsdnkzqVHuH2Y50ao/3slNo58DdLoaRJiGAc=
diff --git a/README.md b/README.md
index 92e8a612..5209fdb0 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
[](http://neat.bourbon.io)
-[](https://rubygems.org/gems/neat) [](https://travis-ci.org/thoughtbot/neat)
+[](https://rubygems.org/gems/neat)
[](https://gitter.im/thoughtbot/neat)
[](http://stackoverflow.com/questions/tagged/neat)
From edcd916e62c4b191919f56fb8e1dc5ef408b43a8 Mon Sep 17 00:00:00 2001
From: Tyson Gach
Date: Sun, 28 Feb 2016 17:38:10 -0500
Subject: [PATCH 120/269] Remove readme badges
---
README.md | 4 ----
1 file changed, 4 deletions(-)
diff --git a/README.md b/README.md
index 5209fdb0..79254923 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,5 @@
[](http://neat.bourbon.io)
-[](https://rubygems.org/gems/neat)
-[](https://gitter.im/thoughtbot/neat)
-[](http://stackoverflow.com/questions/tagged/neat)
-
## A lightweight, semantic grid framework
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.
From aa4aeafa53e4aafdcb723fee8e747e1ec2efac49 Mon Sep 17 00:00:00 2001
From: Tyson Gach
Date: Sun, 28 Feb 2016 17:40:40 -0500
Subject: [PATCH 121/269] Clean up requirements
- Remove Sass 3.2 support
- Add LibSass requirement
---
README.md | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 79254923..8bc281fa 100644
--- a/README.md
+++ b/README.md
@@ -14,8 +14,7 @@ for updates.
## Requirements
-- [Sass](https://github.com/sass/sass) 3.3+
-- :warning: If you need **Sass 3.2 support**, you should [use Neat 1.5.1](#installing-older-versions-of-neat)
+- Sass 3.4+ or LibSass 3.3+
## Installation
From 1218c616d16de2d53d73feeac847dd5e5b1e8e86 Mon Sep 17 00:00:00 2001
From: Tyson Gach
Date: Sun, 28 Feb 2016 17:42:52 -0500
Subject: [PATCH 122/269] Neat, not Bourbon
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 8bc281fa..d81719ee 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,7 @@ Neat is copyright © 2011 [thoughtbot, inc.][thoughtbot] It is free software, an
## About
-Bourbon 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.
+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.
[][thoughtbot]
From 6006f4d5d29f353b15d7b6e0f31f6a95b68eb048 Mon Sep 17 00:00:00 2001
From: Tyson Gach
Date: Sun, 28 Feb 2016 11:22:53 -0500
Subject: [PATCH 123/269] Remove engine, Railtie, and install task
This is an artifact left from the days before the Rails Assets Pipeline. Moving
forward, this option of install will no longer be available and we'll only
support Rails 4.2+.
---
lib/neat.rb | 20 ++------------------
lib/neat/engine.rb | 5 -----
lib/tasks/install.rake | 19 -------------------
3 files changed, 2 insertions(+), 42 deletions(-)
delete mode 100644 lib/neat/engine.rb
delete mode 100644 lib/tasks/install.rake
diff --git a/lib/neat.rb b/lib/neat.rb
index 82aeada4..7f9ad1bd 100644
--- a/lib/neat.rb
+++ b/lib/neat.rb
@@ -1,20 +1,4 @@
-require "sass"
require "neat/generator"
-module Neat
- if defined?(Rails) && defined?(Rails::Engine)
- class Engine < ::Rails::Engine
- require 'neat/engine'
- end
-
- module Rails
- class Railtie < ::Rails::Railtie
- rake_tasks do
- load "tasks/install.rake"
- end
- end
- end
- else
- Sass.load_paths << File.expand_path("../../core", __FILE__)
- end
-end
+neat_path = File.expand_path("../../core", __FILE__)
+ENV["SASS_PATH"] = File.join([ENV["SASS_PATH"], neat_path].compact)
diff --git a/lib/neat/engine.rb b/lib/neat/engine.rb
deleted file mode 100644
index 11650d68..00000000
--- a/lib/neat/engine.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module Neat
- class Engine < Rails::Engine
- # auto wire
- end
-end
diff --git a/lib/tasks/install.rake b/lib/tasks/install.rake
deleted file mode 100644
index c0ae7d70..00000000
--- a/lib/tasks/install.rake
+++ /dev/null
@@ -1,19 +0,0 @@
-require "fileutils"
-require "find"
-
-namespace :neat do
- desc "Copy Neat's files to the Rails assets directory."
- task :install, [:sass_path] do |t, args|
- args.with_defaults(:sass_path => 'public/stylesheets/sass')
- source_root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
- FileUtils.mkdir_p("#{Rails.root}/#{args.sass_path}/neat")
- FileUtils.cp_r("#{source_root}/core/.", "#{Rails.root}/#{args.sass_path}/neat", { :preserve => true })
-
- Find.find("#{Rails.root}/#{args.sass_path}/neat") do |path|
- if path.end_with?(".css.scss")
- path_without_css_extension = path.gsub(/\.css\.scss$/, ".scss")
- FileUtils.mv(path, path_without_css_extension)
- end
- end
- end
-end
From 44319dfe8ef5f0d319b06dc993c5f71188377582 Mon Sep 17 00:00:00 2001
From: Tyson Gach
Date: Sun, 28 Feb 2016 11:25:04 -0500
Subject: [PATCH 124/269] Mention Rails version
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index d81719ee..ad23491d 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,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
+## Installation for Ruby on Rails 4.2+
1. Add Neat to your Gemfile:
From a22d3930df898807030f131ad2555439982fbb24 Mon Sep 17 00:00:00 2001
From: Tyson Gach
Date: Mon, 29 Feb 2016 19:08:29 -0500
Subject: [PATCH 125/269] Update path
---
index.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/index.js b/index.js
index c3f1395e..6443bccc 100644
--- a/index.js
+++ b/index.js
@@ -2,6 +2,6 @@ var path = require("path");
module.exports = {
includePaths: [
- path.join(__dirname, "app/assets/stylesheets"),
+ path.join(__dirname, "core")
]
};
From 4959eb337736ef379ed8885c017d56f42a615d0b Mon Sep 17 00:00:00 2001
From: Tyson Gach
Date: Mon, 29 Feb 2016 20:58:59 -0500
Subject: [PATCH 126/269] Update copyright year
---
LICENSE.md | 2 +-
README.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/LICENSE.md b/LICENSE.md
index 1be2ca78..198a9e32 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright © 2012–2015 [thoughtbot, inc.](http://thoughtbot.com)
+Copyright © 2012 [thoughtbot, inc.](http://thoughtbot.com)
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the “Software”), to deal
diff --git a/README.md b/README.md
index ad23491d..7ec1b287 100644
--- a/README.md
+++ b/README.md
@@ -126,7 +126,7 @@ See the [contributing] document. Thank you, [contributors]!
## License
-Neat is copyright © 2011 [thoughtbot, inc.][thoughtbot] It is free software, and may be redistributed under the terms specified in the [license].
+Neat is copyright © 2012 [thoughtbot, inc.][thoughtbot] It is free software, and may be redistributed under the terms specified in the [license].
[license]: LICENSE.md
From 3e5e71bc6eb68080599924d398c270339daf1f55 Mon Sep 17 00:00:00 2001
From: Tyson Gach
Date: Mon, 29 Feb 2016 20:55:46 -0500
Subject: [PATCH 127/269] Clean up Rakefile
---
Rakefile | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/Rakefile b/Rakefile
index 22d3579e..1f920cad 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,18 +1,8 @@
-require 'rubygems'
-require 'bundler'
-require 'rspec/core/rake_task'
+require "bundler"
+require "rspec/core/rake_task"
+
Bundler::GemHelper.install_tasks
RSpec::Core::RakeTask.new(:spec)
task :default => :spec
-
-task :test do
- puts "Generating CSS..."
- `sass -I . --watch test:css/ --style expanded`
-end
-
-task :clean do
- puts "Deleting generated CSS..."
- `rm -rf css/`
-end
From 07e015e0fb3e8e4749ece70f9a95cfe586583d73 Mon Sep 17 00:00:00 2001
From: Will H McMahan
Date: Thu, 11 Feb 2016 04:04:55 -0500
Subject: [PATCH 128/269] Add core grid functionality
These changes introduce the use of `calc` within Neat, allowing for more
flexible use of the system. This includes the use of static values (ie 1.25rem)
for the grid's gutters, while having percentage values for a column's width,
like 1/3 or 25%.
---
core/.keep | 0
core/_neat.scss | 9 +++++++
core/neat/mixins/_grid-column.scss | 39 ++++++++++++++++++++++++++++++
core/neat/settings/_settings.scss | 17 +++++++++++++
4 files changed, 65 insertions(+)
delete mode 100644 core/.keep
create mode 100644 core/neat/mixins/_grid-column.scss
create mode 100644 core/neat/settings/_settings.scss
diff --git a/core/.keep b/core/.keep
deleted file mode 100644
index e69de29b..00000000
diff --git a/core/_neat.scss b/core/_neat.scss
index e69de29b..93a18170 100644
--- a/core/_neat.scss
+++ b/core/_neat.scss
@@ -0,0 +1,9 @@
+@charset "UTF-8";
+// Neat 2.0.0-alpha.0
+// http://neat.bourbon.io
+// Copyright 2012 thoughtbot, inc.
+// MIT License
+
+@import "neat/settings/settings";
+
+@import "neat/mixins/grid-column";
diff --git a/core/neat/mixins/_grid-column.scss b/core/neat/mixins/_grid-column.scss
new file mode 100644
index 00000000..3fcde592
--- /dev/null
+++ b/core/neat/mixins/_grid-column.scss
@@ -0,0 +1,39 @@
+@charset "UTF-8";
+/// Creates Neat a grid column of requested size.
+///
+/// @argument {number (unitless)} $columns [1]
+///
+/// @argument {map} $grid [$neat-default-grid]
+/// The grid to be used to generate the column. By default, the global
+/// `$neat-default-grid` will be used.
+///
+/// @example scss
+/// .element {
+/// @include grid-column(3);
+/// }
+///
+/// @example css
+/// .element {
+/// width: calc(25% - 25px);
+/// float: left;
+/// margin-left: 20px;
+/// }
+
+@mixin grid-column($columns: 1, $grid: $neat-default-grid) {
+ $_grid-columns: map-get($grid, columns);
+ $_grid-gutter: map-get($grid, gutter);
+
+ $_column-ratio: $columns / $_grid-columns;
+
+ @if $_grid-gutter > 0 {
+ $_gutter-affordance: $_grid-gutter + ($_grid-gutter * $_column-ratio);
+ $_column-width-calc: unquote("#{percentage($_column-ratio)} - #{$_gutter-affordance}");
+
+ width: calc(#{$_column-width-calc});
+ } @else {
+ width: percentage($_column-ratio);
+ }
+
+ float: left;
+ margin-left: $_grid-gutter;
+}
diff --git a/core/neat/settings/_settings.scss b/core/neat/settings/_settings.scss
new file mode 100644
index 00000000..7edda896
--- /dev/null
+++ b/core/neat/settings/_settings.scss
@@ -0,0 +1,17 @@
+@charset "UTF-8";
+/// Neat default grid.
+///
+/// @type map
+///
+/// @property {number (unitless)} columns 12
+/// Number of grid columns
+///
+/// @property {number (with unit)} gutter 40px
+/// Grid gutter width.
+///
+/// @access private
+
+$neat-default-grid: (
+ columns: 12,
+ gutter: 20px
+);
From 821160f0735819caaf39b655bd1c1f5ae6596905 Mon Sep 17 00:00:00 2001
From: Ward Penney
Date: Tue, 1 Mar 2016 14:15:16 -0500
Subject: [PATCH 129/269] Contrib script and instructions
---
CONTRIBUTING.md | 12 ++++++++++++
package.json | 3 ++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d55b7d93..994a9bc8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -36,3 +36,15 @@ Some things that will increase the chance that your pull request is accepted:
* Declarations within a block should be ordered alphabetically.
* Blank lines between rules.
* No trailing whitespace. Blank lines should not have any space.
+
+**Contrib examples**
+
+For user-facing changes, please provide an example in sample page contained in
+the `./contrib` folder. Also, please put a screenshot of the changes into the
+Pull Request.
+
+To see the `./contrib` example page:
+
+1. Install node
+* Run `npm install`
+* Run `npm run contrib`
diff --git a/package.json b/package.json
index 3ec3cf73..51f21a25 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,8 @@
"url": "https://github.com/thoughtbot/neat.git"
},
"scripts": {
- "test": "echo \"No test specified\""
+ "test": "echo \"No test specified\"",
+ "contrib": "gulp"
},
"dependencies": {
"node-sass": "^3.4"
From 33c76b977c67b900648d5c4508592ff01b241063 Mon Sep 17 00:00:00 2001
From: Ward Penney
Date: Tue, 1 Mar 2016 14:15:27 -0500
Subject: [PATCH 130/269] Create container for floated grid
* Add to contrib
---
contrib/base/_grids.scss | 4 +
contrib/base/_variables.scss | 3 +
contrib/index.html | 269 +++++---------------------
contrib/patterns/_box.scss | 10 +
contrib/patterns/_global.scss | 5 +
contrib/patterns/_grid-nested.scss | 7 +
contrib/patterns/_grid.scss | 15 ++
contrib/styles.scss | 8 +
core/_neat.scss | 1 +
core/neat/mixins/_grid-container.scss | 28 +++
10 files changed, 127 insertions(+), 223 deletions(-)
create mode 100644 contrib/base/_grids.scss
create mode 100644 contrib/base/_variables.scss
create mode 100644 contrib/patterns/_box.scss
create mode 100644 contrib/patterns/_global.scss
create mode 100644 contrib/patterns/_grid-nested.scss
create mode 100644 contrib/patterns/_grid.scss
create mode 100644 core/neat/mixins/_grid-container.scss
diff --git a/contrib/base/_grids.scss b/contrib/base/_grids.scss
new file mode 100644
index 00000000..73806731
--- /dev/null
+++ b/contrib/base/_grids.scss
@@ -0,0 +1,4 @@
+$grid--nested: (
+ columns: 3,
+ gutter: 0,
+);
diff --git a/contrib/base/_variables.scss b/contrib/base/_variables.scss
new file mode 100644
index 00000000..41cb5435
--- /dev/null
+++ b/contrib/base/_variables.scss
@@ -0,0 +1,3 @@
+$color-neat-blue: #53aee0;
+$color-neat-orange: #ff7c56;
+$color-white: #fff;
diff --git a/contrib/index.html b/contrib/index.html
index c24b40ea..2a38d52a 100644
--- a/contrib/index.html
+++ b/contrib/index.html
@@ -1,225 +1,48 @@
-
-
-
-
-
-
- Have fun ❤︎
-
-
-
-
[](https://rubygems.org/gems/neat) [](https://travis-ci.org/thoughtbot/neat)
[](https://codeclimate.com/github/thoughtbot/neat)
@@ -244,9 +244,13 @@ At this point, writing an internal rounding mechanism is not high priority.
Unless you [open a pull request](https://github.com/thoughtbot/neat/compare/), the answer is most likely going to be no. Neat is lightweight and simple compared to other grid frameworks, and strives to remain so. We have plans for adding new features in future versions of the framework, but these will be most likely to support new ways of working with layouts on the Web, not patches to existing ones.
+## Documentation
+
+- [Full documentation](http://thoughtbot.github.io/neat-docs/latest/) (latest)
+- Neat documentation is now available by default in [Dash](http://kapeli.com/dash)
+
## Links
-- Add the docset to [Dash](http://kapeli.com/dash) 1.8+ (Preferences **>** Downloads **>** + *Add Docset Feed* **>** `http://neat.bourbon.io/docset/Neat.xml`)
- Ask questions on [Stack Overflow](http://stackoverflow.com/questions/tagged/neat). Don’t forget to tag them `bourbon` and `neat`.
- Suggest features or file bugs in [Issues](https://github.com/thoughtbot/neat/issues).
- Join `#bourbon-neat` on `irc.freenode.net`.
From de840ff558037af35a2bfbe983d3d96ab82f40f3 Mon Sep 17 00:00:00 2001
From: Reda Lemeden 
](http://neat.bourbon.io)
## A lightweight, semantic grid framework
@@ -103,20 +103,18 @@ 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.0
```
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]!
From 611afe115f42bbc26f40d48c0cf740b656b98fa3 Mon Sep 17 00:00:00 2001
From: Will H McMahan 
][thoughtbot]
We love open-source software! See [our other projects][community] or [hire us][hire] to design, develop, and grow your product.
From ea010ff498a3ab2b85abce19f0faf11f50a5857d Mon Sep 17 00:00:00 2001
From: Will H McMahan