From e3d1e8b16c302c8e7de871c347e6de4fd7a11ddd Mon Sep 17 00:00:00 2001 From: Mrugesh Mohapatra Date: Sat, 16 Dec 2017 11:42:36 +0530 Subject: [PATCH 1/2] fix(show): Make the user profile tab consistent --- server/views/partials/navbar.jade | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/server/views/partials/navbar.jade b/server/views/partials/navbar.jade index 725f71dae9..33f19b61db 100644 --- a/server/views/partials/navbar.jade +++ b/server/views/partials/navbar.jade @@ -31,10 +31,5 @@ nav.navbar.navbar-default.navbar-static-top.nav-height li a(href='/signin') Sign Up else - li.nav-avatar - a(href='/settings') - span - span.nav-username.hidden-md.hidden-lg #{user.username} - span.nav-points [ #{user.points} ] - span.hidden-xs.hidden-sm(style='height:0') - img.nav-picture.float-right(src='#{user.picture}') + li + a(href='/settings') My Profile From 94e808b15c1b84cce2fb31aa06f162c56dcbbe9c Mon Sep 17 00:00:00 2001 From: Mrugesh Mohapatra Date: Sat, 16 Dec 2017 11:51:54 +0530 Subject: [PATCH 2/2] fix(show): Move the order of tabs to be consistent --- server/views/partials/navbar.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/views/partials/navbar.jade b/server/views/partials/navbar.jade index 33f19b61db..0761d6fe1d 100644 --- a/server/views/partials/navbar.jade +++ b/server/views/partials/navbar.jade @@ -8,6 +8,8 @@ nav.navbar.navbar-default.navbar-static-top.nav-height img.img-responsive.nav-logo(src='https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg', alt='learn to code javascript at freeCodeCamp logo') .collapse.navbar-collapse ul.nav.navbar-nav.navbar-right.hamburger-dropdown + li + a(href='/map') Map li.dropdown a.dropdown-toggle(data-toggle='dropdown' role='button' href='#' aria-haspopup='true') Community ul.dropdown-menu @@ -23,8 +25,6 @@ nav.navbar.navbar-default.navbar-static-top.nav-height a(href='https://forum.freecodecamp.org/t/free-code-camp-city-based-local-groups/19574', target='_blank') In your city li a(href='/about') About - li - a(href='/map') Map li a(href='https://www.freecodecamp.org/donate', target='_blank') Donate if !user