gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(nav): Apply correct classes and style to nav profile (#16170)

Browse Source
This commit is contained in:
Onel Harrison
2017-12-10 12:23:03 -05:00
committed by mrugesh mohapatra
parent 383a0d0f5f
commit 3653c3d385
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/less/main.less
View File

@ -651,6 +651,11 @@ hr {
margin-right: -20px; margin-right: -20px;
} }
.public-profile-img {
height: 200px;
width: 200px;
}
.profile-social-icons { .profile-social-icons {
margin-left: 8px; margin-left: 8px;
} }

4
server/views/account/show.jade
View File

@ -24,9 +24,9 @@ block content
.row .row
.col-xs-12.col-sm-10.col-sm-offset-1.col-md-8.col-md-offset-2.text-center .col-xs-12.col-sm-10.col-sm-offset-1.col-md-8.col-md-offset-2.text-center
if picture if picture
img.img-center.img-responsive.public-profile-img(src=picture) img.img-center.img-responsive.public-profile-img.border-radius-5(src=picture)
else else
img.img-center.img-responsive.public-profile-img(src='https://s3.amazonaws.com/freecodecamp/camper-image-placeholder.png') img.img-center.img-responsive.public-profile-img.border-radius-5(src='https://s3.amazonaws.com/freecodecamp/camper-image-placeholder.png')
h1.text-center.negative-5.profile-social-icons h1.text-center.negative-5.profile-social-icons
if (twitter) if (twitter)
a.fa.fa-twitter-square.text-primary(title="@#{username}'s Twitter Profile", href='https://twitter.com/' + twitter, target='_blank') a.fa.fa-twitter-square.text-primary(title="@#{username}'s Twitter Profile", href='https://twitter.com/' + twitter, target='_blank')

2
server/views/layout.jade
View File

@ -7,6 +7,6 @@ html(lang='en')
include partials/scripts include partials/scripts
include partials/navbar include partials/navbar
include partials/flash include partials/flash
.container .app-content.app-centered
block content block content
include partials/footer include partials/footer

12
server/views/partials/navbar.jade
View File

@ -30,10 +30,10 @@ nav.navbar.navbar-default.navbar-static-top.nav-height
li li
a(href='/signin') Sign In a(href='/signin') Sign In
else else
li.avatar-points li.nav-avatar
a(href='/settings') a(href='/settings')
span.brownie-points-nav span
span.hidden-md.hidden-lg #{user.username} span.nav-username.hidden-md.hidden-lg #{user.username}
span.brownie-points [ #{user.points} ] span.nav-points [ #{user.points} ]
span.hidden-xs.hidden-sm.avatar span.hidden-xs.hidden-sm(style='height:0')
img.profile-picture.float-right(src='#{user.picture}') img.nav-picture.float-right(src='#{user.picture}')