From e05313f88f1b61c4d5e21230f58e53f654c88605 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 5 Mar 2012 12:23:16 -0500
Subject: [PATCH 1/2] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:

* master:

From 02f825ca3cc55fa0e9fe7e3e7df6a37b32968b8a Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 5 Mar 2012 13:16:28 -0500
Subject: [PATCH 2/2] tweak sizing of <section> and <aside> more; fix link in
 'view contacts' in sidebar

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/contact_block.tpl     | 2 +-
 view/theme/dispy/style.css | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 view/contact_block.tpl

diff --git a/view/contact_block.tpl b/view/contact_block.tpl
old mode 100755
new mode 100644
index eb46c6c4..df561439
--- a/view/contact_block.tpl
+++ b/view/contact_block.tpl
@@ -1,7 +1,7 @@
 <div id="contact-block">
 <h4 class="contact-block-h4">$contacts</h4>
 {{ if $micropro }}
-		<a class="allcontact-link" href="viewcontacts/$nickname">$viewcontacts</a>
+		<a class="allcontact-link" href="contacts/$nickname">$viewcontacts</a>
 		<div class='contact-block-content'>
 		{{ for $micropro as $m }}
 			$m
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 308a2ff3..13f7d2d5 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -232,7 +232,8 @@ nav a:hover {
 nav #banner {
 	display: block;
 	position: absolute;
-	margin-left: 20px;	
+	left: 51px;
+	top: 25px;
 }
 nav #banner #logo-text a {
 	font-size: 40px;
@@ -956,7 +957,7 @@ aside #viewcontacts {
  * section
  */
 section {
-    margin: 20px 5% 0 6%;
+    margin: 20px 6% 0 4%;
     font-size: 0.8em;
     padding-right: 250px;
 	min-width: 475px;