Black slide bg & transition delay

jakearchibald · Mar 26, 2013 · 9481ce0 · 9481ce0
1 parent 02edfb8
commit 9481ce0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/css/_slide.scss b/css/_slide.scss
@@ -17,6 +17,10 @@
 		background: #fff;
 	}
 
+	&.black {
+		background: #000;
+	}
+
 	&.scrap-paper {
 		background: url('imgs/slide/scrap-paper.jpg');
 		@include hd {

diff --git a/css/all.css b/css/all.css
@@ -251,10 +251,13 @@ label, input[type="button"], input[type="submit"], input[type="image"], button {
   .slide.white {
     background: #fff; }
   /* line 20, _slide.scss */
+  .slide.black {
+    background: #000; }
+  /* line 24, _slide.scss */
   .slide.scrap-paper {
     background: url("imgs/slide/scrap-paper.jpg"); }
     @media screen and (min-width: 1900px) {
-      /* line 20, _slide.scss */
+      /* line 24, _slide.scss */
       .slide.scrap-paper {
         background: url("imgs/slide/scrap-paper@hd.jpg"); } }
 

diff --git a/js/jquery.transition.js b/js/jquery.transition.js
@@ -100,7 +100,8 @@
 		opts = $.extend({
 			duration: 500,
 			easing: 'swing',
-			complete: $.noop
+			complete: $.noop,
+			delay: 0
 		}, opts || {});
 
 		var translatedProps = {},
@@ -132,7 +133,7 @@
 			$elm[0].offsetWidth;
 
 			$elm.bind(transitionend, complete)
-				.css( transitionProp, 'all ' + (+opts.duration/1000) + 's ' + (easings[opts.easing] || opts.easing) )
+				.css( transitionProp, 'all ' + (+opts.duration/1000) + 's ' + (easings[opts.easing] || opts.easing) + ' ' + (opts.delay/1000) + 's' )
 				.vendorCss('transition-property', propsStr);
 
 			$elm.css(translatedProps);