Skip to content

Commit

Permalink
Merge branch 'hovercard-render-fix' into diasp0ra.ca-2.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Pistos committed Mar 29, 2012
2 parents fd5c1d9 + 85ca11a commit 6693428
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 10 deletions.
22 changes: 13 additions & 9 deletions app/views/layouts/_header.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,19 @@

#hovercard_container
#hovercard
%img.avatar
%h4
%a.person
%p.handle
#hovercard_dropdown_container

.hovercard_footer
.footer_container
.hashtags
%table
%tr
%td
%img.avatar
%td
%h4
%a.person
%p.handle
#hovercard_dropdown_container
%tr
.hovercard_footer
.footer_container
.hashtags

%ul#user_menu.dropdown
%li
Expand Down
4 changes: 3 additions & 1 deletion public/stylesheets/sass/hovercard.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
bottom: 25px;
};

td {
padding: 0px;
}

h4 {
margin-bottom: 0px;
Expand Down Expand Up @@ -82,7 +85,6 @@
z-index: 10;

min-width: 250px;
max-width: 400px;

padding: 10px {
top: 5px;
Expand Down

0 comments on commit 6693428

Please sign in to comment.