lightning talk 0.1

daonb · Nov 26, 2013 · 546500a · 546500a
1 parent 22c7e30
commit 546500a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 20 deletions.
diff --git a/knight/css/knights.css b/knight/css/knights.css
@@ -702,7 +702,7 @@ a:focus {
     for you.
 */
 #knights, #top10 { text-align: center; }
-#knights h1 { margin-top: 3em; font-size:150%;}
+#knights h1 { line-height: 200px; font-size:100px}
 #knights q { font-size: 70%; }
 #ready img {width:800px;}
 #moore img {width:800px;}
diff --git a/knight/index.html b/knight/index.html
@@ -68,7 +68,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=1024" />
     <meta name="apple-mobile-web-app-capable" content="yes" />
-    <title>The Knights we build</title>
+    <title>Chivalry</title>
 
     <meta name="description" content="Electronic Knights are roaming the Clouds, scanning information for us, distilling knowledge and messaging us" />
     <meta name="author" content="Bartek Szopka" />
@@ -164,8 +164,8 @@
         It will not be rotated or scaled.
         
     -->
-    <div id="knights" class="step slide" data-x="-1000" data-y="-1500">
-      <h1>The Return of the Knights</h1>
+    <div id="knights" class="step slide" data-x="-1100" data-y="-1400">
+      <h1>Chivalry</h1>
       <q>By: <a href="http://twitter.com/daonb">@daonb</a></q>
       <q>CC-BY-SA 3.0<br/>
       Made using <a href="http://github.com/bartaz/impress.js">Impress.js</a></q>
@@ -186,9 +186,6 @@ <h1>The Return of the Knights</h1>
         Using classic `id`-based links like `#step-2` makes these links usable also in fallback mode.
         
     -->
-    <div id="center" class="step" data-x="0" data-y="-1500">
-      <img width="900" src="img/center.jpg" />
-    </div>
 
     <!--
         
@@ -200,16 +197,19 @@ <h1>The Return of the Knights</h1>
         down (4 times) to make it back to its correct size.
         
     -->
-    <div id="ready" class="step" data-x="-700" data-y="-300" data-scale="2">
+    <div id="ready" class="step" data-x="0" data-y="-1400" data-scale="2">
       <img src="img/ready.png" />
     </div>
+    <div id="basic" class="step" data-x="-205" data-y="-600" data-scale="2">
+      <img src="img/basic.jpg" />
+    </div>
     <div id="team" class="step" data-x="700" data-y="-500" data-scale="1">
       <img src="img/team.jpg" width="800"/>
     </div>
-    <div id="moore" class="step" data-x="900" data-y="-1400" data-scale="1" data-rotate="-90">
+    <div id="moore" class="step" data-x="800" data-y="-1400">
       <img src="img/moore.jpg" />
     </div>
-    <div id="cybriad" class="step" data-x="1700" data-y="-1150">
+    <div id="cybriad" class="step" data-x="1300" data-y="-1150" data-rotate="58">
       <img src="img/cybriad.jpg" />
     </div>
     <div id="stirup" class="step" data-x="1700" data-y="-100">
@@ -221,27 +221,30 @@ <h1>The Return of the Knights</h1>
     <div id="game" class="step" data-x="650" data-y="200">
       <img src="img/game.jpg" width="900"/>
     </div>
-    <div id="tali" class="step" data-x="400" data-y="1000" data-rotate="90">
+    <div id="tali" class="step" data-x="450" data-y="800" data-rotate="-90">
       <img src="img/tali.png" width="900"/>
     </div>
-    <div id="occupy" class="step" data-x="-600" data-y="800">
+    <div id="bike" class="step" data-x="-600" data-y="800">
+      <img src="img/bike.jpg" />
+    </div>
+    <div id="anyway" class="step" data-x="-1200" data-y="600" data-rotate="-90">
+      <img src="img/anyway.png"/>
+    </div>
+    <div id="occupy" class="step" data-x="-250" data-y="1600" >
       <img src="img/occupy.jpg" width="900"/>
     </div>
-    <div id="watch" class="step" data-x="-1400" data-y="800" data-rotate="90">
-      <img src="img/watch.jpg" width="900"/>
+    <div id="watch" class="step" data-x="450" data-y="1700" data-rotate="-90">
+      <iframe src="http://watch.gov.il" frameborder="0" width="880" height="830" marginwidth="0" marginheight="0" hspace="0" vspace="0"></iframe>
+    </div>
+    <div id="budget" class="step" data-x="1180" data-y="1600" data-rotate="180">
+      <iframe src="http://compare.open-budget.org.il/?00" frameborder="0" width="900" height="830" marginwidth="0" marginheight="0" hspace="0" vspace="0" scrolling="no"></iframe>
     </div>
     <div id="overview" class="step" data-x="600" data-y="200" data-scale="6">
     </div>
 
 </div>
 
 <!--
-    <div id="anyway" class="step" data-x="2400" data-y="1300">
-      <img src="img/anyway.png"/>
-    </div>
-    <div id="bike" class="step" data-x="1900" data-y="500">
-      <img src="img/bike.jpg" />
-    </div>
     
     Hint is not related to impress.js in any way.