Merge branch 'v6.3' into v6.3-responsiveAccordionTabs

foundation · Oct 9, 2016 · 0bf7690 · 0bf7690
2 parents 2c2e28b + 9c17987
commit 0bf7690
Show file tree

Hide file tree

Showing 165 changed files with 5,242 additions and 1,742 deletions.
diff --git a/.npmignore b/.npmignore
@@ -16,3 +16,4 @@ sache.json
 test
 .editorconfig
 .versions
+.babelrc
diff --git a/.versions b/.versions
@@ -1,15 +1,14 @@
-[email protected]_1
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
 fourseven:[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-zurb:[email protected]_1
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+zurb:[email protected]_2
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "foundation-sites",
-  "version": "6.2.1",
+  "version": "6.2.3",
   "main": [
     "scss/foundation.scss",
     "dist/foundation.js"
@@ -22,7 +22,8 @@
     ".npm",
     ".gitignore",
     ".npmignore",
-    ".versions"
+    ".versions",
+    ".babelrc"
   ],
   "dependencies": {
     "jquery": "~2.2.0",

diff --git a/composer.json b/composer.json
@@ -1,7 +1,6 @@
 {
   "name": "zurb/foundation-sites",
   "description": "The most advanced responsive front-end framework in the world.",
-  "version": "6.2.1",
   "keywords": [
     "css",
     "scss",

diff --git a/customizer/complete.json b/customizer/complete.json
@@ -18,7 +18,7 @@
     "dropdown",
     "dropdown_menu",
     "equalizer",
-    "flex_video",
+    "responsive_embed",
     "interchange",
     "label",
     "magellan",

diff --git a/customizer/config.yml b/customizer/config.yml
@@ -85,9 +85,9 @@ dropdown_menu:
 
 equalizer:
   js: equalizer
-
-flex_video:
-  sass: flex-video
+  js_utils:
+    - mediaQuery
+    - timerAndImageLoader
 
 interchange:
   js: interchange
@@ -134,6 +134,9 @@ progress_bar:
 progress_element:
   sass: progress-element
 
+responsive_embed:
+  sass: responsive-embed
+
 responsive_menu:
   js: responsiveMenu
   js_utils:
@@ -156,6 +159,7 @@ slider:
     - motion
     - triggers
     - mediaQuery
+    - keyboard
 
 sticky:
   sass: sticky
@@ -172,6 +176,7 @@ reveal:
     - motion
     - triggers
     - mediaQuery
+    - keyboard
 
 switch:
   sass: switch