got navbar button looking right
parent
c8d2be67c7
commit
4ede5662b9
|
@ -225,7 +225,6 @@ ul {
|
||||||
}
|
}
|
||||||
|
|
||||||
.navbar {
|
.navbar {
|
||||||
height: 40px;
|
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -237,10 +236,6 @@ ul {
|
||||||
text-decoration: line-through;
|
text-decoration: line-through;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dropdown-toggle {
|
|
||||||
margin-top: -5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn-social {
|
.btn-social {
|
||||||
width: 250px;
|
width: 250px;
|
||||||
margin: auto;
|
margin: auto;
|
||||||
|
@ -282,7 +277,7 @@ ul {
|
||||||
background-image: linear-gradient(#ffcc4d, #ffac33);
|
background-image: linear-gradient(#ffcc4d, #ffac33);
|
||||||
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#ffcc4d, endColorstr=#ffac33, GradientType=0)";
|
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#ffcc4d, endColorstr=#ffac33, GradientType=0)";
|
||||||
border-color: #f1a02a;
|
border-color: #f1a02a;
|
||||||
color: #292f33;
|
color: #292f33 !important;
|
||||||
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
|
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
|
||||||
}
|
}
|
||||||
.signup-btn:hover, .signup-btn:focus {
|
.signup-btn:hover, .signup-btn:focus {
|
||||||
|
@ -290,7 +285,7 @@ ul {
|
||||||
background-image: linear-gradient(#ffcc4d, #e99110);
|
background-image: linear-gradient(#ffcc4d, #e99110);
|
||||||
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#ffcc4d, endColorstr=#e99110, GradientType=0)";
|
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#ffcc4d, endColorstr=#e99110, GradientType=0)";
|
||||||
border-color: #ec8b11;
|
border-color: #ec8b11;
|
||||||
color: #292f33;
|
color: #292f33 !important;
|
||||||
}
|
}
|
||||||
.signup-btn:active {
|
.signup-btn:active {
|
||||||
background-color: #f2a330;
|
background-color: #f2a330;
|
||||||
|
@ -359,7 +354,19 @@ thead {
|
||||||
color: #eee;
|
color: #eee;
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
margin-top: -5px;
|
margin-top: -5px;
|
||||||
|
margin-bottom: -5px;
|
||||||
}
|
}
|
||||||
.navbar-toggle {
|
.navbar-toggle {
|
||||||
color: #eee;
|
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;
|
||||||
|
}
|
|
@ -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')
|
img.img-responsive.nav-logo(src='https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg')
|
||||||
.collapse.navbar-collapse
|
.collapse.navbar-collapse
|
||||||
ul.nav.navbar-nav.navbar-right
|
ul.nav.navbar-nav.navbar-right
|
||||||
if !user
|
|
||||||
a.btn.btn-primary.btn-nav.btn-sm(href='/login') Sign in
|
|
||||||
li
|
li
|
||||||
a(href='/') Challenges
|
a(href='/') Challenges
|
||||||
- if (cc && cc[1] < 1)
|
- 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
|
a(href='http://forum.freecodecamp.com') Forum
|
||||||
li
|
li
|
||||||
a(href='/learn-to-code') About
|
a(href='/learn-to-code') About
|
||||||
if user
|
|
||||||
li
|
|
||||||
a(href='/profile') [ #{user.points} ]
|
|
||||||
if !user
|
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
|
else
|
||||||
|
li
|
||||||
|
a(href='/account') [ #{user.points} ]
|
||||||
|
.visible-md.visible-sm
|
||||||
if user.profile.picture
|
if user.profile.picture
|
||||||
a(href='/profile')
|
a(href='/account')
|
||||||
img.profile-picture.float-right(src='#{user.profile.picture}')
|
img.profile-picture.float-right(src='#{user.profile.picture}')
|
||||||
else
|
else
|
||||||
a(href='/profile')
|
a(href='/account')
|
||||||
img.profile-picture.float-right(src='#{user.gravatar(60)}')
|
img.profile-picture.float-right(src='#{user.gravatar(60)}')
|
Loading…
Reference in New Issue