summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian <stayawake@lavabit.com>2014-04-09 13:38:29 +0200
committerFlorian <stayawake@lavabit.com>2014-04-09 13:38:29 +0200
commit37803a6582b1140997da30b5381308a5eebfb40e (patch)
tree777db16db4e1b3e24e053013b91bdc75f07e40b2
parentddb0c3713dfc6f451c41f06f5daa82b56e625961 (diff)
better logo for cryptocon14, cleanup
-rw-r--r--public/img/cryptocon14-logo-rund-klein.pngbin138715 -> 0 bytes
-rw-r--r--public/img/cryptocon14-logo-rund.pngbin469308 -> 0 bytes
-rw-r--r--public/img/cryptocon14-logo-small.pngbin0 -> 77465 bytes
-rw-r--r--public/img/cryptocon14-logo.pngbin0 -> 196404 bytes
-rw-r--r--public/img/cryptocon14-logo.rund.pngbin469308 -> 0 bytes
-rw-r--r--template/pages/cryptocon14/content.html2
6 files changed, 1 insertions, 1 deletions
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
--- a/public/img/cryptocon14-logo-rund-klein.png
+++ /dev/null
Binary files differ
diff --git a/public/img/cryptocon14-logo-rund.png b/public/img/cryptocon14-logo-rund.png
deleted file mode 100644
index 3011e4d..0000000
--- a/public/img/cryptocon14-logo-rund.png
+++ /dev/null
Binary files differ
diff --git a/public/img/cryptocon14-logo-small.png b/public/img/cryptocon14-logo-small.png
new file mode 100644
index 0000000..cec703a
--- /dev/null
+++ b/public/img/cryptocon14-logo-small.png
Binary files differ
diff --git a/public/img/cryptocon14-logo.png b/public/img/cryptocon14-logo.png
new file mode 100644
index 0000000..5feba3b
--- /dev/null
+++ b/public/img/cryptocon14-logo.png
Binary files differ
diff --git a/public/img/cryptocon14-logo.rund.png b/public/img/cryptocon14-logo.rund.png
deleted file mode 100644
index 3011e4d..0000000
--- a/public/img/cryptocon14-logo.rund.png
+++ /dev/null
Binary files 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