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

Commit 745266f

Browse files
jeffikusjeffikus
committed
Merge pull request #1269 from woothemes/release-2-3-0
Closes #1266 - pauseInvisible bug, packaged for release.
2 parents 8b3766e + 58a4981 commit 745266f

File tree

6 files changed

+305
-109
lines changed

6 files changed

+305
-109
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.3.0-bleeding
3+
# FlexSlider 2.3.0
44
http://www.woothemes.com/flexslider/ - Copyright (c) 2014 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.3.0 **
23+
24+
** Fixes pauseInvisible attribute issue with Chrome and the Page Visibility API. **
25+
2226
** Version 2.2.2 **
2327

2428
** Fixes minified JavaScript file to remove merge conflicts. **

‎changelog.txt‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
FLEXSLIDER CHANGELOG
22

33
2013.02.15 - Version 2.0
4-
* Added changelog.txt
5-
4+
* Added changelog.txt
5+
66
2014.05.7 - Version 2.2.2
7-
* Added flexslider.less
7+
* Added flexslider.less
8+
9+
2015.02.11 - Version 2.3.0
10+
* Fix for pauseInvisible attribute for Chrome and the Page Visibility API

‎flexslider.css‎

Lines changed: 254 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,267 @@
11
/*
2-
* jQuery FlexSlider v2.2.0
2+
* jQuery FlexSlider v2.3.0
33
* http://www.woothemes.com/flexslider/
44
*
55
* Copyright 2012 WooThemes
66
* Free to use under the GPLv2 license.
77
* http://www.gnu.org/licenses/gpl-2.0.html
88
*
9-
* Contributing author: Tyler Smith (@mbmufffin)
9+
* Contributing author: Ville Ristimäki (@villeristi)
10+
*
1011
*/
11-
12-
13-
/* Browser Resets
14-
*********************************/
15-
.flex-container a:active,
16-
.flexslider a:active,
12+
/* ====================================================================================================================
13+
* FONT-FACE
14+
* ====================================================================================================================*/
15+
@font-face {
16+
font-family: 'flexslider-icon';
17+
src: url('fonts/flexslider-icon.eot');
18+
src: url('fonts/flexslider-icon.eot?#iefix') format('embedded-opentype'), url('fonts/flexslider-icon.woff') format('woff'), url('fonts/flexslider-icon.ttf') format('truetype'), url('fonts/flexslider-icon.svg#flexslider-icon') format('svg');
19+
font-weight: normal;
20+
font-style: normal;
21+
}
22+
/* ====================================================================================================================
23+
* RESETS
24+
* ====================================================================================================================*/
25+
.flex-container a:hover,
26+
.flex-slider a:hover,
1727
.flex-container a:focus,
18-
.flexslider a:focus {outline: none;}
28+
.flex-slider a:focus {
29+
outline: none;
30+
}
1931
.slides,
2032
.flex-control-nav,
21-
.flex-direction-nav {margin: 0; padding: 0; list-style: none;}
22-
23-
/* Icon Fonts
24-
*********************************/
25-
/* Font-face Icons */
26-
@font-face {
27-
font-family: 'flexslider-icon';
28-
src:url('fonts/flexslider-icon.eot');
29-
src:url('fonts/flexslider-icon.eot?#iefix') format('embedded-opentype'),
30-
url('fonts/flexslider-icon.woff') format('woff'),
31-
url('fonts/flexslider-icon.ttf') format('truetype'),
32-
url('fonts/flexslider-icon.svg#flexslider-icon') format('svg');
33-
font-weight: normal;
34-
font-style: normal;
35-
}
36-
37-
/* FlexSlider Necessary Styles
38-
*********************************/
39-
.flexslider {margin: 0; padding: 0;}
40-
.flexslider .slides > li {display: none; -webkit-backface-visibility: hidden;} /* Hide the slides before the JS is loaded. Avoids image jumping */
41-
.flexslider .slides img {width: 100%; display: block;}
42-
.flex-pauseplay span {text-transform: capitalize;}
43-
44-
/* Clearfix for the .slides element */
45-
.slides:after {content: "."; display: block; clear: both; visibility: hidden; line-height: 0; height: 0;}
46-
html[xmlns] .slides {display: block;}
47-
* html .slides {height: 1%;}
48-
49-
/* No JavaScript Fallback */
50-
/* If you are not using another script, such as Modernizr, make sure you
51-
* include js that eliminates this class on page load */
52-
.no-js .slides > li:first-child {display: block;}
53-
54-
/* FlexSlider Default Theme
55-
*********************************/
56-
.flexslider { margin: 0 0 60px; background: #fff; border: 4px solid #fff; position: relative; -webkit-border-radius: 4px; -moz-border-radius: 4px; -o-border-radius: 4px; border-radius: 4px; -webkit-box-shadow: 0 1px 4px rgba(0,0,0,.2); -moz-box-shadow: 0 1px 4px rgba(0,0,0,.2); -o-box-shadow: 0 1px 4px rgba(0,0,0,.2); box-shadow: 0 1px 4px rgba(0,0,0,.2); zoom: 1; }
57-
.flex-viewport { max-height: 2000px; -webkit-transition: all 1s ease; -moz-transition: all 1s ease; -o-transition: all 1s ease; transition: all 1s ease; }
58-
.loading .flex-viewport { max-height: 300px; }
59-
.flexslider .slides { zoom: 1; }
60-
.carousel li { margin-right: 5px; }
61-
62-
/* Direction Nav */
63-
.flex-direction-nav {*height: 0;}
64-
.flex-direction-nav a { text-decoration:none; display: block; width: 40px; height: 40px; margin: -20px 0 0; position: absolute; top: 50%; z-index: 10; overflow: hidden; opacity: 0; cursor: pointer; color: rgba(0,0,0,0.8); text-shadow: 1px 1px 0 rgba(255,255,255,0.3); -webkit-transition: all .3s ease; -moz-transition: all .3s ease; transition: all .3s ease; }
65-
.flex-direction-nav .flex-prev { left: -50px; }
66-
.flex-direction-nav .flex-next { right: -50px; text-align: right; }
67-
.flexslider:hover .flex-prev { opacity: 0.7; left: 10px; }
68-
.flexslider:hover .flex-next { opacity: 0.7; right: 10px; }
69-
.flexslider:hover .flex-next:hover, .flexslider:hover .flex-prev:hover { opacity: 1; }
70-
.flex-direction-nav .flex-disabled { opacity: 0!important; filter:alpha(opacity=0); cursor: default; }
71-
.flex-direction-nav a:before { font-family: "flexslider-icon"; font-size: 40px; line-height:1; display: inline-block; content: '\f001'; }
72-
.flex-direction-nav a.flex-next:before { content: '\f002'; }
73-
74-
/* Pause/Play */
75-
.flex-pauseplay a { display: block; width: 20px; height: 20px; position: absolute; bottom: 5px; left: 10px; opacity: 0.8; z-index: 10; overflow: hidden; cursor: pointer; color: #000; }
76-
.flex-pauseplay a:before { font-family: "flexslider-icon"; font-size: 20px; display: inline-block; content: '\f004'; }
77-
.flex-pauseplay a:hover { opacity: 1; }
78-
.flex-pauseplay a.flex-play:before { content: '\f003'; }
79-
80-
/* Control Nav */
81-
.flex-control-nav {width: 100%; position: absolute; bottom: -40px; text-align: center;}
82-
.flex-control-nav li {margin: 0 6px; display: inline-block; zoom: 1; *display: inline;}
83-
.flex-control-paging li a {width: 11px; height: 11px; display: block; background: #666; background: rgba(0,0,0,0.5); cursor: pointer; text-indent: -9999px; -webkit-border-radius: 20px; -moz-border-radius: 20px; -o-border-radius: 20px; border-radius: 20px; -webkit-box-shadow: inset 0 0 3px rgba(0,0,0,0.3); -moz-box-shadow: inset 0 0 3px rgba(0,0,0,0.3); -o-box-shadow: inset 0 0 3px rgba(0,0,0,0.3); box-shadow: inset 0 0 3px rgba(0,0,0,0.3); }
84-
.flex-control-paging li a:hover { background: #333; background: rgba(0,0,0,0.7); }
85-
.flex-control-paging li a.flex-active { background: #000; background: rgba(0,0,0,0.9); cursor: default; }
86-
87-
.flex-control-thumbs {margin: 5px 0 0; position: static; overflow: hidden;}
88-
.flex-control-thumbs li {width: 25%; float: left; margin: 0;}
89-
.flex-control-thumbs img {width: 100%; display: block; opacity: .7; cursor: pointer;}
90-
.flex-control-thumbs img:hover {opacity: 1;}
91-
.flex-control-thumbs .flex-active {opacity: 1; cursor: default;}
92-
33+
.flex-direction-nav {
34+
margin: 0;
35+
padding: 0;
36+
list-style: none;
37+
}
38+
.flex-pauseplay span {
39+
text-transform: capitalize;
40+
}
41+
/* ====================================================================================================================
42+
* BASE STYLES
43+
* ====================================================================================================================*/
44+
.flexslider {
45+
margin: 0;
46+
padding: 0;
47+
}
48+
.flexslider .slides > li {
49+
display: none;
50+
-webkit-backface-visibility: hidden;
51+
}
52+
.flexslider .slides img {
53+
width: 100%;
54+
display: block;
55+
}
56+
.flexslider .slides:after {
57+
content: "\0020";
58+
display: block;
59+
clear: both;
60+
visibility: hidden;
61+
line-height: 0;
62+
height: 0;
63+
}
64+
html[xmlns] .flexslider .slides {
65+
display: block;
66+
}
67+
* html .flexslider .slides {
68+
height: 1%;
69+
}
70+
.no-js .flexslider .slides > li:first-child {
71+
display: block;
72+
}
73+
/* ====================================================================================================================
74+
* DEFAULT THEME
75+
* ====================================================================================================================*/
76+
.flexslider {
77+
margin: 0 0 60px;
78+
background: #fff;
79+
border: 4px solid #fff;
80+
position: relative;
81+
zoom: 1;
82+
-webkit-border-radius: 4px;
83+
-moz-border-radius: 4px;
84+
border-radius: 4px;
85+
-webkit-box-shadow: '' 0 1px 4px rgba(0, 0, 0, 0.2);
86+
-moz-box-shadow: '' 0 1px 4px rgba(0, 0, 0, 0.2);
87+
-o-box-shadow: '' 0 1px 4px rgba(0, 0, 0, 0.2);
88+
box-shadow: '' 0 1px 4px rgba(0, 0, 0, 0.2);
89+
}
90+
.flexslider .slides {
91+
zoom: 1;
92+
}
93+
.flex-viewport {
94+
max-height: 2000px;
95+
-webkit-transition: all 1s ease;
96+
-moz-transition: all 1s ease;
97+
-ms-transition: all 1s ease;
98+
-o-transition: all 1s ease;
99+
transition: all 1s ease;
100+
}
101+
.loading .flex-viewport {
102+
max-height: 300px;
103+
}
104+
.carousel li {
105+
margin-right: 5px;
106+
}
107+
.flex-direction-nav {
108+
*height: 0;
109+
}
110+
.flex-direction-nav a {
111+
text-decoration: none;
112+
display: block;
113+
width: 40px;
114+
height: 40px;
115+
margin: -20px 0 0;
116+
position: absolute;
117+
top: 50%;
118+
z-index: 10;
119+
overflow: hidden;
120+
opacity: 0;
121+
cursor: pointer;
122+
color: rgba(0, 0, 0, 0.8);
123+
text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.3);
124+
-webkit-transition: all 0.3s ease-in-out;
125+
-moz-transition: all 0.3s ease-in-out;
126+
-ms-transition: all 0.3s ease-in-out;
127+
-o-transition: all 0.3s ease-in-out;
128+
transition: all 0.3s ease-in-out;
129+
}
130+
.flex-direction-nav a:before {
131+
font-family: "flexslider-icon";
132+
font-size: 40px;
133+
display: inline-block;
134+
content: '\f001';
135+
}
136+
.flex-direction-nav a.flex-next:before {
137+
content: '\f002';
138+
}
139+
.flex-direction-nav .flex-prev {
140+
left: -50px;
141+
}
142+
.flex-direction-nav .flex-next {
143+
right: -50px;
144+
text-align: right;
145+
}
146+
.flexslider:hover .flex-direction-nav .flex-prev {
147+
opacity: 0.7;
148+
left: 10px;
149+
}
150+
.flexslider:hover .flex-direction-nav .flex-prev:hover {
151+
opacity: 1;
152+
}
153+
.flexslider:hover .flex-direction-nav .flex-next {
154+
opacity: 0.7;
155+
right: 10px;
156+
}
157+
.flexslider:hover .flex-direction-nav .flex-next:hover {
158+
opacity: 1;
159+
}
160+
.flex-direction-nav .flex-disabled {
161+
opacity: 0!important;
162+
filter: alpha(opacity=0);
163+
cursor: default;
164+
}
165+
.flex-pauseplay a {
166+
display: block;
167+
width: 20px;
168+
height: 20px;
169+
position: absolute;
170+
bottom: 5px;
171+
left: 10px;
172+
opacity: 0.8;
173+
z-index: 10;
174+
overflow: hidden;
175+
cursor: pointer;
176+
color: #000;
177+
}
178+
.flex-pauseplay a:before {
179+
font-family: "flexslider-icon";
180+
font-size: 20px;
181+
display: inline-block;
182+
content: '\f004';
183+
}
184+
.flex-pauseplay a:hover {
185+
opacity: 1;
186+
}
187+
.flex-pauseplay a .flex-play:before {
188+
content: '\f003';
189+
}
190+
.flex-control-nav {
191+
width: 100%;
192+
position: absolute;
193+
bottom: -40px;
194+
text-align: center;
195+
}
196+
.flex-control-nav li {
197+
margin: 0 6px;
198+
display: inline-block;
199+
zoom: 1;
200+
*display: inline;
201+
}
202+
.flex-control-paging li a {
203+
width: 11px;
204+
height: 11px;
205+
display: block;
206+
background: #666;
207+
background: rgba(0, 0, 0, 0.5);
208+
cursor: pointer;
209+
text-indent: -9999px;
210+
-webkit-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.3);
211+
-moz-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.3);
212+
-o-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.3);
213+
box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.3);
214+
-webkit-border-radius: 20px;
215+
-moz-border-radius: 20px;
216+
border-radius: 20px;
217+
}
218+
.flex-control-paging li a:hover {
219+
background: #333;
220+
background: rgba(0, 0, 0, 0.7);
221+
}
222+
.flex-control-paging li a.flex-active {
223+
background: #000;
224+
background: rgba(0, 0, 0, 0.9);
225+
cursor: default;
226+
}
227+
.flex-control-thumbs {
228+
margin: 5px 0 0;
229+
position: static;
230+
overflow: hidden;
231+
}
232+
.flex-control-thumbs li {
233+
width: 25%;
234+
float: left;
235+
margin: 0;
236+
}
237+
.flex-control-thumbs img {
238+
width: 100%;
239+
display: block;
240+
opacity: .7;
241+
cursor: pointer;
242+
-webkit-transition: all 1s ease;
243+
-moz-transition: all 1s ease;
244+
-ms-transition: all 1s ease;
245+
-o-transition: all 1s ease;
246+
transition: all 1s ease;
247+
}
248+
.flex-control-thumbs img:hover {
249+
opacity: 1;
250+
}
251+
.flex-control-thumbs .flex-active {
252+
opacity: 1;
253+
cursor: default;
254+
}
255+
/* ====================================================================================================================
256+
* RESPONSIVE
257+
* ====================================================================================================================*/
93258
@media screen and (max-width: 860px) {
94-
.flex-direction-nav .flex-prev { opacity: 1; left: 10px;}
95-
.flex-direction-nav .flex-next { opacity: 1; right: 10px;}
259+
.flex-direction-nav .flex-prev {
260+
opacity: 1;
261+
left: 10px;
262+
}
263+
.flex-direction-nav .flex-next {
264+
opacity: 1;
265+
right: 10px;
266+
}
96267
}

‎flexslider.less‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery FlexSlider v2.2.0
2+
* jQuery FlexSlider v2.3.0
33
* http://www.woothemes.com/flexslider/
44
*
55
* Copyright 2012 WooThemes

‎jquery.flexslider-min.js‎

Lines changed: 1 addition & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)