CSS cruft cleanup, update jQuery

imakewebthings · imakewebthings · commit 0ddb1b25d0fe · 2013-11-08T11:12:21.000-08:00
diff --git a/boilerplate.html b/boilerplate.html
@@ -77,7 +77,7 @@ <h1>Here</h1>
 	</div>
 
 <!-- Required JS files. -->
-<script src="jquery-1.7.2.min.js"></script>
+<script src="jquery.min.js"></script>
 <script src="core/deck.core.js"></script>
 
 <!-- Extension JS files. Add or remove as needed. -->
diff --git a/extensions/goto/deck.goto.css b/extensions/goto/deck.goto.css
@@ -1,4 +1,4 @@
-.deck-container .goto-form {
+.goto-form {
   position: absolute;
   z-index: 3;
   bottom: 10px;
@@ -10,20 +10,15 @@
   display: none;
   background: #ccc;
   overflow: hidden;
-}
-.borderradius .deck-container .goto-form {
-  -webkit-border-radius: 10px;
-  -moz-border-radius: 10px;
   border-radius: 10px;
 }
-.deck-container .goto-form label {
+.goto-form label {
   font-weight: bold;
 }
-.deck-container .goto-form label, .deck-container .goto-form input {
+.goto-form label, .goto-form input {
   display: inline-block;
   font-family: inherit;
 }
-
 .deck-goto .goto-form {
   display: block;
 }
@@ -36,6 +31,6 @@
 
 @media print {
   .goto-form, #goto-slide {
-    display: none !important;
+    display: none;
   }
 }
diff --git a/extensions/goto/deck.goto.scss b/extensions/goto/deck.goto.scss
@@ -1,36 +1,29 @@
-.deck-container {	
-	.goto-form {
-		position:absolute;
-		z-index:3;
-		bottom:10px;
-		left:50%;
-		height:1.75em;
-		margin:0 0 0 -9.125em;
-		line-height:1.75em;
-		padding:0.625em;
-		display:none;
-		background:#ccc;
-		overflow:hidden;
-	
-		.borderradius & {
-			-webkit-border-radius:10px;
-			-moz-border-radius:10px;
-			border-radius:10px;
-		}
-	
-		label {
-			font-weight:bold;
-		}
-	
-		label, input {
-			display:inline-block;
-			font-family:inherit;
-		}
+.goto-form {
+	position:absolute;
+	z-index:3;
+	bottom:10px;
+	left:50%;
+	height:1.75em;
+	margin:0 0 0 -9.125em;
+	line-height:1.75em;
+	padding:0.625em;
+	display:none;
+	background:#ccc;
+	overflow:hidden;
+	border-radius:10px;
+
+	label {
+		font-weight:bold;
 	}
-}
 
-.deck-goto .goto-form {
-	display:block;
+	label, input {
+		display:inline-block;
+		font-family:inherit;
+	}
+
+	.deck-goto & {
+		display:block;
+	}
 }
 
 #goto-slide {
@@ -41,6 +34,6 @@
 
 @media print {
 	.goto-form, #goto-slide {
-		display:none !important;
+		display:none;
 	}
 }
diff --git a/extensions/hash/deck.hash.css b/extensions/hash/deck.hash.css
@@ -1,4 +1,4 @@
-.deck-container .deck-permalink {
+.deck-permalink {
   display: none;
   position: absolute;
   z-index: 4;
diff --git a/extensions/hash/deck.hash.scss b/extensions/hash/deck.hash.scss
@@ -1,13 +1,11 @@
-.deck-container {
-	.deck-permalink {
-		display:none;
-		position:absolute;
-		z-index:4;
-		bottom:30px;
-		right:0;
-		width:48px;
-		text-align:center;
-	}
+.deck-permalink {
+	display:none;
+	position:absolute;
+	z-index:4;
+	bottom:30px;
+	right:0;
+	width:48px;
+	text-align:center;
 }
 
 .no-history .deck-container:hover .deck-permalink {
diff --git a/extensions/menu/deck.menu.css b/extensions/menu/deck.menu.css
@@ -22,16 +22,11 @@
 }
 .csstransforms .deck-menu > .slide {
   -webkit-transform: scale(0.22) !important;
-  -moz-transform: scale(0.22) !important;
-  -o-transform: scale(0.22) !important;
   -ms-transform: scale(0.22) !important;
   transform: scale(0.22) !important;
   -webkit-transform-origin: 0 0;
-  -moz-transform-origin: 0 0;
-  -o-transform-origin: 0 0;
   -ms-transform-origin: 0 0;
   transform-origin: 0 0;
-  -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
   width: 100%;
diff --git a/extensions/menu/deck.menu.scss b/extensions/menu/deck.menu.scss
@@ -26,16 +26,11 @@
 
 		.csstransforms & {
 			-webkit-transform:scale(.22) !important;
-			-moz-transform:scale(.22) !important;
-			-o-transform:scale(.22) !important;
 			-ms-transform:scale(.22) !important;
 			transform:scale(.22) !important;
 			-webkit-transform-origin:0 0;
-			-moz-transform-origin:0 0;
-			-o-transform-origin:0 0;
 			-ms-transform-origin:0 0;
 			transform-origin:0 0;
-			-webkit-box-sizing: border-box;
 			-moz-box-sizing: border-box;
 			box-sizing: border-box;
 			width:100%;
diff --git a/extensions/navigation/deck.navigation.css b/extensions/navigation/deck.navigation.css
@@ -1,4 +1,4 @@
-.deck-container .deck-prev-link, .deck-container .deck-next-link {
+.deck-prev-link, .deck-next-link {
   display: none;
   position: absolute;
   z-index: 3;
@@ -14,21 +14,20 @@
   text-decoration: none;
   color: #fff;
   background: #888;
-}
-.borderradius .deck-container .deck-prev-link, .borderradius .deck-container .deck-next-link {
-  -webkit-border-radius: 16px;
-  -moz-border-radius: 16px;
   border-radius: 16px;
 }
-.deck-container .deck-prev-link:hover, .deck-container .deck-prev-link:focus, .deck-container .deck-prev-link:active, .deck-container .deck-prev-link:visited, .deck-container .deck-next-link:hover, .deck-container .deck-next-link:focus, .deck-container .deck-next-link:active, .deck-container .deck-next-link:visited {
+.deck-prev-link:hover, .deck-prev-link:focus, .deck-prev-link:active, .deck-prev-link:visited, .deck-next-link:hover, .deck-next-link:focus, .deck-next-link:active, .deck-next-link:visited {
   color: #fff;
 }
-.deck-container .deck-prev-link {
+
+.deck-prev-link {
   left: 8px;
 }
-.deck-container .deck-next-link {
+
+.deck-next-link {
   right: 8px;
 }
+
 .deck-container:hover .deck-prev-link, .deck-container:hover .deck-next-link {
   display: block;
 }
diff --git a/extensions/navigation/deck.navigation.scss b/extensions/navigation/deck.navigation.scss
@@ -1,54 +1,42 @@
-@mixin border-radius($r) {
-	-webkit-border-radius:$r;
-	-moz-border-radius:$r;
-	border-radius:$r;
-}
-
-.deck-container {
-	.deck-prev-link, .deck-next-link {
-		display:none;
-		position:absolute;
-		z-index:3;
-		top:50%;
-		width:32px;
-		height:32px;
-		margin-top:-16px;
-		font-size:20px;
-		font-weight:bold;
-		line-height:32px;
-		vertical-align:middle;
-		text-align:center;
-		text-decoration:none;
+.deck-prev-link, .deck-next-link {
+	display:none;
+	position:absolute;
+	z-index:3;
+	top:50%;
+	width:32px;
+	height:32px;
+	margin-top:-16px;
+	font-size:20px;
+	font-weight:bold;
+	line-height:32px;
+	vertical-align:middle;
+	text-align:center;
+	text-decoration:none;
+	color:#fff;
+	background:#888;
+	border-radius:16px;
+
+	&:hover, &:focus, &:active, &:visited {
 		color:#fff;
-		background:#888;
-
-		.borderradius & {
-			@include border-radius(16px);
-		}
-
-		&:hover, &:focus, &:active, &:visited {
-			color:#fff;
-		}
 	}
+}
 
-	.deck-prev-link {
-		left:8px;
-	}
+.deck-prev-link {
+	left:8px;
+}
 
-	.deck-next-link {
-		right:8px;
-	}
-	
-	&:hover .deck-prev-link, &:hover .deck-next-link {
-		display:block;
+.deck-next-link {
+	right:8px;
+}
 
-		&.deck-nav-disabled, .touch & {
-			display:none;
-		}
+.deck-container:hover .deck-prev-link, .deck-container:hover .deck-next-link {
+	display:block;
+
+	&.deck-nav-disabled, .touch & {
+		display:none;
 	}
 }
 
-
 @media print {
 	.deck-prev-link, .deck-next-link {
 		display:none !important;
diff --git a/extensions/scale/deck.scale.css b/extensions/scale/deck.scale.css
@@ -8,24 +8,19 @@ using the scale extension. */
   overflow: hidden;
 }
 .csstransforms .deck-container.deck-scale:not(.deck-menu) > .slide {
-  -webkit-box-sizing: padding-box;
   -moz-box-sizing: padding-box;
   box-sizing: padding-box;
   width: 100%;
   padding-bottom: 20px;
 }
 .csstransforms .deck-container.deck-scale:not(.deck-menu) > .slide > .deck-slide-scaler {
   -webkit-transform-origin: 50% 0;
-  -moz-transform-origin: 50% 0;
-  -o-transform-origin: 50% 0;
   -ms-transform-origin: 50% 0;
   transform-origin: 50% 0;
 }
 
 .csstransforms .deck-container.deck-menu .deck-slide-scaler {
   -webkit-transform: none !important;
-  -moz-transform: none !important;
-  -o-transform: none !important;
   -ms-transform: none !important;
   transform: none !important;
 }
diff --git a/extensions/scale/deck.scale.js b/extensions/scale/deck.scale.js
@@ -39,15 +39,13 @@ works fine.
 			scale = $container.hasClass(opts.classes.scale) ?
 				baseHeight / slideHeight :
 				1;
-			
-			$.each('Webkit Moz O ms Khtml'.split(' '), function(i, prefix) {
-				if (scale === 1) {
-					$scaler.css(prefix + 'Transform', '');
-				}
-				else {
-					$scaler.css(prefix + 'Transform', 'scale(' + scale + ')');
-				}
-			});
+
+			if (scale === 1) {
+				$scaler.css('transform', '');
+			}
+			else {
+				$scaler.css('transform', 'scale(' + scale + ')');
+			}
 		});
 	}
 
@@ -57,7 +55,7 @@ works fine.
 	options.classes.scale
 		This class is added to the deck container when scaling is enabled.
 		It is enabled by default when the module is included.
-	
+
 	options.classes.scaleSlideWrapper
 		Scaling is done using a wrapper around the contents of each slide. This
 		class is applied to that wrapper.
@@ -133,15 +131,15 @@ works fine.
 		], function(el, i) {
 			return '.' + el;
 		}).join(', ');
-		
+
 		// Build top level slides array
 		rootSlides = [];
 		$.each($[deck]('getSlides'), function(i, $el) {
 			if (!$el.parentsUntil(opts.selectors.container, slideTest).length) {
 				rootSlides.push($el);
 			}
 		});
-		
+
 		// Use a wrapper on each slide to handle content scaling
 		$.each(rootSlides, function(i, $slide) {
 			$slide.children().wrapAll('<div class="' + opts.classes.scaleSlideWrapper + '"/>');
diff --git a/extensions/scale/deck.scale.scss b/extensions/scale/deck.scale.scss
@@ -8,16 +8,13 @@ using the scale extension. */
 	overflow:hidden;
 
 	> .slide {
-		-webkit-box-sizing: padding-box;
 		-moz-box-sizing: padding-box;
 		box-sizing: padding-box;
 		width:100%;
 		padding-bottom:20px;
 
 		> .deck-slide-scaler {
 			-webkit-transform-origin: 50% 0;
-			-moz-transform-origin: 50% 0;
-			-o-transform-origin: 50% 0;
 			-ms-transform-origin: 50% 0;
 			transform-origin: 50% 0;
 		}
@@ -26,8 +23,6 @@ using the scale extension. */
 
 .csstransforms .deck-container.deck-menu .deck-slide-scaler {
 	-webkit-transform:none !important;
-	-moz-transform:none !important;
-	-o-transform:none !important;
 	-ms-transform:none !important;
 	transform:none !important;
 }
diff --git a/extensions/status/deck.status.css b/extensions/status/deck.status.css
diff --git a/extensions/status/deck.status.scss b/extensions/status/deck.status.scss
diff --git a/introduction/index.html b/introduction/index.html
diff --git a/jquery-1.7.2.min.js b/jquery-1.7.2.min.js
diff --git a/jquery.min.js b/jquery.min.js

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-.deck-container .goto-form {`
	`1`	`+.goto-form {`
`2`	`2`	`position: absolute;`
`3`	`3`	`z-index: 3;`
`4`	`4`	`bottom: 10px;`
`@@ -10,20 +10,15 @@`
`10`	`10`	`display: none;`
`11`	`11`	`background: #ccc;`
`12`	`12`	`overflow: hidden;`
`13`		`-}`
`14`		`-.borderradius .deck-container .goto-form {`
`15`		`- -webkit-border-radius: 10px;`
`16`		`- -moz-border-radius: 10px;`
`17`	`13`	`border-radius: 10px;`
`18`	`14`	`}`
`19`		`-.deck-container .goto-form label {`
	`15`	`+.goto-form label {`
`20`	`16`	`font-weight: bold;`
`21`	`17`	`}`
`22`		`-.deck-container .goto-form label, .deck-container .goto-form input {`
	`18`	`+.goto-form label, .goto-form input {`
`23`	`19`	`display: inline-block;`
`24`	`20`	`font-family: inherit;`
`25`	`21`	`}`
`26`		`-`
`27`	`22`	`.deck-goto .goto-form {`
`28`	`23`	`display: block;`
`29`	`24`	`}`
`@@ -36,6 +31,6 @@`
`36`	`31`
`37`	`32`	`@media print {`
`38`	`33`	`.goto-form, #goto-slide {`
`39`		`- display: none !important;`
	`34`	`+ display: none;`
`40`	`35`	`}`
`41`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-.deck-container .deck-permalink {`
	`1`	`+.deck-permalink {`
`2`	`2`	`display: none;`
`3`	`3`	`position: absolute;`
`4`	`4`	`z-index: 4;`
Original file line number	Diff line number	Diff line change
`@@ -8,24 +8,19 @@ using the scale extension. */`
`8`	`8`	`overflow: hidden;`
`9`	`9`	`}`
`10`	`10`	`.csstransforms .deck-container.deck-scale:not(.deck-menu) > .slide {`
`11`		`- -webkit-box-sizing: padding-box;`
`12`	`11`	`-moz-box-sizing: padding-box;`
`13`	`12`	`box-sizing: padding-box;`
`14`	`13`	`width: 100%;`
`15`	`14`	`padding-bottom: 20px;`
`16`	`15`	`}`
`17`	`16`	`.csstransforms .deck-container.deck-scale:not(.deck-menu) > .slide > .deck-slide-scaler {`
`18`	`17`	`-webkit-transform-origin: 50% 0;`
`19`		`- -moz-transform-origin: 50% 0;`
`20`		`- -o-transform-origin: 50% 0;`
`21`	`18`	`-ms-transform-origin: 50% 0;`
`22`	`19`	`transform-origin: 50% 0;`
`23`	`20`	`}`
`24`	`21`
`25`	`22`	`.csstransforms .deck-container.deck-menu .deck-slide-scaler {`
`26`	`23`	`-webkit-transform: none !important;`
`27`		`- -moz-transform: none !important;`
`28`		`- -o-transform: none !important;`
`29`	`24`	`-ms-transform: none !important;`
`30`	`25`	`transform: none !important;`
`31`	`26`	`}`