Foundation build to bower-foundation

foundation · Mar 13, 2014 · 098dcaf · 098dcaf
1 parent dfa5368
commit 098dcaf
Show file tree

Hide file tree

Showing 8 changed files with 127 additions and 7 deletions.
diff --git a/css/foundation.css b/css/foundation.css
diff --git a/css/foundation.min.css b/css/foundation.min.css
diff --git a/js/foundation.js b/js/foundation.js
@@ -940,7 +940,7 @@
 
         e.preventDefault();
         alertBox[settings.animation](settings.speed, function () {
-          S(this).trigger('closed').remove();
+          S(this).trigger('close').remove();
           settings.callback();
         });
       });

diff --git a/js/foundation.min.js b/js/foundation.min.js
diff --git a/js/foundation/foundation.alert.js b/js/foundation/foundation.alert.js
@@ -26,7 +26,7 @@
 
         e.preventDefault();
         alertBox[settings.animation](settings.speed, function () {
-          S(this).trigger('closed').remove();
+          S(this).trigger('close').remove();
           settings.callback();
         });
       });

diff --git a/scss/foundation.scss b/scss/foundation.scss
@@ -7,6 +7,7 @@
 
 // Behold, here are all the Foundation components.
 @import
+  "foundation/components/grid",
   "foundation/components/accordion",
   "foundation/components/alert-boxes",
   "foundation/components/block-grid",
@@ -18,7 +19,6 @@
   "foundation/components/dropdown-buttons",
   "foundation/components/flex-video",
   "foundation/components/forms",
-  "foundation/components/grid",
   "foundation/components/inline-lists",
   "foundation/components/joyride",
   "foundation/components/keystrokes",

diff --git a/scss/foundation/components/_accordion.scss b/scss/foundation/components/_accordion.scss
@@ -3,7 +3,6 @@
 // Licensed under MIT Open Source
 
 @import "global";
-@import "grid";
 
 //
 // @variables

diff --git a/scss/foundation/components/_grid.scss b/scss/foundation/components/_grid.scss
@@ -101,7 +101,8 @@ $total-columns: 12 !default;
   $position:false) {
 
   // If positioned for default .column, include relative position
-  @if $position {
+  // push and pull require position set
+  @if $position or $push or $pull {
     position: relative;
   }