gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

start working on redoing navbar and mobile footer

Browse Source
This commit is contained in:
Michael Q Larson
2014-12-29 22:40:27 -08:00
parent c896584b21
commit 049e2d0a8e
5 changed files with 75 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
public/css/main.less
View File

@ -54,15 +54,6 @@ h1, h2, h3, h4, h5, h6, p, li {
padding-bottom: 5px; padding-bottom: 5px;
} }
// Navbar
// -------------------------
.navbar-nav img {
width: 30px;
height: 30px;
margin: -15px 15px -15px;
}
// Alerts // Alerts
// ------------------------- // -------------------------
@ -95,11 +86,6 @@ h1, h2, h3, h4, h5, h6, p, li {
height: 100px; height: 100px;
} }
.navbar-icon {
height: 40px;
margin-top: -10px;
}
/**/ /**/
.btn-cta { .btn-cta {
@ -354,12 +340,6 @@ thead {
font-size: 150%; font-size: 150%;
} }
.hamburger {
background-color: #ddd;
text-align: left;
font-size: 20px;
}
.nowrap { .nowrap {
white-space: nowrap; white-space: nowrap;
} }
@ -367,4 +347,15 @@ thead {
.big-break { .big-break {
margin-top: 30px; margin-top: 30px;
margin-bottom: 30px; margin-bottom: 30px;
}
.profile-picture {
height: 50px;
width: 50px;
}
.navbar-nav a {
color: #ddd;
font-size: 20px;
margin-top: -5px;
} }

7
views/account/profile.jade
View File

@ -33,8 +33,13 @@ block content
span.ion-edit span.ion-edit
| Update my profile | Update my profile
.panel .panel
.big-break
.container.text-center .container.text-center
a.btn.btn-cta.signup-btn.big-break(href='/') Take me to my current challenge a.btn.btn-cta.signup-btn(href='/') Take me to my current challenge
.big-break
.container.text-center
a.btn.btn-default.btn-big(href='/logout') Sign out
.big-break
- if (!user.google || !user.facebook || !user.github || !user.linkedin || !user.twitter) - if (!user.google || !user.facebook || !user.github || !user.linkedin || !user.twitter)
.panel .panel

5
views/layout.jade
View File

@ -18,7 +18,8 @@ html
include partials/flash include partials/flash
block content block content
!= js('application') include partials/footer
!= js('application')
script. script.
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@ -27,4 +28,4 @@ script.
ga('create', 'UA-55446531-1', 'auto'); ga('create', 'UA-55446531-1', 'auto');
ga('require', 'displayfeatures'); ga('require', 'displayfeatures');
ga('send', 'pageview'); ga('send', 'pageview');
script(src="//cdn.optimizely.com/js/999692993.js") script(src="//cdn.optimizely.com/js/999692993.js")

21
views/partials/footer.jade
View File

@ -0,0 +1,21 @@
.visible-xs.visible-sm
nav.navbar.navbar-bottom.nav.navbar-nav
ul.text-center
li
a(href='/') Challenges
- if (cc && cc[1] < 1)
li
a(href='/challenges/1') Chat
- else
li
a(href='http://chat.freecodecamp.com') Chat
- if (cc && cc[2] < 1)
li
a(href='/challenges/2') Forum
- else
li
a(href='http://forum.freecodecamp.com') Forum
li
a(href='/learn-to-code') Buzz
li
a(href='/account') Account

91
views/partials/navbar.jade
View File

@ -1,57 +1,34 @@
.navbar.navbar-default.navbar-fixed-top.nav-height nav.navbar.navbar-fixed-top
.container .container
.navbar-header .navbar-header
if user a.navbar-brand(href='/')
button.navbar-toggle(type='button', data-toggle='collapse', data-target='.navbar-collapse') img.img-responsive.nav-logo(src='https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg')
span.sr-only Toggle navigation #navbar
span.icon-bar ul.nav.navbar-nav.navbar-right.visible-md.visible-lg
span.icon-bar li
span.icon-bar a(href='/') Challenges
a.navbar-brand(href='/') - if (cc && cc[1] < 1)
img.img-responsive.nav-logo(src='https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg') li
.collapse.navbar-collapse a(href='/challenges/1') Chat
ul.nav.navbar-nav.navbar-right - else
if !user li
a.btn.signup-btn.btn-nav.btn-sm(href='/login') Sign in a(href='http://chat.freecodecamp.com') Chat
else - if (cc && cc[2] < 1)
li.dropdown(class=title=='Account Management'?'active':undefined) li
a.dropdown-toggle.text-center(href='#', data-toggle='dropdown') a(href='/challenges/2') Forum
if user.profile.picture - else
img(src='#{user.profile.picture}') li
else a(href='http://forum.freecodecamp.com') Forum
img(src='#{user.gravatar(60)}') li
| #{user.profile.name || user.email || user.id}&nbsp;[&nbsp;#{user.points}&nbsp;] a(href='/learn-to-code') Buzz
i.caret li
ul.dropdown-menu.text-right a(href='/account') Account
li.hamburger if !user
a(href='/') a.btn.signup-btn.btn-nav.btn-sm(href='/login') Sign in
span.ion-map else
| My Challenges if user.profile.picture
- if (cc && cc[1] < 1) img.profile-picture.float-right(src='#{user.profile.picture}')
li.hamburger.disabled | [&nbsp;#{user.points}&nbsp;]
a(href='https://gitter.im/FreeCodeCamp/FreeCodeCamp', target='_blank') else
span.ion-coffee img.profile-picture.float-right(src='#{user.gravatar(60)}')
| Chat Room (do Challenge 1 first) | [&nbsp;#{user.points}&nbsp;]
- else
li.hamburger
a(href='https://gitter.im/FreeCodeCamp/FreeCodeCamp', target='_blank')
span.ion-coffee
| Chat Room
- if (cc && cc[2] < 1)
li.hamburger.disabled
a(href='http://forum.freecodecamp.com/', target='_blank')
span.ion-planet
| Forum (do Challenge 2 first)
- else
li.hamburger
a(href='http://forum.freecodecamp.com/', target='_blank')
span.ion-planet
| Forum
li.hamburger
a(href='/account')
span.ion-person
| My Account
li.hamburger
a(href='/logout')
span.ion-log-out
| Logout