fix(nav): Apply correct classes and style to nav profile (freeCodeCam…

…p#16170)
drillbits · Dec 10, 2017 · 3653c3d · 3653c3d
1 parent 383a0d0
commit 3653c3d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/client/less/main.less b/client/less/main.less
@@ -651,6 +651,11 @@ hr {
   margin-right: -20px;
 }
 
+.public-profile-img {
+  height: 200px;
+  width: 200px;
+}
+
 .profile-social-icons {
   margin-left: 8px;
 }

diff --git a/server/views/account/show.jade b/server/views/account/show.jade
@@ -24,9 +24,9 @@ block content
     .row
         .col-xs-12.col-sm-10.col-sm-offset-1.col-md-8.col-md-offset-2.text-center
             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
-                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
                 if (twitter)
                     a.fa.fa-twitter-square.text-primary(title="@#{username}'s Twitter Profile", href='https://twitter.com/' + twitter, target='_blank')

diff --git a/server/views/layout.jade b/server/views/layout.jade
@@ -7,6 +7,6 @@ html(lang='en')
     include partials/scripts
     include partials/navbar
     include partials/flash
-    .container
+    .app-content.app-centered
       block content
     include partials/footer
diff --git a/server/views/partials/navbar.jade b/server/views/partials/navbar.jade
@@ -30,10 +30,10 @@ nav.navbar.navbar-default.navbar-static-top.nav-height
                 li
                     a(href='/signin') Sign In
             else
-                li.avatar-points
+                li.nav-avatar
                   a(href='/settings')
-                    span.brownie-points-nav
-                      span.hidden-md.hidden-lg #{user.username}
-                      span.brownie-points [&thinsp;#{user.points}&thinsp;]
-                    span.hidden-xs.hidden-sm.avatar
-                      img.profile-picture.float-right(src='#{user.picture}')
+                    span
+                      span.nav-username.hidden-md.hidden-lg #{user.username}
+                      span.nav-points [&thinsp;#{user.points}&thinsp;]
+                    span.hidden-xs.hidden-sm(style='height:0')
+                      img.nav-picture.float-right(src='#{user.picture}')