Foundation build to bower-foundation

foundation · Mar 13, 2014 · dfa5368 · dfa5368
1 parent 3aeeb40
commit dfa5368
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
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('close').remove();
+          S(this).trigger('closed').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('close').remove();
+          S(this).trigger('closed').remove();
           settings.callback();
         });
       });

diff --git a/scss/foundation.scss b/scss/foundation.scss
@@ -7,7 +7,6 @@
 
 // Behold, here are all the Foundation components.
 @import
-  "foundation/components/grid",
   "foundation/components/accordion",
   "foundation/components/alert-boxes",
   "foundation/components/block-grid",
@@ -19,6 +18,7 @@
   "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,6 +3,7 @@
 // Licensed under MIT Open Source
 
 @import "global";
+@import "grid";
 
 //
 // @variables