-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1338 from woothemes/release-2-5-0
Release 2 5 0
- Loading branch information
Showing
16 changed files
with
239 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -200,7 +200,7 @@ | |
|
|
||
| } | ||
|
|
||
| .flex-play:before { | ||
| &.flex-play:before { | ||
|
|
||
| content: @flex-pauseplay-icon-play; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,183 @@ | ||
| <!DOCTYPE html> | ||
| <html class="no-js" lang="en"> | ||
| <head> | ||
| <meta content="charset=utf-8"> | ||
| <title>FlexSlider 2</title> | ||
| <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"> | ||
|
|
||
| <!-- Demo CSS --> | ||
| <link rel="stylesheet" href="css/demo.css" type="text/css" media="screen" /> | ||
| <link rel="stylesheet" href="../flexslider.css" type="text/css" media="screen" /> | ||
|
|
||
| <!-- Modernizr --> | ||
| <script src="js/modernizr.js"></script> | ||
|
|
||
| <style> | ||
| .flexslider { | ||
| margin-bottom: 10px; | ||
| } | ||
|
|
||
| .flex-control-nav { | ||
| position: relative; | ||
| bottom: auto; | ||
| } | ||
|
|
||
| .custom-navigation { | ||
| display: table; | ||
| width: 100%; | ||
| table-layout: fixed; | ||
| } | ||
|
|
||
| .custom-navigation > * { | ||
| display: table-cell; | ||
| } | ||
|
|
||
| .custom-navigation > a { | ||
| width: 50px; | ||
| } | ||
|
|
||
| .custom-navigation .flex-next { | ||
| text-align: right; | ||
| } | ||
| </style> | ||
|
|
||
| </head> | ||
| <body class="loading"> | ||
|
|
||
| <div id="container" class="cf"> | ||
| <header role="navigation"> | ||
| <a class="logo" href="http://www.woothemes.com" title="WooThemes"> | ||
| <img src="images/logo.png" alt="WooThemes" /> | ||
| </a> | ||
| <h1>FlexSlider 2</h1> | ||
| <h2>The best responsive slider. Period.</h2> | ||
| <a class="button green" href="https://github.com/woothemes/FlexSlider/zipball/master">Download Flexslider</a> | ||
| <h3 class="nav-header">Other Examples</h3> | ||
| <nav> | ||
| <ul> | ||
| <li><a href="index.html">Basic Slider</a></li> | ||
| <li class="active"><a href="basic-slider-with-custom-direction-nav.html">Basic Slider customDirectionNav</a></li> | ||
| <li><a href="thumbnail-controlnav.html">Slider w/thumbnail controlNav pattern</a></li> | ||
| <li><a href="thumbnail-slider.html">Slider w/thumbnail slider</a></li> | ||
| <li><a href="basic-carousel.html">Basic Carousel</a></li> | ||
| <li><a href="carousel-min-max.html">Carousel with min and max ranges</a></li> | ||
| <li><a href="dynamic-carousel-min-max.html">Carousel with dynamic min/max ranges</a></li> | ||
| <li><a href="video.html">Video & the api (vimeo)</a></li> | ||
| <li><a href="video-wistia.html">Video & the api (wistia)</a></li> | ||
| </ul> | ||
| </nav> | ||
| </header> | ||
|
|
||
| <div id="main" role="main"> | ||
|
|
||
| <section class="slider"> | ||
| <div class="flexslider"> | ||
| <ul class="slides"> | ||
| <li> | ||
| <img src="images/kitchen_adventurer_cheesecake_brownie.jpg" /> | ||
| </li> | ||
| <li> | ||
| <img src="images/kitchen_adventurer_lemon.jpg" /> | ||
| </li> | ||
| <li> | ||
| <img src="images/kitchen_adventurer_donut.jpg" /> | ||
| </li> | ||
| <li> | ||
| <img src="images/kitchen_adventurer_caramel.jpg" /> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| <div class="custom-navigation"> | ||
| <a href="#" class="flex-prev">Prev</a> | ||
| <div class="custom-controls-container"></div> | ||
| <a href="#" class="flex-next">Next</a> | ||
| </div> | ||
| </section> | ||
|
|
||
| <aside> | ||
| <div class="cf"> | ||
| <h3>Basic Slider</h3> | ||
| <ul class="toggle cf"> | ||
| <li class="js"><a href="#view-js">JS</a></li> | ||
| <li class="html"><a href="#view-html">HTML</a></li> | ||
| </ul> | ||
| </div> | ||
| <div id="view-js" class="code"> | ||
| <pre class="brush: js; toolbar: false; gutter: false;"> | ||
| // Can also be used with $(document).ready() | ||
| $(window).load(function() { | ||
| $('.flexslider').flexslider({ | ||
| animation: "slide", | ||
| controlsContainer: $(".custom-controls-container"), | ||
| customDirectionNav: $(".custom-navigation a") | ||
| }); | ||
| }); | ||
| </pre> | ||
| </div> | ||
| <div id="view-html" class="code"> | ||
| <pre class="brush: xml; toolbar: false; gutter: false;"> | ||
| <!-- Place somewhere in the <body> of your page --> | ||
| <div class="flexslider"> | ||
| <ul class="slides"> | ||
| <li> | ||
| <img src="slide1.jpg" /> | ||
| </li> | ||
| <li> | ||
| <img src="slide2.jpg" /> | ||
| </li> | ||
| <li> | ||
| <img src="slide3.jpg" /> | ||
| </li> | ||
| <li> | ||
| <img src="slide4.jpg" /> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| <div class="custom-navigation"> | ||
| <a href="#" class="flex-prev">Prev</a> | ||
| <div class="custom-controls-container"></div> | ||
| <a href="#" class="flex-next">Next</a> | ||
| </div> | ||
| </pre> | ||
| </div> | ||
| </aside> | ||
| </div> | ||
|
|
||
| </div> | ||
|
|
||
| <!-- jQuery --> | ||
| <script src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script> | ||
| <script>window.jQuery || document.write('<script src="js/libs/jquery-1.7.min.js">\x3C/script>')</script> | ||
|
|
||
| <!-- FlexSlider --> | ||
| <script defer src="../jquery.flexslider.js"></script> | ||
|
|
||
| <script type="text/javascript"> | ||
| $(function(){ | ||
| SyntaxHighlighter.all(); | ||
| }); | ||
| $(window).load(function(){ | ||
| $('.flexslider').flexslider({ | ||
| animation: "slide", | ||
| controlsContainer: $(".custom-controls-container"), | ||
| customDirectionNav: $(".custom-navigation a"), | ||
| start: function(slider){ | ||
| $('body').removeClass('loading'); | ||
| } | ||
| }); | ||
| }); | ||
| </script> | ||
|
|
||
|
|
||
| <!-- Syntax Highlighter --> | ||
| <script type="text/javascript" src="js/shCore.js"></script> | ||
| <script type="text/javascript" src="js/shBrushXml.js"></script> | ||
| <script type="text/javascript" src="js/shBrushJScript.js"></script> | ||
|
|
||
| <!-- Optional FlexSlider Additions --> | ||
| <script src="js/jquery.easing.js"></script> | ||
| <script src="js/jquery.mousewheel.js"></script> | ||
| <script defer src="js/demo.js"></script> | ||
|
|
||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.