aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-10-09 15:42:00 -0700
committerfriendica <info@friendica.com>2013-10-09 15:42:00 -0700
commita0160e9a6ba30993a98beb1cc14b68409ef1a592 (patch)
treee440eb482501c80a931a509057790e636fe26a51 /view
parent1e7034c4da11bd46cafad471de714ace3c0b5ab8 (diff)
parent9fd85bb289958de7aaaf994a11bd667b1bba5002 (diff)
downloadvolse-hubzilla-a0160e9a6ba30993a98beb1cc14b68409ef1a592.tar.gz
volse-hubzilla-a0160e9a6ba30993a98beb1cc14b68409ef1a592.tar.bz2
volse-hubzilla-a0160e9a6ba30993a98beb1cc14b68409ef1a592.zip
Merge pull request #169 from git-marijus/master
pimp up the searchbar a little and hoping it is the right way to do it...
Diffstat (limited to 'view')
-rw-r--r--view/theme/redbasic/css/style.css26
-rwxr-xr-xview/tpl/nav.tpl2
2 files changed, 12 insertions, 16 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 3b4252cee..1de3a71d3 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2032,33 +2032,29 @@ a.mail-list-link {
#nav-searchbar {
float: right;
- margin-top: 3px;
+ margin-top: 2px;
}
#nav-search-spinner {
float: right;
margin: 12px 12px 0px 0px;
+ color: #fff;
}
-#nav-search-text:hover {
- background-color: #FFF;
+#nav-search-text:hover,
+#nav-search-text:focus {
+ background-color: #fff;
color: #000;
}
#nav-search-text {
- margin-top: -1px;
- font-size: 0.8em;
- border-radius: 14px;
+ height: 20px;
+ padding: 0px 5px 0px 5px;
+ font-size: 0.9em;
+ border-radius: 10px;
border: none;
background-color: $search_background;
- color: #eec;
-}
-
-/* this doesn't seem to work */
-
-#nav-search-text::-moz-placeholder { color: #444; }
-#nav-search-text::-webkit-input-placeholder {
- color: #444 !important;
+ transition: background-color 300ms ease 0s;
}
#nav-user-linkmenu img {
@@ -3417,4 +3413,4 @@ margin-right: 50px;
.nav-icon {
font-size: 1.4em;
margin-right: 15px;
-} \ No newline at end of file
+}
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 3c6d260f5..01ba6620a 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -136,7 +136,7 @@
<li id="nav-searchbar">
<form method="get" action="search">
- <input id="nav-search-text" type="text" value="" placeholder="{{$nav.search.1}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" />
+ <input class="icon-search" id="nav-search-text" type="text" value="" placeholder="&#xf002;" name="search" title="{{$nav.search.3}}" onclick="this.submit();" />
</form>
</li>
<div id="nav-search-spinner"></div>