Merge changes between demo site on svn and git repo.

NEOJAMS · May 22, 2015 · c6fff80 · c6fff80
1 parent 9c4e6f8
commit c6fff80
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 1 deletion.
diff --git a/demo/basic-carousel.html b/demo/basic-carousel.html
@@ -5,6 +5,9 @@
 	<title>FlexSlider 2</title>
 	<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
 
+  <!-- Syntax Highlighter -->
+  <link href="css/shCore.css" rel="stylesheet" type="text/css" />
+  <link href="css/shThemeDefault.css" rel="stylesheet" type="text/css" />
   <!-- 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" />

diff --git a/demo/basic-slider-with-custom-direction-nav.html b/demo/basic-slider-with-custom-direction-nav.html
@@ -5,6 +5,9 @@
   <title>FlexSlider 2</title>
   <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
 
+  <!-- Syntax Highlighter -->
+  <link href="css/shCore.css" rel="stylesheet" type="text/css" />
+  <link href="css/shThemeDefault.css" rel="stylesheet" type="text/css" />
   <!-- 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" />

diff --git a/demo/css/demo.css b/demo/css/demo.css
@@ -45,6 +45,20 @@ em {font-style: italic;}
 /* GEO - Regular */
  @font-face {font-family: 'Geogrotesque-Regular';src: url('../fonts/webfonts/geo-regular/eot/11014B_0.eot');src: url('../fonts/webfonts/geo-regular/eot/11014B_0.eot?#iefix') format('embedded-opentype'),url('../fonts/webfonts/geo-regular/woff/11014B_0.woff') format('woff'),url('../fonts/webfonts/geo-regular/ttf/11014B_0.ttf') format('truetype'),url('../fonts/webfonts/geo-regular/svg/11014B_0.svg#wf') format('svg');}
 
+/* Icon Fonts
+*********************************/
+/* Font-face Icons */
+@font-face {
+	font-family: 'flexslider-icon';
+	src:url('../fonts/webfonts/flexslider-icon.eot');
+	src:url('../fonts/webfonts/flexslider-icon.eot?#iefix') format('embedded-opentype'),
+		url('../fonts/webfonts/flexslider-icon.woff') format('woff'),
+		url('../fonts/webfonts/flexslider-icon.ttf') format('truetype'),
+		url('../fonts/webfonts/flexslider-icon.svg#flexslider-icon') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+
 /* General
 ***********************/
 body {

diff --git a/demo/dynamic-carousel-min-max.html b/demo/dynamic-carousel-min-max.html
@@ -5,6 +5,9 @@
 	<title>FlexSlider 2</title>
 	<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
 
+  <!-- Syntax Highlighter -->
+  <link href="css/shCore.css" rel="stylesheet" type="text/css" />
+  <link href="css/shThemeDefault.css" rel="stylesheet" type="text/css" />
   <!-- 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" />
@@ -23,7 +26,7 @@
       <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="header-nav">Other Examples</h3>
+      <h3 class="nav-header">Other Examples</h3>
       <nav>
         <ul>
           <li><a href="index.html">Basic Slider</a></li>

diff --git a/demo/index.html b/demo/index.html
@@ -5,6 +5,9 @@
 	<title>FlexSlider 2</title>
 	<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
 
+  <!-- Syntax Highlighter -->
+  <link href="css/shCore.css" rel="stylesheet" type="text/css" />
+  <link href="css/shThemeDefault.css" rel="stylesheet" type="text/css" />
   <!-- 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" />

diff --git a/demo/thumbnail-controlnav.html b/demo/thumbnail-controlnav.html
@@ -5,6 +5,9 @@
 	<title>FlexSlider 2</title>
 	<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
 
+  <!-- Syntax Highlighter -->
+  <link href="css/shCore.css" rel="stylesheet" type="text/css" />
+  <link href="css/shThemeDefault.css" rel="stylesheet" type="text/css" />
   <!-- 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" />

diff --git a/demo/thumbnail-slider.html b/demo/thumbnail-slider.html
@@ -5,6 +5,9 @@
 	<title>FlexSlider 2</title>
 	<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
 
+  <!-- Syntax Highlighter -->
+  <link href="css/shCore.css" rel="stylesheet" type="text/css" />
+  <link href="css/shThemeDefault.css" rel="stylesheet" type="text/css" />
   <!-- 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" />

diff --git a/demo/video-wistia.html b/demo/video-wistia.html
@@ -5,6 +5,9 @@
 	<title>FlexSlider 2</title>
 	<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
 
+  <!-- Syntax Highlighter -->
+  <link href="css/shCore.css" rel="stylesheet" type="text/css" />
+  <link href="css/shThemeDefault.css" rel="stylesheet" type="text/css" />
   <!-- 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" />

diff --git a/demo/video.html b/demo/video.html
@@ -5,6 +5,9 @@
 	<title>FlexSlider 2</title>
 	<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
 
+  <!-- Syntax Highlighter -->
+  <link href="css/shCore.css" rel="stylesheet" type="text/css" />
+  <link href="css/shThemeDefault.css" rel="stylesheet" type="text/css" />
   <!-- 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" />