From a0ee51b3db99df7e8a0f9868937a9812177af567 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 26 Mar 2012 14:18:39 -0400
Subject: [PATCH 1/2] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  add "similar interrest", "Friend Suggestions" and "Invite Friends" to right_aside, fixes in css
  marking quattro-green as extension of quattro and deleting the tpl files
  minor css fixes in diabook
  screenshot for darkzero-NS, same as darkzero
  added quaddro templates to quaddro-green
  language issues in enotify
  small fix in diabook :: add local friendica to right_aside
  comix screenshot
  diabook: small fix in theme_info array
  more theme screenshots
  themes: use duepuntozero tpls as default

* master:

From 3b9f0fd80194ffbde8b5667135237441ea2838e9 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 26 Mar 2012 14:19:59 -0400
Subject: [PATCH 2/2] fix dispy's nav element; fix colours in #search-text

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy-dark/style.css | 7 +++++--
 view/theme/dispy/style.css      | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index e47eb22ed1..5dba6b94c7 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -500,7 +500,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 	width: 0;
 }
 #search-text {
-	border: 1px #2e2f2e solid;
+	border: 1px #eec solid;
 	background: #2e2f2e;
 	color: #eec;
 }
@@ -713,7 +713,7 @@ aside #viewcontacts {
     width: 150px;   
 }
 #netsearch-box #search-submit {
-    margin: 5px 0px 0px 0px;
+    margin: 5px 5px 0px 0px;
 }
 .ttright {
 	margin: 0px 0px 0px 0px;
@@ -1046,6 +1046,9 @@ section {
 .shiny {
     background: #2e3436;
 }
+.wall-outside-wrapper .shiny {
+	border-radius: 5px;
+}
 .heart {
 	color: red;
 }
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 7c80c8b5bb..c591152c2d 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -217,7 +217,7 @@ input[type=submit] {
  * nav
  */
 nav {
-	height: 60px;
+	height: 80px;
 	display: block;
 	background-color: #2e3436;
 	color: #eeeeec;
@@ -497,8 +497,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 }
 #search-text {
 	border: 1px #eec solid;
-	background: #eec;
-	color: #e2e33436;
+	background: #2e3436;
+	color: #eec;
 }
 .nav-ajax-update, .nav-ajax-left {
 	width: 30px;