From 2147ffa48734e50c9df1ea91ce100bf5336eacc2 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 25 Mar 2012 22:47:56 -0400
Subject: [PATCH 1/2] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  typo datarry -> datarray

* master:

From 7de8e15ca452e1118807c499ba8b8b1765214821 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 26 Mar 2012 03:01:13 -0400
Subject: [PATCH 2/2] fix the search box

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy-dark/communityhome.tpl |  2 +-
 view/theme/dispy-dark/style.css         | 11 ++++++++---
 view/theme/dispy/communityhome.tpl      |  2 +-
 view/theme/dispy/style.css              | 15 ++++++++++++---
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl
index 0659ebe20..0838fc757 100644
--- a/view/theme/dispy-dark/communityhome.tpl
+++ b/view/theme/dispy-dark/communityhome.tpl
@@ -1,4 +1,4 @@
-{{ if $lastusers_title }}
+{{ if $page }}
 <h3>PostIt to Friendica</h3>
 <div style="padding-left: 8px;"><span >Post to Friendica from anywhere by bookmarking this <a href="$fostitJS" title="PostIt">Link</a>.</span></div>
 {{ endif }}
diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 6292da6d2..e47eb22ed 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -491,13 +491,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 	background: transparent url(icons.png) -190px -60px no-repeat;
 }
 .search-box {
-	margin: 5px;
-	width: 65%;
+	display: inline-block;
 	height: 40px;
-	z-index: 100;
+	margin: 12px 0 0 -3px;
+	position: relative;
+	right: -12px;
+	top: 17px;
+	width: 0;
 }
 #search-text {
 	border: 1px #2e2f2e solid;
+	background: #2e2f2e;
+	color: #eec;
 }
 .nav-ajax-update, .nav-ajax-left {
 	width: 30px;
diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl
index 0659ebe20..0838fc757 100644
--- a/view/theme/dispy/communityhome.tpl
+++ b/view/theme/dispy/communityhome.tpl
@@ -1,4 +1,4 @@
-{{ if $lastusers_title }}
+{{ if $page }}
 <h3>PostIt to Friendica</h3>
 <div style="padding-left: 8px;"><span >Post to Friendica from anywhere by bookmarking this <a href="$fostitJS" title="PostIt">Link</a>.</span></div>
 {{ endif }}
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 116f88b31..7c80c8b5b 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -199,6 +199,10 @@ input[type=submit] {
 .action {
 	margin: 5px 0;
 }
+.tool {
+	margin: 5px 0;
+	list-style: none;
+}
 
 
 /**
@@ -483,13 +487,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 	background: transparent url(icons.png) -190px -60px no-repeat;
 }
 .search-box {
-	margin: 5px;
-	width: 65%;
+	display: inline-block;
 	height: 40px;
-	z-index: 100;
+	margin: 12px 0 0 -3px;
+	position: relative;
+	right: -12px;
+	top: 17px;
+	width: 0;
 }
 #search-text {
 	border: 1px #eec solid;
+	background: #eec;
+	color: #e2e33436;
 }
 .nav-ajax-update, .nav-ajax-left {
 	width: 30px;