Merge pull request #1456 from woothemes/release-2-6-0

Release 2 6 0

README.mdown

@@ -1,6 +1,6 @@
 [![Gitter chat](https://badges.gitter.im/woothemes/FlexSlider.png)](https://gitter.im/woothemes/FlexSlider)
 
-# FlexSlider 2.5.0
+# FlexSlider 2.6.0
 http://www.woothemes.com/flexslider/ - Copyright (c) 2015 WooThemes
 
 ## Releases
@@ -19,6 +19,10 @@ To keep up to date with how FlexSlider's development roadmap looks, please see o
 
 ## Updates
 
+** Version 2.6.0 **
+
+** Adds composer json file, scope fix for focused keyword, fixes bower demo folder exclusion, z-index fix for disabled nav arrow, play/pause accessibility fix, itemMargin fix for slider items, fixes accessibility for in focus elements and pagination controls, firefox fix for text selection on slider carousel, adds data-thumb-alt image alt attribute **
+
 ** Version 2.5.0 **
 
 ** Bumped compatibility support starting with jQuery 1.7+. pausePlay icon fix. Firefox touch event fix. Adds customDirectionNav param **

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "flexslider",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "homepage": "https://github.com/woothemes/FlexSlider",
   "authors": [
     "WooThemes <jeff@woothemes.com>"
@@ -23,7 +23,8 @@
     "node_modules",
     "bower_components",
     "test",
-    "tests"
+    "tests",
+    "demo"
   ],
   "dependencies": {
     "jquery": ">=1.11.3"

changelog.txt

@@ -16,4 +16,15 @@ FLEXSLIDER CHANGELOG
  * CSS fix for pausePlay play icon.
  * Firefox touchstart event fix.
  * Compatibility change for jQuery to 1.7.0+
- * Adds customDirectionNav param for custom navigation controls
+ * Adds customDirectionNav param for custom navigation controls
+
+ 2015.11.16 - Version 2.6.0
+ * Adds composer json file keywords
+ * Scope fix for focused keyword
+ * Fixes bower demo folder exclusion
+ * z-index fix for disabled nav arrow
+ * play/pause accessibility fix
+ * itemMargin fix for slider items margins
+ * Fixes accessibility for in focus elements and pagination controls
+ * Firefox fix for text selection on slider carousel
+ * Adds data-thumb-alt image alt attribute

composer.json

@@ -0,0 +1,6 @@
+{
+  "name": "woothemes/FlexSlider",
+  "description": "An awesome, fully responsive jQuery slider toolkit.",
+  "keywords": ["flexslider","slider","jquery","woothemes","automattic"],
+  "homepage": "https://github.com/woothemes/FlexSlider"
+}

css/resets.less

@@ -6,8 +6,7 @@
 .flex-container,
 .flex-slider {
 
-  a:hover,
-  a:focus {
+  a:hover {
 
     outline: none;
 
@@ -19,9 +18,9 @@
 .slides > li,
 .flex-control-nav,
 .flex-direction-nav {
-  
-  margin: 0; 
-  padding: 0; 
+
+  margin: 0;
+  padding: 0;
   list-style: none;
 
 }