greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

got navbar button looking right

pull/5/head
Michael Q Larson 2014-12-30 12:38:45 -08:00
parent c8d2be67c7
commit 4ede5662b9
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
public/css/main.less
View File

@ -225,7 +225,6 @@ ul {
}
.navbar {
height: 40px;
white-space: nowrap;
}
@ -237,10 +236,6 @@ ul {
text-decoration: line-through;
}
.dropdown-toggle {
margin-top: -5px;
}
.btn-social {
width: 250px;
margin: auto;
@ -282,7 +277,7 @@ ul {
background-image: linear-gradient(#ffcc4d, #ffac33);
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#ffcc4d, endColorstr=#ffac33, GradientType=0)";
border-color: #f1a02a;
color: #292f33;
color: #292f33 !important;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
}
.signup-btn:hover, .signup-btn:focus {
@ -290,7 +285,7 @@ ul {
background-image: linear-gradient(#ffcc4d, #e99110);
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#ffcc4d, endColorstr=#e99110, GradientType=0)";
border-color: #ec8b11;
color: #292f33;
color: #292f33 !important;
}
.signup-btn:active {
background-color: #f2a330;
@ -359,7 +354,19 @@ thead {
color: #eee;
font-size: 20px;
margin-top: -5px;
margin-bottom: -5px;
}
.navbar-toggle {
color: #eee;
}
.navbar-right {
background-color: #4a2b0f;
text-align: center;
}
.signup-btn-nav {
margin-top:-2px !important;
padding-top: 10px !important;
padding-bottom: 10px !important;
}

23
views/partials/navbar.jade
View File

@ -11,8 +11,6 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
img.img-responsive.nav-logo(src='https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg')
.collapse.navbar-collapse
ul.nav.navbar-nav.navbar-right
if !user
a.btn.btn-primary.btn-nav.btn-sm(href='/login') Sign in
li
a(href='/') Challenges
- if (cc && cc[1] < 1)
@ -29,15 +27,16 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
a(href='http://forum.freecodecamp.com') Forum
li
a(href='/learn-to-code') About
if user
li
a(href='/profile') [&nbsp;#{user.points}&nbsp;]
if !user
a.btn.signup-btn.btn-nav.btn-sm(href='/login') Sign in
li
a.btn.signup-btn.signup-btn-nav(href='/login') Sign in
else
if user.profile.picture
a(href='/profile')
img.profile-picture.float-right(src='#{user.profile.picture}')
else
a(href='/profile')
img.profile-picture.float-right(src='#{user.gravatar(60)}')
li
a(href='/account') [&nbsp;#{user.points}&nbsp;]
.visible-md.visible-sm
if user.profile.picture
a(href='/account')
img.profile-picture.float-right(src='#{user.profile.picture}')
else
a(href='/account')
img.profile-picture.float-right(src='#{user.gravatar(60)}')