aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarijus <mario@mariovavti.com>2015-01-20 21:10:41 +0100
committermarijus <mario@mariovavti.com>2015-01-20 21:10:41 +0100
commit5ee815b2fa0b46864972a60e0171e14f91fbd2b5 (patch)
treeb16b6058815bad7f9608643305ac11b9fe647963
parent33380b3c3066bab54320781f15baf7130f5e0b3c (diff)
downloadvolse-hubzilla-5ee815b2fa0b46864972a60e0171e14f91fbd2b5.tar.gz
volse-hubzilla-5ee815b2fa0b46864972a60e0171e14f91fbd2b5.tar.bz2
volse-hubzilla-5ee815b2fa0b46864972a60e0171e14f91fbd2b5.zip
satisfy the floated images
-rw-r--r--view/css/bootstrap-red.css2
-rw-r--r--view/js/autocomplete.js2
-rwxr-xr-xview/tpl/profile_vcard.tpl2
3 files changed, 3 insertions, 3 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 0c2d30284..5c9831907 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -41,7 +41,7 @@ nav .dropdown-menu .contactname {
nav .dropdown-menu li a {
overflow: hidden;
text-overflow: ellipsis;
- line-height: 1em;
+ //line-height: 1em;
padding: 5px 10px;
}
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 2fcf7000b..0e2392976 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -56,7 +56,7 @@ function contact_format(item) {
var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick)
if(typeof desc === 'undefined') desc = '';
if(desc) desc = ' ('+desc+')';
- return "<div class='{0}' title='{4}'><img src='{1}'><b>{2}</b><br>{3}</div>".format(item.taggable, item.photo, item.name, desc, item.link)
+ return "<div class='{0}' title='{4}'><img src='{1}'><b>{2}</b><br>{3}<div class='clear'></div></div>".format(item.taggable, item.photo, item.name, desc, item.link)
}
else
return "<div>"+item.text+"</div>"
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 6904c2fec..bff3148f3 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -6,7 +6,7 @@
<ul class="dropdown-menu" role="menu">
{{foreach $profile.menu.entries as $e}}
<li>
- <a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
+ <a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}<div class='clear'></div></a>
</li>
{{/foreach}}
<li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>