From: Kai Blin <kai@samba.org>
Date: Sun, 8 Jan 2012 15:34:46 +0000 (+0100)
Subject: Update illustrations
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=4e87c2162295d56061d8c22c360dd43e12bd69e7;p=kai%2Flca12.git

Update illustrations
---

diff --git a/antismash_lca2011.html b/antismash_lca2011.html
index 0d990a1..4952933 100644
--- a/antismash_lca2011.html
+++ b/antismash_lca2011.html
@@ -95,7 +95,7 @@
 
   <section class="slide" id="background-metaphor-machines">
   <img src="protein_metaphor.svg" height="300">
-  <div class="float-left">
+  <div class="float-left-small">
       <div class="slide" id="enzymes"><img src="protein_reaction.svg"></div>
       <div class="slide" id="sensors"><img src="protein_sensor.svg"></div>
       <div class="slide" id="regulators"><img src="protein_regulator.svg"></div>
@@ -107,8 +107,16 @@
   </section>
 
   <section class="slide" id="background-metaphor-gene-blueprint">
-    <img src="blueprint.svg">
-    <div class="slide" id="background-metaphor-gene"><h3>Gene</h3></div>
+    <img src="blueprint.svg" height="600">
+    <h3 class="centered">Gene</h3>
+  </section>
+
+  <section class="slide" id="background-protein-vs-enzyme">
+  <h2>Nomenclature</h2>
+  <div class="float-left-large">
+    <div class="slide" id="when-protein"><img src="protein_parts.svg"></div>
+    <div class="slide" id="when-enzyme"><img src="protein_reaction.svg"></div>
+  </div>
   </section>
 
   <section class="slide" id="background-metaphor-assembly">
diff --git a/antismash_talk.css b/antismash_talk.css
index a3f405c..3028579 100644
--- a/antismash_talk.css
+++ b/antismash_talk.css
@@ -94,12 +94,27 @@ footer #uni-logo {
     color: #a31b37;
 }
 
-.float-left img{
+.float-left-small img{
     display: block;
     float: left;
     height: 100px;
+    -moz-transition: height 1s;
 }
 
-.float-left .deck-current img {
+.float-left-small .deck-current img {
     height: 300px;
 }
+
+.float-left-large img {
+    display: block;
+    float: left;
+    height: 200px;
+    -moz-transition: height 1s;
+}
+
+.float-left-large .deck-current img {
+    height: 400px;
+}
+.centered {
+    text-align: center;
+}
diff --git a/drawings/.~lock.blueprint.odg# b/drawings/.~lock.blueprint.odg#
deleted file mode 100644
index bde2ada..0000000
--- a/drawings/.~lock.blueprint.odg#
+++ /dev/null
@@ -1 +0,0 @@
-Kai Blin,kai,rumo,08.01.2012 14:45,file:///home/kai/.openoffice.org/3;
\ No newline at end of file
diff --git a/drawings/.~lock.protein_ribosome.odg# b/drawings/.~lock.protein_ribosome.odg#
deleted file mode 100644
index 8a17fec..0000000
--- a/drawings/.~lock.protein_ribosome.odg#
+++ /dev/null
@@ -1 +0,0 @@
-Kai Blin,kai,rumo,08.01.2012 15:25,file:///home/kai/.openoffice.org/3;
\ No newline at end of file