Rename direction and display mixins

- Prevents a conflict with Bourbon's `display()` mixin. Closes #231, #228.
thoughtbot · Oct 3, 2014 · 7a66600 · 7a66600
1 parent 2875ee2
commit 7a66600
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/app/assets/stylesheets/_neat.scss b/app/assets/stylesheets/_neat.scss
@@ -19,5 +19,5 @@
 @import "grid/media";
 @import "grid/to-deprecate";
 @import "grid/visual-grid";
-@import "grid/display";
-@import "grid/direction";
+@import "grid/display-context";
+@import "grid/direction-context";
diff --git a/app/assets/stylesheets/grid/_direction.scss → .../stylesheets/grid/_direction-context.scss b/app/assets/stylesheets/grid/_direction.scss → .../stylesheets/grid/_direction-context.scss
@@ -17,7 +17,7 @@
  *      ...
  *   }
  */
-@mixin direction($direction: left-to-right) {
+@mixin direction-context($direction: left-to-right) {
   $scope-direction: $layout-direction;
 
   @if to-lower-case($direction) == "left-to-right" {

diff --git a/app/assets/stylesheets/grid/_display.scss → ...ts/stylesheets/grid/_display-context.scss b/app/assets/stylesheets/grid/_display.scss → ...ts/stylesheets/grid/_display-context.scss
@@ -17,7 +17,7 @@
  *      ...
  *   }
  */
-@mixin display($display: block) {
+@mixin display-context($display: block) {
   $scope-display: $container-display-table;
   $container-display-table: $display == table !global;
 

diff --git a/spec/neat/direction_spec.rb b/spec/neat/direction_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe "@include direction() {...}" do
+describe "@include direction-context() {...}" do
   before(:all) do
-    ParserSupport.parse_file("direction")
+    ParserSupport.parse_file("direction-context")
   end
 
   context "with no argument" do

diff --git a/spec/neat/display_spec.rb b/spec/neat/display_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe "@include display() {...}" do
+describe "@include display-context() {...}" do
   before(:all) do
-    ParserSupport.parse_file("display")
+    ParserSupport.parse_file("display-context")
   end
 
   context "with argument (table)" do

diff --git a/test/direction.scss → test/direction-context.scss b/test/direction.scss → test/direction-context.scss
@@ -1,12 +1,12 @@
 @import 'setup';
 
-@include direction() {
+@include direction-context() {
   .default-block {
     @include span-columns(6);
   }
 }
 
-@include direction(right-to-left) {
+@include direction-context(right-to-left) {
   .right-to-left-block {
     @include span-columns(6);
   }

diff --git a/test/display.scss → test/display-context.scss b/test/display.scss → test/display-context.scss
@@ -1,13 +1,13 @@
 @import 'setup';
 
-@include display(table) {
+@include display-context(table) {
   .display-table-block {
     @include span-columns(6);
   }
 }
 
-@include display(table) {
-  @include display(block) {
+@include display-context(table) {
+  @include display-context(block) {
     .display-nested-block {
       @include span-columns(6);
     }