From 37803a6582b1140997da30b5381308a5eebfb40e Mon Sep 17 00:00:00 2001
From: Florian <stayawake@lavabit.com>
Date: Wed, 9 Apr 2014 13:38:29 +0200
Subject: better logo for cryptocon14, cleanup

---
 public/img/cryptocon14-logo-rund-klein.png | Bin 138715 -> 0 bytes
 public/img/cryptocon14-logo-rund.png       | Bin 469308 -> 0 bytes
 public/img/cryptocon14-logo-small.png      | Bin 0 -> 77465 bytes
 public/img/cryptocon14-logo.png            | Bin 0 -> 196404 bytes
 public/img/cryptocon14-logo.rund.png       | Bin 469308 -> 0 bytes
 template/pages/cryptocon14/content.html    |   2 +-
 6 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 public/img/cryptocon14-logo-rund-klein.png
 delete mode 100644 public/img/cryptocon14-logo-rund.png
 create mode 100644 public/img/cryptocon14-logo-small.png
 create mode 100644 public/img/cryptocon14-logo.png
 delete mode 100644 public/img/cryptocon14-logo.rund.png

diff --git a/public/img/cryptocon14-logo-rund-klein.png b/public/img/cryptocon14-logo-rund-klein.png
deleted file mode 100644
index 145a076..0000000
Binary files a/public/img/cryptocon14-logo-rund-klein.png and /dev/null differ
diff --git a/public/img/cryptocon14-logo-rund.png b/public/img/cryptocon14-logo-rund.png
deleted file mode 100644
index 3011e4d..0000000
Binary files a/public/img/cryptocon14-logo-rund.png and /dev/null differ
diff --git a/public/img/cryptocon14-logo-small.png b/public/img/cryptocon14-logo-small.png
new file mode 100644
index 0000000..cec703a
Binary files /dev/null and b/public/img/cryptocon14-logo-small.png differ
diff --git a/public/img/cryptocon14-logo.png b/public/img/cryptocon14-logo.png
new file mode 100644
index 0000000..5feba3b
Binary files /dev/null and b/public/img/cryptocon14-logo.png differ
diff --git a/public/img/cryptocon14-logo.rund.png b/public/img/cryptocon14-logo.rund.png
deleted file mode 100644
index 3011e4d..0000000
Binary files a/public/img/cryptocon14-logo.rund.png and /dev/null differ
diff --git a/template/pages/cryptocon14/content.html b/template/pages/cryptocon14/content.html
index e3577f9..e294557 100644
--- a/template/pages/cryptocon14/content.html
+++ b/template/pages/cryptocon14/content.html
@@ -2,7 +2,7 @@
 	[ CryptoCon 14 ]
 </h2>
 <div class="imagecontent">
-	<a href="img/cryptocon14-logo-rund.png" class="img"><img class="contentimage" src="img/cryptocon14-logo-rund-klein.png" alt="NSA monitored device"></a>
+	<a href="img/cryptocon14-logo.png" class="img"><img class="contentimage" src="img/cryptocon14-logo-small.png" alt="CryptoCon14 Logo - Crypto do not break!"></a>
 </div>
 <p>
 Vom 22. bis 25. Mai 2014 findet im sublab die CryptoCon statt. In dieser mehrt&auml;gigen
-- 
cgit v1.2.1