Refactor base styles to apply to slides insted of container

ctfliblime · Oct 25, 2011 · 0204c73 · 0204c73
1 parent 75a07a7
commit 0204c73
Show file tree

Hide file tree

Showing 8 changed files with 320 additions and 327 deletions.
diff --git a/core/deck.core.css b/core/deck.core.css
@@ -139,10 +139,10 @@ html {
 .deck-container input[type="checkbox"] {
   vertical-align: bottom;
 }
-.deck-container .ie7 input[type="checkbox"] {
+.ie7 .deck-container input[type="checkbox"] {
   vertical-align: baseline;
 }
-.deck-container .ie6 input {
+.ie6 .deck-container input {
   vertical-align: text-bottom;
 }
 .deck-container label, .deck-container input[type="button"], .deck-container input[type="submit"], .deck-container input[type="image"], .deck-container button {
@@ -179,13 +179,22 @@ html {
 .deck-container a:link {
   -webkit-tap-highlight-color: #fff;
 }
-.deck-container h1 {
+.deck-container.deck-loading {
+  display: none;
+}
+
+.slide {
+  width: auto;
+  min-height: 100%;
+  position: relative;
+}
+.slide h1 {
   font-size: 4.5em;
   font-weight: bold;
   text-align: center;
   padding-top: 1em;
 }
-.csstransforms .deck-container h1 {
+.csstransforms .slide h1 {
   padding: 0 48px;
   position: absolute;
   left: 0;
@@ -197,66 +206,57 @@ html {
   -o-transform: translate(0, -50%);
   transform: translate(0, -50%);
 }
-.deck-container h2 {
+.slide h2 {
   font-size: 2.25em;
   font-weight: bold;
   padding-top: .5em;
   margin: 0 0 .66666em 0;
   border-bottom: 3px solid #888;
 }
-.deck-container h3 {
+.slide h3 {
   font-size: 1.4375em;
   font-weight: bold;
   margin-bottom: .30435em;
 }
-.deck-container h4 {
+.slide h4 {
   font-size: 1.25em;
   font-weight: bold;
   margin-bottom: .25em;
 }
-.deck-container h5 {
+.slide h5 {
   font-size: 1.125em;
   font-weight: bold;
   margin-bottom: .2222em;
 }
-.deck-container h6 {
+.slide h6 {
   font-size: 1em;
   font-weight: bold;
 }
-.deck-container img, .deck-container iframe, .deck-container video {
+.slide img, .slide iframe, .slide video {
   display: block;
   max-width: 100%;
 }
-.deck-container video, .deck-container iframe, .deck-container img {
+.slide video, .slide iframe, .slide img {
   display: block;
   margin: 0 auto;
 }
-.deck-container p, .deck-container blockquote, .deck-container iframe, .deck-container img, .deck-container ul, .deck-container ol, .deck-container pre, .deck-container video {
+.slide p, .slide blockquote, .slide iframe, .slide img, .slide ul, .slide ol, .slide pre, .slide video {
   margin-bottom: 1em;
 }
-.deck-container pre {
+.slide pre {
   white-space: pre;
   white-space: pre-wrap;
   word-wrap: break-word;
   padding: 1em;
   border: 1px solid #888;
 }
-.deck-container em {
+.slide em {
   font-style: italic;
 }
-.deck-container li {
+.slide li {
   padding: .25em 0;
   vertical-align: middle;
 }
-.deck-container.deck-loading {
-  display: none;
-}
-
-.slide {
-  width: auto;
-  min-height: 100%;
-  position: relative;
-}
 
 .deck-before, .deck-previous, .deck-next, .deck-after {
   position: absolute;

diff --git a/core/deck.core.scss b/core/deck.core.scss
@@ -171,11 +171,11 @@ html {
 		vertical-align:bottom;
 	}
 
-	.ie7 input[type="checkbox"] {
+	.ie7 & input[type="checkbox"] {
 		vertical-align:baseline;
 	}
 
-	.ie6 input {
+	.ie6 & input {
 		vertical-align:text-bottom;
 	}
 
@@ -224,7 +224,17 @@ html {
 		}
 	}
 	/* End HTML5 Boilerplate adaptations */
+
+	&.deck-loading {
+		display:none;
+	}
+}
 
+.slide {
+	width:auto;
+	min-height:100%;
+	position:relative;
+
 	h1 {
 		font-size:4.5em;
 		font-weight:bold;
@@ -306,16 +316,6 @@ html {
 		padding:.25em 0;
 		vertical-align:middle;
 	}
-
-	&.deck-loading {
-		display:none;
-	}
-}
-
-.slide {
-	width:auto;
-	min-height:100%;
-	position:relative;
 }
 
 .deck-before, .deck-previous, .deck-next, .deck-after {

diff --git a/themes/style/neon.css b/themes/style/neon.css
@@ -7,63 +7,63 @@
 .deck-container .slide {
   background: #000;
 }
-.deck-container h1 {
+.deck-container .slide h1 {
   color: #0af;
   font-weight: normal;
   font-weight: 100;
   text-shadow: 0 0 50px #0af, 0 0 3px #fff;
 }
-.deck-container h2 {
+.deck-container .slide h2 {
   color: #af0;
   border-bottom-color: #ccc;
   font-weight: normal;
   font-weight: 100;
   text-shadow: 0 0 15px #af0, 0 0 2px #fff;
   border-bottom: 1px solid #333;
 }
-.deck-container h3 {
+.deck-container .slide h3 {
   color: #fff;
   font-weight: normal;
   font-weight: 100;
   text-shadow: 0 0 10px #fff, 0 0 2px #fff;
 }
-.deck-container pre {
+.deck-container .slide pre {
   border-color: #333;
 }
-.deck-container pre code {
+.deck-container .slide pre code {
   color: #fff;
 }
-.deck-container code {
+.deck-container .slide code {
   color: #f0a;
 }
-.deck-container blockquote {
+.deck-container .slide blockquote {
   font-size: 2em;
   padding: 1em 2em;
   color: #fff;
   border-left: 5px solid #fff;
 }
-.deck-container blockquote p {
+.deck-container .slide blockquote p {
   margin: 0;
 }
-.deck-container blockquote cite {
+.deck-container .slide blockquote cite {
   font-size: .5em;
   font-style: normal;
   font-weight: normal;
   font-weight: 100;
   color: #aaa;
   text-shadow: 0 0 15px #fff, 0 0 2px #fff;
 }
-.deck-container ::-moz-selection {
+.deck-container .slide ::-moz-selection {
   background: #a0f;
 }
-.deck-container ::selection {
+.deck-container .slide ::selection {
   background: #a0f;
 }
-.deck-container a, .deck-container a:hover, .deck-container a:focus, .deck-container a:active, .deck-container a:visited {
+.deck-container .slide a, .deck-container .slide a:hover, .deck-container .slide a:focus, .deck-container .slide a:active, .deck-container .slide a:visited {
   color: #f0a;
   text-decoration: none;
 }
-.deck-container a:hover, .deck-container a:focus {
+.deck-container .slide a:hover, .deck-container .slide a:focus {
   text-decoration: underline;
 }
 .deck-container .deck-prev-link, .deck-container .deck-next-link {

diff --git a/themes/style/neon.scss b/themes/style/neon.scss
@@ -6,74 +6,74 @@
 
 	.slide {
 		background:#000;
-	}
-
-	h1 {
-		color:#0af;
-		font-weight:normal;
-		font-weight:100;
-		text-shadow:0 0 50px #0af, 0 0 3px #fff;
-	}
-
-	h2 {
-		color:#af0;
-		border-bottom-color:#ccc;
-		font-weight:normal;
-		font-weight:100;
-		text-shadow:0 0 15px #af0, 0 0 2px #fff;
-		border-bottom:1px solid #333;
-	}
-
-	h3 {
-		color:#fff;
-		font-weight:normal;
-		font-weight:100;
-		text-shadow:0 0 10px #fff, 0 0 2px #fff;
-	}
-
-	pre {
-		border-color:#333;
 
-		code {
+		h1 {
-			color:#fff;
+			color:#0af;
+			font-weight:normal;
+			font-weight:100;
+			text-shadow:0 0 50px #0af, 0 0 3px #fff;
 		}
-	}
-
-	code {
-		color:#f0a;
-	}
-
-	blockquote {
-		font-size:2em;
-		padding:1em 2em;
-		color:#fff;
-		border-left:5px solid #fff;
 
-		p {
+		h2 {
-			margin:0;
+			color:#af0;
+			border-bottom-color:#ccc;
+			font-weight:normal;
+			font-weight:100;
+			text-shadow:0 0 15px #af0, 0 0 2px #fff;
+			border-bottom:1px solid #333;
 		}
 
-		cite {
+		h3 {
-			font-size:.5em;
+			color:#fff;
-			font-style:normal;
 			font-weight:normal;
 			font-weight:100;
-			color:#aaa;
+			text-shadow:0 0 10px #fff, 0 0 2px #fff;
-			text-shadow:0 0 15px #fff, 0 0 2px #fff;
 		}
-	}
+
-
+		pre {
-	::-moz-selection{ background:#a0f; }
+			border-color:#333;
-	::selection { background:#a0f; }
+
-
+			code {
-	a {
+				color:#fff;
-		&, &:hover, &:focus, &:active, &:visited {
+			}
+		}
+
+		code {
 			color:#f0a;
-			text-decoration:none;
 		}
-
+
-		&:hover, &:focus {
+		blockquote {
-			text-decoration:underline;
+			font-size:2em;
+			padding:1em 2em;
+			color:#fff;
+			border-left:5px solid #fff;
+
+			p {
+				margin:0;
+			}
+
+			cite {
+				font-size:.5em;
+				font-style:normal;
+				font-weight:normal;
+				font-weight:100;
+				color:#aaa;
+				text-shadow:0 0 15px #fff, 0 0 2px #fff;
+			}
+		}
+
+		::-moz-selection{ background:#a0f; }
+		::selection { background:#a0f; }
+
+		a {
+			&, &:hover, &:focus, &:active, &:visited {
+				color:#f0a;
+				text-decoration:none;
+			}
+
+			&:hover, &:focus {
+				text-decoration:underline;
+			}
 		}
 	}