Merge branch 'master' of github.com:reality/depressionbot

This commit is contained in:
reality 2013-01-25 00:40:55 +00:00
commit dff1e21921
2 changed files with 2 additions and 1 deletions

View File

@ -205,6 +205,7 @@ span.nicks {
left: 0px; left: 0px;
top: 10px; top: 10px;
width: 100%; width: 100%;
word-wrap: break-word;
} }
div.imgwrap { div.imgwrap {
background-color: #000; background-color: #000;

View File

@ -51,7 +51,7 @@ block content
div.row.profile_row#profile_data div.row.profile_row#profile_data
div.span3 div.span3
if profile.avatar if profile.avatar
img.profile_avatar(src="#{profile.avatar}") img.profile_avatar.img-polaroid(src="#{profile.avatar}")
else else
img.profile_avatar(src="http://placehold.it/270x180&text=Hello,%20World") img.profile_avatar(src="http://placehold.it/270x180&text=Hello,%20World")
div.span9 div.span9