From 9d930c548a9f693fbc640ff76718accd265332c3 Mon Sep 17 00:00:00 2001
From: Daniel <Daniel@Daniel-PC.speedport.ip>
Date: Fri, 21 Mar 2014 17:23:10 +0100
Subject: [PATCH] menu bar update for 1024px+ & fixed padding problems

---
 views/html/html.tpl |  2 +-
 www/css/desktop.css | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/views/html/html.tpl b/views/html/html.tpl
index 5f06a1ef..080220da 100644
--- a/views/html/html.tpl
+++ b/views/html/html.tpl
@@ -18,7 +18,7 @@
 
 <body>
 	<header>
-		<nav class="wrap">
+		<nav>
 			<input type="checkbox" id="toggle">
 			<label for="toggle" class="toggle" onclick><a id="navicon"><i class="fa fa-bars"></i>Menü</a></label>
 			<?php if(!is_null($loggedUser)) : ?>
diff --git a/www/css/desktop.css b/www/css/desktop.css
index b1ecf0b0..23a7b798 100644
--- a/www/css/desktop.css
+++ b/www/css/desktop.css
@@ -62,15 +62,15 @@ a{color:#50a4ab;text-decoration:none}
 header{background:#0f373c;margin-bottom:1.1875em;position:fixed;width:100%;z-index:99}
 header .fa{color:#5e9499}
 
-header nav{z-index:99}
-menu{display:none;opacity:0;position:absolute;margin:0;padding:0 0 16px;background:#0f373c;right:0;left:0}
+header nav{z-index:99;margin:0 5%}
+menu{display:none;opacity:0;position:absolute;margin:0;padding:0 0 15px;background:#0f373c;right:0;left:0}
 menu li{display:block;margin:0 5%}
-menu a{display:block;padding:15px 0;color:#fff}
+menu a,#profile{display:block;padding:15px 0;color:#fff}
 
-#profile{float:right;padding:18px;color:#fff}
+#profile{float:right}
 
 #toggle,.toggle{display:none}
-.toggle{display:inline-block;padding:18px 18px 18px 0;position:relative;cursor:pointer;-webkit-touch-callout:none;-moz-user-select:none;-ms-user-select:none;-webkit-user-select:none;user-select:none}
+.toggle{display:inline-block;padding:15px 15px 15px 0;position:relative;cursor:pointer;-webkit-touch-callout:none;-moz-user-select:none;-ms-user-select:none;-webkit-user-select:none;user-select:none}
 #toggle:checked ~ menu{display:block;opacity:1}
 #navicon{display:block;color:#fff}
 
@@ -103,3 +103,12 @@ article{padding-top:5.375em;margin-bottom:30px}
 .questgroups li{width:48%;float:left}
 .questgroups li:nth-child(even){float:right}
 }
+
+@media only screen and (min-width:1024px){
+header{position:fixed;left:0;top:0;bottom:0;width:300px;margin:0}
+menu{display:block;opacity:1;position:relative}
+#profile{float:none;margin:15px 15px 0 15px}
+#toggle,.toggle{display:none}
+.wrap{margin:0 20px 0 340px}
+article{padding-top:0}
+}
\ No newline at end of file
