Merge pull request #169 from git-marijus/master

pimp up the searchbar a little and hoping it is the right way to do it...
This commit is contained in:
friendica 2013-10-09 15:42:00 -07:00
commit a0160e9a6b
2 changed files with 12 additions and 16 deletions

View File

@ -2032,33 +2032,29 @@ a.mail-list-link {
#nav-searchbar { #nav-searchbar {
float: right; float: right;
margin-top: 3px; margin-top: 2px;
} }
#nav-search-spinner { #nav-search-spinner {
float: right; float: right;
margin: 12px 12px 0px 0px; margin: 12px 12px 0px 0px;
color: #fff;
} }
#nav-search-text:hover { #nav-search-text:hover,
background-color: #FFF; #nav-search-text:focus {
background-color: #fff;
color: #000; color: #000;
} }
#nav-search-text { #nav-search-text {
margin-top: -1px; height: 20px;
font-size: 0.8em; padding: 0px 5px 0px 5px;
border-radius: 14px; font-size: 0.9em;
border-radius: 10px;
border: none; border: none;
background-color: $search_background; background-color: $search_background;
color: #eec; transition: background-color 300ms ease 0s;
}
/* this doesn't seem to work */
#nav-search-text::-moz-placeholder { color: #444; }
#nav-search-text::-webkit-input-placeholder {
color: #444 !important;
} }
#nav-user-linkmenu img { #nav-user-linkmenu img {

View File

@ -136,7 +136,7 @@
<li id="nav-searchbar"> <li id="nav-searchbar">
<form method="get" action="search"> <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> </form>
</li> </li>
<div id="nav-search-spinner"></div> <div id="nav-search-spinner"></div>