Merge branch 'h3yduck-fix-profile-pic-bug'

This commit is contained in:
Nick Winter 2015-02-06 18:10:25 -08:00
commit de89e84c1e
2 changed files with 7 additions and 2 deletions
app
styles/common
templates

View file

@ -117,9 +117,14 @@
color: black
border-bottom: #32281e 1px solid
img
.img-circle
background-position: center
background-size: cover
border: #e3be7a 8px solid
width: 98px
height: 98px // Includes the border
display: inline-block
vertical-align: middle
&:hover
box-shadow: 0 0 20px #e3be7a

View file

@ -26,7 +26,7 @@ block header
li.user-dropdown-header
span.user-level= me.level()
a(href="/user/#{me.getSlugOrID()}")
img.img-circle(src="#{me.getPhotoURL()}" alt="")
div.img-circle(style="background-image: url(#{me.getPhotoURL()})")
h3=me.displayName()
li
a(href="/user/#{me.getSlugOrID()}" data-i18n="nav.profile")