From a8cb411a92cd5f6dabf3f52f23c1c8159f931b75 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>
Date: Thu, 11 Aug 2011 00:45:28 +0200
Subject: restyle logout

---
 core/css/styles.css            | 9 ++-------
 core/templates/layout.user.php | 4 +---
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index 36fca06b9d7..7299e1bb9b6 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -83,13 +83,6 @@ legend { padding:.2em; font-size:1.2em; }
 
 #login form ul.errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 4em 0; padding:1em 1em 1em 5em; }
 
-/* META NAVIGATION (Settings, Log out) ---------------------------------------------------------------- */ 
-#metanav { float:right; position:relative; top:.5em; right:1em; margin:0; padding:0; }
-#metanav li { display:inline; }
-#metanav li a { margin:.2em; padding:.7em; }
-#metanav li a:hover, #metanav li a:focus { background:rgba(0,0,0,.5); -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:#555 0 1px 0; -moz-box-shadow:#555 0 1px 0; -webkit-box-shadow:#555 0 1px 0; }
-#metanav li a img { vertical-align:middle; }
-
 /* NAVIGATION ------------------------------------------------------------- */
 #navigation { position:fixed; top:3.5em; float:left; width:12.5em; padding:0; z-index:75; height:100%; background:#eee; border-right: 1px #ccc solid; -moz-box-shadow: -3px 0 7px #000; -webkit-box-shadow: -3px 0 7px #000; box-shadow: -3px 0 7px #000; }
 #navigation a { display:block; padding:.6em .5em .4em 2.5em; background:#eee 1em center no-repeat; border-bottom:1px solid #ddd; border-top:1px solid #fff; text-decoration:none; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; }
@@ -98,6 +91,8 @@ legend { padding:.2em; font-size:1.2em; }
 #navigation #settings { position:absolute; bottom:3.5em; width:100%; }
 #expand { margin:0 0 .2em 1.2em; cursor:pointer; }
 #expand+span { position:relative; bottom:.4em; left:.2em; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; }
+#logout { position:absolute; right:0; top:0; padding:1.2em 2em .55em 1.2em; }
+#logout:hover, #logout:focus { background:rgba(0,0,0,.5); }
 
 /* USER SETTINGS ------------------------------------------------------------ */
 #quota_indicator { margin:0 4em 1em 0; padding:0; border:1px solid #ccc; border-radius:10px; -webkit-border-radius:10px; -moz-border-radius:10px; }
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 326ead74995..849d3a1a09d 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -33,9 +33,7 @@
 			<form class="searchbox" action="#" method="post">
 				<input id='searchbox' type="search" name="query" value="<?php if(isset($_POST['query'])){echo $_POST['query'];};?>" class="prettybutton" autocomplete="off" />
 			</form>
-			<ul id="metanav">
-				<li><a href="<?php echo link_to('', 'index.php'); ?>?logout=true" title="<?php echo $l->t('Log out');?>"><img class='svg' src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a></li>
-			</ul>
+			<a id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true" title="<?php echo $l->t('Log out');?>"><img class='svg' src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a>
 		</div></header>
 
 		<nav><div id="navigation">
-- 
cgit v1.2.3