aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon <simon@kisikew.org>2012-03-26 00:02:51 -0700
committerSimon <simon@kisikew.org>2012-03-26 00:02:51 -0700
commit5b3fe48ec675541fb7bbc3689229056ae840ac14 (patch)
tree042ced4bf647cafe726ad2108c07d7455321449c
parent37f02424f801b3132b75b39d4132f35025667a75 (diff)
parent7de8e15ca452e1118807c499ba8b8b1765214821 (diff)
downloadvolse-hubzilla-5b3fe48ec675541fb7bbc3689229056ae840ac14.tar.gz
volse-hubzilla-5b3fe48ec675541fb7bbc3689229056ae840ac14.tar.bz2
volse-hubzilla-5b3fe48ec675541fb7bbc3689229056ae840ac14.zip
Merge pull request #170 from simonlnu/master
fix search box in dispys
-rw-r--r--view/theme/dispy-dark/communityhome.tpl2
-rw-r--r--view/theme/dispy-dark/style.css11
-rw-r--r--view/theme/dispy/communityhome.tpl2
-rw-r--r--view/theme/dispy/style.css15
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;