Skip to content
Browse files

Merge pull request #266 from sammybahamas/searchresultfix

[fix bug 767454] Fixes ugliness of fallout from bug 765957 in search res...
  • Loading branch information...
2 parents 9f3039c + 7c5ec64 commit 6694970b52817918cf9cafe3380d717dc8eeba3d @tofumatt tofumatt committed Jun 22, 2012
View
3 apps/groups/templates/groups/group.html
@@ -107,7 +107,8 @@ <h1 class="span12">{{ _('Group: {name}')|f(name=group.name) }}</h1>
{% endif %}
</div>
- <div class="well">
+ <h3>{{ _('Group Members') }}</h3>
+ <div class="row">
{% for person in people %}
{{ search_result(person) }}
{% endfor %}
View
2 apps/phonebook/templates/phonebook/includes/search_result.html
@@ -1,4 +1,4 @@
-<div class="result">
+<div class="span6 result">
<a class="btn js-btn" href="{{ url('profile', profile.user.username) }}">
<div class="avatar">
<img class="profile-photo" src="{{ profile.photo_url() }}" alt="{{ _('Profile Photo') }}">
View
2 apps/phonebook/templates/phonebook/search.html
@@ -54,7 +54,7 @@
{% endtrans %}
{% else %}
{% for person in people %}
- <div class="span6">{{ search_result(person) }}</div>
+ {{ search_result(person) }}
{% else %}
<p id="not-found">
{% trans invite=url('invite') %}
View
14 media/css/base.css
@@ -364,15 +364,13 @@ a.btn {
margin:18px 20px;
}
-.search-page .result {
- margin-bottom:25px;
+.search-page .result a {
+ width: 340px;
+ height: 75px;
+ margin-bottom: 25px;
}
-.search-page .result a{
- width:340px;
-}
-
-.search-page .result .avatar img{
+.search-page .result .avatar img {
float:left;
height:70px;
width:70px;
@@ -397,6 +395,8 @@ a.btn {
font-size: 12px;
list-style: none;
text-align: left;
+ overflow: hidden;
+ width: 200px;
}
.clear {

0 comments on commit 6694970

Please sign in to comment.
Something went wrong with that request. Please try again.