updated preroll database slide

mattcreager · Jul 1, 2015 · 0cac726 · 0cac726
1 parent 0650eff
commit 0cac726
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 76 deletions.
diff --git a/app/app.scss b/app/app.scss
@@ -11,32 +11,6 @@
 	}
 }
 
-.data-logo {
-	@include span-columns(2);
-}
-
-.row .data-header {
-	padding-top: 10px;
-}
-
-.data-header {
-	@include span-columns(10);
-
-	h6, h3 {
-		margin-left: 20px;
-		text-align: left;
-	}
-
-	h3 {
-		font-size: 1.45em;
-		margin-bottom: 5px;
-	}
-
-	h6 {
-		margin-top: 0;
-	}
-}
-
 @mixin gradient-primary {
   background-color: #3B2F63;
   background-image: -webkit-radial-gradient(0% bottom,   rgba(118, 72, 160, 0.7) 0%, rgba(118, 72, 160, 0) 60%), -webkit-radial-gradient(90% bottom,   #523f8c 0%, rgba(82, 63, 140, 0) 40%), -webkit-radial-gradient(50% top,   rgba(84, 90, 182, 0.6) 0%, rgba(84, 90, 182, 0) 75%), -webkit-radial-gradient(right top,   #794aa2 0%, rgba(121, 74, 162, 0) 57%);
@@ -264,6 +238,12 @@ ul[class*="-col"] {
 	}
 }
 
+.half-col {
+	.col {
+		width: 50%;
+	}
+}
+
 .content {
 	p, ul, ol {
 		font-size: 28px;
@@ -302,21 +282,4 @@ pre {
 #title h4 {
 	font-family: 'Share Tech Mono';
 	font-size: 68px;
-}
-
-body #database ul {
-	margin-left: 0;
-  list-style-type: none;
-}
-
-body #database ul li {
-	h4 {
-		padding: 10px;
-	}
-	&:nth-child(2) {
-		background: #a087bd;
-		h4 {
-			color: #3B2F63;
-		}
-	}
 }
diff --git a/app/bundle.js b/app/bundle.js
diff --git a/app/talks/pre-roll/deck.html b/app/talks/pre-roll/deck.html
@@ -53,36 +53,32 @@ <h4>Continously deploy to Heroku from GitHub</h4>
         </div>
     </section>
 
-    <section data-autoslide="8000" class="light-on-dark row" id="database">
-        <div class="col">
-            <div class="row">
-                <img class="data-logo" src="shared/images/heroku-data-postgres-logo.svg" />
-                <div class="data-header">
+    <section data-autoslide="8000" class="light-on-dark" id="database">
+        <div class="row">
+            <div class="half-col">
+                <div class="col">
+                    <img width="100px" src="shared/images/heroku-data-postgres-logo.svg" />
                     <h3>Heroku Postgres</h3>
                     <h6>SQL database service</h6>
+                    <hr>
+                    <ul style="list-style: circle; margin-top: 1em; padding-left: 1em;">
+                        <li>Dataclips makes sharing SQL query results easy</li>
+                        <li>Easy to Setup, Secure by Default</li>
+                        <li>Fork your db like you would a repo</li>
+                    </ul>
                 </div>
-            </div>
-            <br />
-            <ul>
-                <li><h4>Dataclips makes sharing SQL query results easy</h4></li>
-                <li><h4>Easy to Setup, Secure by Default</h4></li>
-                <li><h4>Fork your db like you would a repo</h4></li>
-            </ul>
-        </div>
-        <div class="col">
-            <div class="row">
-                <img class="data-logo" src="shared/images/heroku-data-redis-logo.svg" />
-                <div class="data-header">
+                <div class="col">
+                    <img width="75px" src="shared/images/heroku-data-redis-logo.svg" />
                     <h3>Heroku Redis</h3>
                     <h6>KEY/VALUE DATA STORE</h6>
+                    <hr>
+                    <ul style="list-style: circle; margin-top: 1em; padding-left: 1em;">
+                        <li>Performance Analytics surface key metrics</li>
+                        <li>Fine-grained logs</li>
+                        <li>Query with SQL via. Heroku Data Links</li>
+                    </ul>
                 </div>
             </div>
-            <br/>
-            <ul>
-                <li><h4>Performance Analytics surface key metrics</h4></li>
-                <li><h4>Fine-grained logs</h4></li>
-                <li><h4>Query with SQL via. Heroku Data Links</h4></li>
-            </ul>
         </div>
     </section>