add graphics to slides

diff --git a/linuxwochen2013-makey/slides.css b/linuxwochen2013-makey/slides.css
index f6adfbf73b383f3536bcbd63aec21bfb32d9b510..5e36afcaa6ae5082046aa0fbddd2d7f135082432 100644 (file)
--- a/linuxwochen2013-makey/slides.css
+++ b/linuxwochen2013-makey/slides.css
@@ -92,11 +92,11 @@ ul:last-child {
 }
 
 #header-text.neartime {
-  color: #80AACC;
+  color: #6080FF;
 }
 
 #header-text.ontime {
-  color: #80CC80;
+  color: #40AA40;
 }
 
 #header-text.overtime {
@@ -129,7 +129,7 @@ ul:last-child {
 }
 
 #slidenav .nolink {
-  color: #A0A0A0;
+  color: #CCCCCC;
 }
 
 article {
@@ -177,7 +177,7 @@ article[aria-selected="true"] ~ article {
 h1, h2, h3, h4 {
   margin: 0.5em 0;
   font-weight: bold;
-  color: #336699;
+  color: #003366;
   text-align: center;
 }
 

diff --git a/linuxwochen2013-mozilla/australis.png b/linuxwochen2013-mozilla/australis.png
new file mode 100644 (file)
index 0000000..0d54d0a
Binary files /dev/null and b/linuxwochen2013-mozilla/australis.png differ

diff --git a/linuxwochen2013-mozilla/bananabread.png b/linuxwochen2013-mozilla/bananabread.png
new file mode 100644 (file)
index 0000000..757c9a0
Binary files /dev/null and b/linuxwochen2013-mozilla/bananabread.png differ

diff --git a/linuxwochen2013-mozilla/call.png b/linuxwochen2013-mozilla/call.png
new file mode 100644 (file)
index 0000000..f6e5a89
Binary files /dev/null and b/linuxwochen2013-mozilla/call.png differ

diff --git a/linuxwochen2013-mozilla/contacts.png b/linuxwochen2013-mozilla/contacts.png
new file mode 100644 (file)
index 0000000..939b28c
Binary files /dev/null and b/linuxwochen2013-mozilla/contacts.png differ

diff --git a/linuxwochen2013-mozilla/devtools.png b/linuxwochen2013-mozilla/devtools.png
new file mode 100644 (file)
index 0000000..54b67b1
Binary files /dev/null and b/linuxwochen2013-mozilla/devtools.png differ

diff --git a/linuxwochen2013-mozilla/fxos_shot.png b/linuxwochen2013-mozilla/fxos_shot.png
new file mode 100644 (file)
index 0000000..d3efbda
Binary files /dev/null and b/linuxwochen2013-mozilla/fxos_shot.png differ

diff --git a/linuxwochen2013-mozilla/index.html b/linuxwochen2013-mozilla/index.html
index 462eb32bc7799ae1255694637d54d7331a2ee16c..32a850d900b58a373805f6fd88f6b6d944e7da18 100755 (executable)
--- a/linuxwochen2013-mozilla/index.html
+++ b/linuxwochen2013-mozilla/index.html
@@ -59,7 +59,10 @@
   <li><a href="#toc">Inhalt</a></li>
   <li><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/at/"><img
       alt="Lizenziert unter CC-BY-SA," style="border-width:0;vertical-align:bottom;"
-      src="cc-by-sa-80x15.png"></a> 04/2013 Robert Kaiser</li>
+      src="cc-by-sa-80x15.png"></a> 04/2013 Robert Kaiser -
+    "Mozilla", "Firefox" und deren Logos sind
+    <a href="http://www.mozilla.org/foundation/trademarks/list.html">Handelmarken
+    der Mozilla Foundation</a>.</li>
 </ul>
 </div>
 </div>
@@ -69,11 +72,13 @@
 <h1>15 Jahre Mozilla-Geschichte</h1>
 
 <div class="simplebox">
+<img src="mozorg-hack.gif" alt="hack - mozilla.org" class="slidepic">
 <ul>
   <li>Freigabe des Netscape-Quellcodes am 31. März 1998</li>
   <li>Unter dem langjährigen Netscape-Codenamen "Mozilla"</li>
   <li>Firefox 1.0 im November 2004</li>
 </ul>
+<p class="ensurepicinbox"></p>
 </div>
 </article>
 
@@ -81,11 +86,13 @@
 <h1>Mozilla Foundation</h1>
 
 <div class="simplebox">
+<img src="webmaker_openbadges.png" alt="Webmaker / OpenBadges" class="slidepic">
 <ul>
   <li>Mission, Manifesto</li>
   <li>Webmaker (Popcorn, Thimble)</li>
   <li>Open Badges</li>
 </ul>
+<p class="ensurepicinbox"></p>
 </div>
 </article>
 
@@ -93,11 +100,13 @@
 <h1>Aktuelles: Firefox für Desktop</h1>
 
 <div class="simplebox">
+<img src="australis.png" alt="Australis" class="slidepic">
 <ul>
   <li>Social: Multi-Provider-Unterstützung</li>
   <li>Australis-Design</li>
   <li>Neue Windows-8-Oberfläche ("Metro")</li>
 </ul>
+<p class="ensurepicinbox"></p>
 </div>
 </article>
 
@@ -105,11 +114,13 @@
 <h1>Entwickler-Werkzeuge</h1>
 
 <div class="simplebox">
+<img src="devtools.png" alt="Werkzeuge" class="slidepic">
 <ul>
   <li>Inspektor, Style-Editor</li>
   <li>Debugger, Profiler</li>
   <li>Netzwerk-Panel</li>
 </ul>
+<p class="ensurepicinbox"></p>
 </div>
 </article>
 
@@ -117,11 +128,13 @@
 <h1>Hintergrundarbeiten, Medien-APIs</h1>
 
 <div class="simplebox">
+<img src="webrtc_social.png" alt="WebRTC / SocialAPI" class="slidepic">
 <ul>
   <li>Performance, MemShrink</li>
   <li>WebRTC (Audio, Video, Daten)</li>
   <li>WebAudio</li>
 </ul>
+<p class="ensurepicinbox"></p>
 </div>
 </article>
 
@@ -129,11 +142,13 @@
 <h1>Mobilgeräte</h1>
 
 <div class="simplebox">
+<img src="fxos_shot.png" alt="Firefox OS" class="slidepic">
 <ul>
   <li>Firefox für Android</li>
   <li>Web Apps für Android (Aurora)</li>
   <li>Firefox OS</li>
 </ul>
+<p class="ensurepicinbox"></p>
 </div>
 </article>
 
@@ -141,11 +156,13 @@
 <h1>WebAPI: Web Apps</h1>
 
 <div class="simplebox">
+<img src="marketplace.png" alt="Firefox Marketplace" class="slidepic">
 <ul>
   <li>Open Web Apps</li>
   <li>WebActivities</li>
   <li>WebPayment</li>
 </ul>
+<p class="ensurepicinbox"></p>
 </div>
 </article>
 
@@ -153,11 +170,13 @@
 <h1>WebAPI: Mobil</h1>
 
 <div class="simplebox">
+<img src="call.png" alt="Anruf" class="slidepic">
 <ul>
   <li>Verbindungen: Telefon, SMS, Bluetooth, WLAN, USB, ...</li>
   <li>Batterie, Vibration</li>
   <li>Ausrichtung, Beschleunigung</li>
 </ul>
+<p class="ensurepicinbox"></p>
 </div>
 </article>
 
@@ -165,11 +184,13 @@
 <h1>WebAPI: Noch mehr!</h1>
 
 <div class="simplebox">
+<img src="contacts.png" alt="Kontakte" class="slidepic">
 <ul>
   <li>Geolocation</li>
   <li>Kontakte</li>
   <li>Mouse-Lock, Vollbild</li>
 </ul>
+<p class="ensurepicinbox"></p>
 </div>
 </article>
 
@@ -177,11 +198,13 @@
 <h1>Mozilla Persona</h1>
 
 <div class="simplebox">
+<img src="persona.png" alt="Persona" class="slidepic">
 <ul>
   <li>Dezentralisierter Login</li>
   <li>Identitätsprovider (IdP)</li>
   <li>"Profile In The Cloud" (PiCl)</li>
 </ul>
+<p class="ensurepicinbox"></p>
 </div>
 </article>
 
@@ -189,12 +212,14 @@
 <h1>JavaScript-Beschleunigung</h1>
 
 <div class="simplebox">
+<img src="bananabread.png" alt="BananaBread" class="slidepic">
 <ul>
   <li>Baseline JIT</li>
   <li>ASM.js + OdinMonkey</li>
   <li>ParallelJS</li>
   <li>EmScripten</li>
 </ul>
+<p class="ensurepicinbox"></p>
 </div>
 </article>
 
@@ -202,11 +227,13 @@
 <h1>Plugins?</h1>
 
 <div class="simplebox">
+<img src="pdfjs.png" alt="PDF.js" class="slidepic">
 <ul>
   <li>Click-To-Play für unsichere Plugins</li>
   <li>PDF.js: Eingebaut, HTML+JS</li>
   <li>Shumway: SWF-Player in HTML+JS</li>
 </ul>
+<p class="ensurepicinbox"></p>
 </div>
 </article>
 
@@ -214,10 +241,12 @@
 <h1>Weitere Forschung</h1>
 
 <div class="simplebox">
+<img src="rust.png" alt="Rust" class="slidepic">
 <ul>
   <li>Servo: Web-Engine - Parallelität und Speichersicherheit</li>
   <li>Rust: Programmiersprache - Gleichzeitigkeit und Integrität</li>
 </ul>
+<p class="ensurepicinbox"></p>
 </div>
 </article>
 

diff --git a/linuxwochen2013-mozilla/marketplace.png b/linuxwochen2013-mozilla/marketplace.png
new file mode 100644 (file)
index 0000000..8e64717
Binary files /dev/null and b/linuxwochen2013-mozilla/marketplace.png differ

diff --git a/linuxwochen2013-mozilla/mozorg-hack.gif b/linuxwochen2013-mozilla/mozorg-hack.gif
new file mode 100755 (executable)
index 0000000..6d7e2f7
Binary files /dev/null and b/linuxwochen2013-mozilla/mozorg-hack.gif differ

diff --git a/linuxwochen2013-mozilla/pdfjs.png b/linuxwochen2013-mozilla/pdfjs.png
new file mode 100644 (file)
index 0000000..2687566
Binary files /dev/null and b/linuxwochen2013-mozilla/pdfjs.png differ

diff --git a/linuxwochen2013-mozilla/persona.png b/linuxwochen2013-mozilla/persona.png
new file mode 100644 (file)
index 0000000..b13a9a1
Binary files /dev/null and b/linuxwochen2013-mozilla/persona.png differ

diff --git a/linuxwochen2013-mozilla/rust.png b/linuxwochen2013-mozilla/rust.png
new file mode 100644 (file)
index 0000000..d878c0d
Binary files /dev/null and b/linuxwochen2013-mozilla/rust.png differ

diff --git a/linuxwochen2013-mozilla/slides.css b/linuxwochen2013-mozilla/slides.css
index 7316fcebdb69b576cb69c11c59074e683c6394e8..a104e6d1620acd39a3cb46c43a463571c5901022 100644 (file)
--- a/linuxwochen2013-mozilla/slides.css
+++ b/linuxwochen2013-mozilla/slides.css
@@ -245,6 +245,17 @@ mark {
   box-shadow: #6d7581 1px 1px 3px 2px;
 }
 
+.slidepic {
+  float: right;
+  margin-left: .5em;
+}
+
+.ensurepicinbox {
+  clear: both;
+  font-size: 1px;
+  margin: 0;
+}
+
 ul > li {
   margin: 0.5em 0;
 }

diff --git a/linuxwochen2013-mozilla/webmaker_openbadges.png b/linuxwochen2013-mozilla/webmaker_openbadges.png
new file mode 100644 (file)
index 0000000..e85dfa8
Binary files /dev/null and b/linuxwochen2013-mozilla/webmaker_openbadges.png differ

diff --git a/linuxwochen2013-mozilla/webrtc_social.png b/linuxwochen2013-mozilla/webrtc_social.png
new file mode 100644 (file)
index 0000000..f5f4c19
Binary files /dev/null and b/linuxwochen2013-mozilla/webrtc_social.png differ