New version without touch lib

leandrowd · Mar 11, 2015 · 5d7f735 · 5d7f735
1 parent 1a487cd
commit 5d7f735
Show file tree

Hide file tree

Showing 10 changed files with 2,802 additions and 778 deletions.
diff --git a/dev/carousel.css b/dev/carousel.css
@@ -251,23 +251,17 @@ button {
     list-style: none;
     overflow: hidden;
     white-space: nowrap; }
+    .carousel .slider.swiping {
+      -webkit-transition: none 0 ease-in;
+      -moz-transition: none 0 ease-in;
+      -ms-transition: none 0 ease-in;
+      -o-transition: none 0 ease-in;
+      transition: none 0 ease-in; }
   .carousel .slide {
-    -webkit-transition: border 0.25s ease-in;
-    -moz-transition: border 0.25s ease-in;
-    -ms-transition: border 0.25s ease-in;
-    -o-transition: border 0.25s ease-in;
-    transition: border 0.25s ease-in;
     display: inline-block;
     width: 260px;
     margin: 0px;
     white-space: nowrap; }
-    @media (min-width: 768px) {
-      .carousel .slide {
-        -webkit-transition: border 0.15s ease-in;
-        -moz-transition: border 0.15s ease-in;
-        -ms-transition: border 0.15s ease-in;
-        -o-transition: border 0.15s ease-in;
-        transition: border 0.15s ease-in; } }
     .carousel .slide img {
       vertical-align: top; }
   .carousel .control-dots {

diff --git a/dev/carousel.html b/dev/carousel.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8"/>
+	    <meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="stylesheet" href="main.css"/>
+		<link rel="stylesheet" href="imageGallery.css"/>
+		<link rel="stylesheet" href="carousel.css"/>
+		<link href='http://fonts.googleapis.com/css?family=Roboto:100,700,400' rel='stylesheet' type='text/css'>
+	</head>
+	<body>
+		<div class="wrapper">
+			<h1>React Responsive Carousel (WIP)</h1>
+			<article class="demo">
+				<h3 id="slider">Slider with controls</h3>
+				<div class="demo-slider-controls"></div>
+			</article>
+		</div>
+		<script src="es5-shim.min.js"></script>
+		<script src="main.js"></script>
+	</body>
+</html>