make all navbar layouts wide style, redirect logo to challenge map, improve navbar collapse

This commit is contained in:
Quincy Larson
2015-04-24 01:31:59 -07:00
parent bf723b522b
commit e5e47136ea
8 changed files with 103 additions and 64 deletions

View File

@ -5,7 +5,7 @@
exports.index = function(req, res) { exports.index = function(req, res) {
if (req.user) { if (req.user) {
res.redirect('/challenges/') res.redirect('/map')
} else { } else {
res.render('home', { res.render('home', {
title: 'Learn to Code JavaScript and get a Coding Job by Helping Nonprofits' title: 'Learn to Code JavaScript and get a Coding Job by Helping Nonprofits'

View File

@ -273,11 +273,6 @@ ul {
height: 30px; height: 30px;
margin-top: -5px; margin-top: -5px;
} }
@media (min-width: 767px) and (max-width: 890px) {
height: 30px;
margin-top: -5px;
}
} }
.navbar-right { .navbar-right {
@ -790,10 +785,52 @@ iframe.iphone {
transition: background .2s ease-in-out, border .2s ease-in-out; transition: background .2s ease-in-out, border .2s ease-in-out;
} }
@media (max-width: 991px) {
.navbar-header {
float: none;
}
.navbar-toggle {
display: block;
}
.navbar-collapse.collapse {
display: none !important;
}
.navbar-nav {
float: none !important;
margin: 7.5px -15px;
}
.navbar-nav > li {
float: none;
}
.navbar-nav > li > a {
padding-top: 10px;
padding-bottom: 10px;
}
.navbar-text {
float: none;
margin: 15px 0;
}
/* since 3.1.0 */
.navbar-collapse.collapse.in {
display: block !important;
}
.collapsing {
overflow: hidden !important;
}
}
.hamburger { .hamburger {
width: 80px; width: 80px;
padding-left: 0px; padding-left: 0px;
padding-right: 0px; padding-right: 8px;
margin-left: 0px; margin-left: 0px;
margin-right: 2px; margin-right: 2px;
text-align:left; text-align:left;
@ -804,7 +841,7 @@ iframe.iphone {
line-height: 0.75em; line-height: 0.75em;
margin-top: 10px; margin-top: 10px;
font-size: 16px; font-size: 16px;
margin-left: -5px; margin-left: -8px;
} }
.tight-h3 { .tight-h3 {

View File

@ -8,10 +8,13 @@ block content
h1 #{username}'s portfolio h1 #{username}'s portfolio
.panel-body .panel-body
if (user && user.profile.username === username) if (user && user.profile.username === username)
.col-xs-12 .row.text-center
.text-center .col-xs-12.col-sm-10.col-sm-offset-1
a.btn.btn-big.btn-primary(href="/account") Update my portfolio page or manage my account a.btn.btn-big.btn-primary.btn-block(href="/account") Update my portfolio page or manage my account
br .spacer
.col-xs-12.col-sm-10.col-sm-offset-1
a.btn.btn-big.btn-success.btn-block(href="/signout") Sign out of Free Code Camp
.spacer
.row .row
.col-xs-12 .col-xs-12
.col-xs-12.col-sm-12.col-md-5 .col-xs-12.col-sm-12.col-md-5

View File

@ -6,7 +6,7 @@ html(ng-app='profileValidation', lang='en')
body.no-top-and-bottom-margins.full-screen-body-background body.no-top-and-bottom-margins.full-screen-body-background
include partials/css-cdns include partials/css-cdns
include partials/navbar-wide include partials/navbar
include partials/flash include partials/flash
block content block content
include partials/footer include partials/footer

View File

@ -5,7 +5,7 @@ html(ng-app='profileValidation', lang='en')
!= css('main') != css('main')
body.top-and-bottom-margins body.top-and-bottom-margins
include partials/css-cdns include partials/css-cdns
include partials/navbar-narrow include partials/navbar
.container .container
include partials/flash include partials/flash
block content block content

View File

@ -1 +0,0 @@

View File

@ -1,2 +0,0 @@
nav.navbar.navbar-default.navbar-fixed-top.nav-height
include ./navbar

View File

@ -1,4 +1,5 @@
.navbar-header nav.navbar.navbar-default.navbar-fixed-top.nav-height
.navbar-header
button.hamburger.navbar-toggle(type='button', data-toggle='collapse', data-target='.navbar-collapse') button.hamburger.navbar-toggle(type='button', data-toggle='collapse', data-target='.navbar-collapse')
.col-xs-6 .col-xs-6
span.hamburger-text Menu span.hamburger-text Menu
@ -9,12 +10,13 @@
span.icon-bar span.icon-bar
a.navbar-brand(href='/') a.navbar-brand(href='/')
img.img-responsive.nav-logo(src='https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg.gz', alt='learn to code javascript at Free Code Camp logo') img.img-responsive.nav-logo(src='https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg.gz', alt='learn to code javascript at Free Code Camp logo')
.collapse.navbar-collapse .collapse.navbar-collapse
ul.nav.navbar-nav.navbar-right.hamburger-dropdown ul.nav.navbar-nav.navbar-right.hamburger-dropdown
li
a(href='/challenges') Next Challenge
li li
a(href='/map') Map a(href='/map') Map
if (user && user.sentSlackInvite) if (user && user.sentSlackInvite)
li li
a(href='/chat', target='_blank') Chat a(href='/chat', target='_blank') Chat
@ -37,7 +39,7 @@
else else
a(href='/account') [ #{user.progressTimestamps.length} ] a(href='/account') [ #{user.progressTimestamps.length} ]
.hidden-xs .hidden-xs.hidden-sm
if user.profile.picture if user.profile.picture
if (user.profile.username) if (user.profile.username)
a(href='/' + user.profile.username) a(href='/' + user.profile.username)