Skip to content
This repository was archived by the owner on Oct 16, 2024. It is now read-only.

Commit 9a419a0

Browse files
committed
Merge pull request #1456 from woothemes/release-2-6-0
Release 2 6 0
2 parents 83b3cae + 09d7c72 commit 9a419a0

21 files changed

+161
-132
lines changed

README.mdown

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![Gitter chat](https://badges.gitter.im/woothemes/FlexSlider.png)](https://gitter.im/woothemes/FlexSlider)
22

3-
# FlexSlider 2.5.0
3+
# FlexSlider 2.6.0
44
http://www.woothemes.com/flexslider/ - Copyright (c) 2015 WooThemes
55

66
## Releases
@@ -19,6 +19,10 @@ To keep up to date with how FlexSlider's development roadmap looks, please see o
1919

2020
## Updates
2121

22+
** Version 2.6.0 **
23+
24+
** 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 **
25+
2226
** Version 2.5.0 **
2327

2428
** Bumped compatibility support starting with jQuery 1.7+. pausePlay icon fix. Firefox touch event fix. Adds customDirectionNav param **

bower.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "flexslider",
3-
"version": "2.5.0",
3+
"version": "2.6.0",
44
"homepage": "https://github.com/woothemes/FlexSlider",
55
"authors": [
66
"WooThemes <[email protected]>"
@@ -23,7 +23,8 @@
2323
"node_modules",
2424
"bower_components",
2525
"test",
26-
"tests"
26+
"tests",
27+
"demo"
2728
],
2829
"dependencies": {
2930
"jquery": ">=1.11.3"

changelog.txt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,15 @@ FLEXSLIDER CHANGELOG
1616
* CSS fix for pausePlay play icon.
1717
* Firefox touchstart event fix.
1818
* Compatibility change for jQuery to 1.7.0+
19-
* Adds customDirectionNav param for custom navigation controls
19+
* Adds customDirectionNav param for custom navigation controls
20+
21+
2015.11.16 - Version 2.6.0
22+
* Adds composer json file keywords
23+
* Scope fix for focused keyword
24+
* Fixes bower demo folder exclusion
25+
* z-index fix for disabled nav arrow
26+
* play/pause accessibility fix
27+
* itemMargin fix for slider items margins
28+
* Fixes accessibility for in focus elements and pagination controls
29+
* Firefox fix for text selection on slider carousel
30+
* Adds data-thumb-alt image alt attribute

composer.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"name": "woothemes/FlexSlider",
3+
"description": "An awesome, fully responsive jQuery slider toolkit.",
4+
"keywords": ["flexslider","slider","jquery","woothemes","automattic"],
5+
"homepage": "https://github.com/woothemes/FlexSlider"
6+
}

css/resets.less

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
.flex-container,
77
.flex-slider {
88

9-
a:hover,
10-
a:focus {
9+
a:hover {
1110

1211
outline: none;
1312

@@ -19,9 +18,9 @@
1918
.slides > li,
2019
.flex-control-nav,
2120
.flex-direction-nav {
22-
23-
margin: 0;
24-
padding: 0;
21+
22+
margin: 0;
23+
padding: 0;
2524
list-style: none;
2625

2726
}

0 commit comments

Comments
 (0)