diff options
author | tommy tomson <thomas.bierey@gmx.de> | 2012-03-05 22:31:03 +0100 |
---|---|---|
committer | tommy tomson <thomas.bierey@gmx.de> | 2012-03-05 22:31:03 +0100 |
commit | a406c165810f23a5f8f91d49ede17d7d6b3cd775 (patch) | |
tree | a7394d0d7a620c532e83c5608f7a32e30f36d4b9 | |
parent | 092115ca4467e2e3b801956e86373162ff5ccf5d (diff) | |
download | volse-hubzilla-a406c165810f23a5f8f91d49ede17d7d6b3cd775.tar.gz volse-hubzilla-a406c165810f23a5f8f91d49ede17d7d6b3cd775.tar.bz2 volse-hubzilla-a406c165810f23a5f8f91d49ede17d7d6b3cd775.zip |
fixes
-rw-r--r-- | view/theme/diabook/icons/community.png | bin | 0 -> 475 bytes | |||
-rw-r--r--[-rwxr-xr-x] | view/theme/diabook/icons/globe.png | bin | 875 -> 1361 bytes | |||
-rw-r--r-- | view/theme/diabook/nav.tpl | 14 | ||||
-rw-r--r-- | view/theme/diabook/style.css | 17 |
4 files changed, 26 insertions, 5 deletions
diff --git a/view/theme/diabook/icons/community.png b/view/theme/diabook/icons/community.png Binary files differnew file mode 100644 index 000000000..7c91e8b75 --- /dev/null +++ b/view/theme/diabook/icons/community.png diff --git a/view/theme/diabook/icons/globe.png b/view/theme/diabook/icons/globe.png Binary files differindex bf27a8f3f..6bb9bc09d 100755..100644 --- a/view/theme/diabook/icons/globe.png +++ b/view/theme/diabook/icons/globe.png diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 34a37ad2e..284883ceb 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -53,7 +53,15 @@ <li class="empty">$emptynotifications</li> </ul> </li> - {{ endif }} + {{ endif }} + + {{ if $nav.search}} + <li id="search-box"> + <form method="get" action="$nav.search.0"> + <input id="search-text" class="nav-menu-search" type="text" value="" name="search"> + </form> + </li> + {{ endif }} <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a> <ul id="nav-site-menu" class="menu-popup"> @@ -61,6 +69,10 @@ {{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }} + + <li ><a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li> + + <li><a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li> {{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }} diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 06ddf6de1..913f2b641 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -91,6 +91,8 @@ background-image: url("../../../view/theme/diabook/icons/notify.png");} .icon.messages { background-image: url("../../../view/theme/diabook/icons/messages.png");} +.icon.community { + background-image: url("../../../view/theme/diabook/icons/community.png");} .icon.drop { background-image: url("../../../view/theme/diabook/icons/drop.png");} .icon.drophide { background-image: url("../../../view/theme/diabook/icons/drop.png");} @@ -526,7 +528,7 @@ header #banner a:hover { color: #ffffff; text-decoration: none; outline: none; - vertical-align: bottom; + vertical-align: middle; } header #banner #logo-img { height: 25px; @@ -610,12 +612,19 @@ nav #logo-text { margin-top: 3px; margin-right: 15px; } +nav .nav-menu-search { + position: relative; + + margin: 3px 17px; + margin-right: 0px; + height: 17px; +} nav .nav-menu-icon { position: relative; height: 22px; padding: 5px; - margin: 0px 12px; + margin: 0px 7px; -moz-border-radius: 5px 5px 0 0; -webkit-border-radius: 5px 5px 0 0; border-radius: 5px 5px 0 0; @@ -1329,9 +1338,9 @@ section { margin: 0px 2em 20px 0px; } #profile-jot-form #profile-jot-text { - height: 3.0em; + height: 2.0em; width: 99%; - font-size: 10px; + font-size: 15px; color: #999999; border: 1px solid #DDD; padding: 0.3em; |