From 734447b40c8fd50788aba8b3a71edd7df55c8e1a Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Fri, 7 Dec 2012 18:00:19 +0100
Subject: 29c3 design

---
 includes/sys_template.php            |   4 ++--
 public/css/style11.css               |  35 +++++++++++++++++++++++++++++++----
 public/pic/engelsystem_logo_29c3.png | Bin 0 -> 4904 bytes
 templates/layout.html                |   1 +
 4 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 public/pic/engelsystem_logo_29c3.png

diff --git a/includes/sys_template.php b/includes/sys_template.php
index 08e47ee9..4e701879 100644
--- a/includes/sys_template.php
+++ b/includes/sys_template.php
@@ -15,7 +15,7 @@ $themes = array (
 	"4" => "Test Style",
 	"9" => "Test Style 21c3",
 	"10" => "Engelsystem 2.0",
-	"11" => "msquare (28c3)"
+	"11" => "msquare (29c3)"
 );
 
 /**
@@ -88,7 +88,7 @@ function form_select($name, $label, $values, $selected) {
 	return form_element($label, html_select_key('form_' . $name, $name, $values, $selected), 'form_' . $name);
 }
 
-/** 
+/**
  * Rendert ein Formular-Element
  */
 function form_element($label, $input, $for = "") {
diff --git a/public/css/style11.css b/public/css/style11.css
index 86720e6a..3a77f5bc 100644
--- a/public/css/style11.css
+++ b/public/css/style11.css
@@ -1,9 +1,29 @@
+body.background {
+	background: #000532;
+}
+
+footer, footer a {
+  color: #fff;
+}
+
+#body {
+	background: #fff;
+  border: 1px solid #fff;
+  border-radius: 2px;
+  padding: 20px;
+  margin: 0 20px;
+}
+
+.content {
+	background: transparent;
+}
+
 #logo {
-    background: url('../pic/engelsystem_logo_28c3.png') top left no-repeat;
+    background: url('../pic/engelsystem_logo_29c3.png') top left no-repeat #fff;
     display: block;
-    height: 69px;
-    margin: 10px auto;
-    width: 378px;
+    height: 100px;
+    margin: 10px;
+    width: 900px;
 }
 
 tr:hover > td {
@@ -18,3 +38,10 @@ tr:hover > td {
 .selection ul li:nth-child(even) {
 	background: #f0f0f0;
 }
+
+.error {
+	background: #fff;
+  border-color: #ed1a3b;
+  color: #ed1a3b;
+  font-weight: bold;
+}
\ No newline at end of file
diff --git a/public/pic/engelsystem_logo_29c3.png b/public/pic/engelsystem_logo_29c3.png
new file mode 100644
index 00000000..cbaefd6f
Binary files /dev/null and b/public/pic/engelsystem_logo_29c3.png differ
diff --git a/templates/layout.html b/templates/layout.html
index 6865bfcd..721001d4 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -30,6 +30,7 @@
                     %content%
                 </article>
             </div>
+            <div class="clear"></div>
         </div>
         <footer>
             <p>
-- 
cgit v1.2.3-54-g00ecf