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

now have both full width layout and normal layout

Browse Source
This commit is contained in:
Michael Q Larson
2015-01-26 11:02:22 -08:00
parent ead9fe56d1
commit 48e535b9c5
9 changed files with 137 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/css/main.less
View File

@ -29,9 +29,14 @@ html {
min-height: 100%; min-height: 100%;
} }
body { body.top-and-bottom-margins {
padding-top: 80px;
margin-bottom: 60px;
}
body.no-top-and-bottom-margins {
padding-top: 50px; padding-top: 50px;
// margin-bottom: 60px; margin-bottom: 40px;
} }
h1, h2 { h1, h2 {

2
views/bonfire/bonfire.jade
View File

@ -1,4 +1,4 @@
extends ../layout extends ../layout-wide
block content block content
script(src='/js/lib/codemirror/lib/codemirror.js') script(src='/js/lib/codemirror/lib/codemirror.js')
script(src='/js/lib/codemirror/addon/edit/closebrackets.js') script(src='/js/lib/codemirror/addon/edit/closebrackets.js')

2
views/bonfire/show.jade
View File

@ -1,4 +1,4 @@
extends ../layout extends ../layout-wide
block content block content
script(src='/js/lib/codemirror/lib/codemirror.js') script(src='/js/lib/codemirror/lib/codemirror.js')

33
views/layout-wide.jade Normal file
View File

@ -0,0 +1,33 @@
doctype html
html(ng-app='profileValidation', lang='en')
head
script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js")
script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.8/angular.min.js")
script(src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.min.js")
link(rel='shortcut icon', href='//s3.amazonaws.com/freecodecamp/favicon.ico')
link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css')
link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css')
link(rel='stylesheet', href='//code.ionicframework.com/ionicons/2.0.0/css/ionicons.min.css')
include partials/meta
title #{title} | Free Code Camp
meta(charset='utf-8')
meta(http-equiv='X-UA-Compatible', content='IE=edge')
meta(name='viewport', content='width=device-width, initial-scale=1.0')
meta(name='csrf-token', content=_csrf)
!= css('main')
body.no-top-and-bottom-margins
include partials/navbar-wide
include partials/flash
block content
include partials/footer
!= js('application')
script.
(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),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-55446531-1', 'auto');
ga('require', 'displayfeatures');
ga('send', 'pageview');
script(src="//cdn.optimizely.com/js/999692993.js")

11
views/layout.jade
View File

@ -16,12 +16,13 @@ html(ng-app='profileValidation', lang='en')
meta(name='csrf-token', content=_csrf) meta(name='csrf-token', content=_csrf)
!= css('main') != css('main')
body body.top-and-bottom-margins
include partials/navbar include partials/navbar-narrow
include partials/flash .container
block content include partials/flash
block content
include partials/footer include partials/footer
!= js('application') != 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),

3
views/partials/navbar-narrow.jade Normal file
View File

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

2
views/partials/navbar-wide.jade Normal file
View File

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

59
views/partials/navbar.jade
View File

@ -1,45 +1,44 @@
nav.navbar.navbar-default.navbar-fixed-top.nav-height .navbar-header
.navbar-header button.navbar-toggle(type='button', data-toggle='collapse', data-target='.navbar-collapse')
button.navbar-toggle(type='button', data-toggle='collapse', data-target='.navbar-collapse')
span.sr-only Toggle navigation span.sr-only Toggle navigation
span.icon-bar span.icon-bar
span.icon-bar span.icon-bar
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', alt='learn to code javascript at Free Code Camp logo') img.img-responsive.nav-logo(src='https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg', 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
- if (!cc) - if (!cc)
li li
a(href='/challenges/0') Challenges a(href='/challenges/0') Challenges
- else - else
li li
a(href='/') Challenges a(href='/') Challenges
- if (!cc || (cc && cc[1] < 1)) - if (!cc || (cc && cc[1] < 1))
li li
a(href='/challenges/1') Chat a(href='/challenges/1') Chat
- else - else
li li
a(href='http://chat.freecodecamp.com' target='_blank') Chat a(href='http://chat.freecodecamp.com' target='_blank') Chat
- if (!cc || (cc && cc[2] < 1)) - if (!cc || (cc && cc[2] < 1))
li li
a(href='/challenges/2') Forum a(href='/challenges/2') Forum
- else - else
li li
a(href='http://forum.freecodecamp.com' target='_blank') Forum a(href='http://forum.freecodecamp.com' target='_blank') Forum
li li
a(href='/bonfires') Bonfires a(href='/bonfires') Bonfires
if !user if !user
li &nbsp; &nbsp; &nbsp; li &nbsp; &nbsp; &nbsp;
li li
a.btn.signup-btn.signup-btn-nav(href='/login') Sign in a.btn.signup-btn.signup-btn-nav(href='/login') Sign in
else else
li li
a(href='/account') [&nbsp;#{user.points}&nbsp;] a(href='/account') [&nbsp;#{user.points}&nbsp;]
.hidden-xs .hidden-xs
if user.profile.picture if user.profile.picture
a(href='/account') 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='/account') a(href='/account')
img.profile-picture.float-right(src='#{user.gravatar(60)}') img.profile-picture.float-right(src='#{user.gravatar(60)}')

145
views/resources/live-pair-programming.jade
View File

@ -1,91 +1,56 @@
doctype html extends ../layout-wide
html(ng-app='profileValidation', lang='en') block content
head include ../partials/navbar-wide
script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js") .panel.panel-primary
script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.8/angular.min.js") .panel-heading.landing-panel-heading.text-center Live Pair Programming
script(src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.min.js") .panel-body
link(rel='shortcut icon', href='//s3.amazonaws.com/freecodecamp/favicon.ico') .landing-panel-body.text-center
link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css') h2 We live pair program every Tuesday from 9 pm to 10 pm EST (Eastern Standard Time).
link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css') h2 Our next session will be January 27th, 2015 at 9 p.m. EST!
link(rel='stylesheet', href='//code.ionicframework.com/ionicons/2.0.0/css/ionicons.min.css') h2 Join the discussion in our &nbsp;
include ../partials/meta a(href="chat.freecodecamp.com", target="_blank") FreeCodeCamp chat room.
title #{title} | Free Code Camp h2 Watch the live stream below or on our &nbsp;
meta(charset='utf-8') a(href="http://twitch.tv/freecodecamp", target='_blank') Twitch.tv channel
meta(http-equiv='X-UA-Compatible', content='IE=edge') | .
meta(name='viewport', content='width=device-width, initial-scale=1.0') .row
meta(name='csrf-token', content=_csrf) .col-md-8.col-xs-12
!= css('main') .embed-responsive.embed-responsive-16by9
body iframe(src='http://www.twitch.tv/freecodecamp/embed', frameborder='0', scrolling='no')
block content .col-md-4.col-xs-12
include ../partials/navbar .visible-sm.visible-xs
.panel.panel-primary .embed-responsive.embed-responsive-16by9
.panel-heading.landing-panel-heading.text-center Live Pair Programming iframe(src='http://www.twitch.tv/freecodecamp/chat?popout=', frameborder='0', scrolling='no')
.panel-body .visible-md.visible-lg
.landing-panel-body.text-center .embed-responsive.embed-responsive-twitch-chat
h2 We live pair program every Tuesday from 9 pm to 10 pm EST (Eastern Standard Time). iframe(src='http://www.twitch.tv/freecodecamp/chat?popout=', frameborder='0', scrolling='no')
h2 Our next session will be January 27th, 2015 at 9 p.m. EST!
h2 Join the discussion in our &nbsp;
a(href="chat.freecodecamp.com", target="_blank") FreeCodeCamp chat room.
h2 Watch the live stream below or on our &nbsp;
a(href="http://twitch.tv/freecodecamp", target='_blank') Twitch.tv channel
| .
.row
.col-md-8.col-xs-12
.embed-responsive.embed-responsive-16by9
iframe(src='http://www.twitch.tv/freecodecamp/embed', frameborder='0', scrolling='no')
.col-md-4.col-xs-12
.visible-sm.visible-xs
.embed-responsive.embed-responsive-16by9
iframe(src='http://www.twitch.tv/freecodecamp/chat?popout=', frameborder='0', scrolling='no')
.visible-md.visible-lg
.embed-responsive.embed-responsive-twitch-chat
iframe(src='http://www.twitch.tv/freecodecamp/chat?popout=', frameborder='0', scrolling='no')
br br
.panel.panel-primary .panel.panel-primary
.panel-heading.landing-panel-heading.text-center Previous Live Pair Programming Sessions .panel-heading.landing-panel-heading.text-center Previous Live Pair Programming Sessions
.panel-body .panel-body
.landing-panel-body.text-center .landing-panel-body.text-center
.col-xs-12 .col-xs-12
.embed-responsive.embed-responsive-16by9.big-break .embed-responsive.embed-responsive-16by9.big-break
iframe.embed-responsive-item(src='//www.youtube.com/embed/_BErpDdmBOw') iframe.embed-responsive-item(src='//www.youtube.com/embed/_BErpDdmBOw')
h3.wrappable link: &nbsp; h3.wrappable link: &nbsp;
a(href="http://www.youtube.com/watch/_BErpDdmBOw") http://www.youtube.com/watch/_BErpDdmBOw a(href="http://www.youtube.com/watch/_BErpDdmBOw") http://www.youtube.com/watch/_BErpDdmBOw
.embed-responsive.embed-responsive-16by9.big-break .embed-responsive.embed-responsive-16by9.big-break
iframe.embed-responsive-item(src='//www.youtube.com/embed/Fn9HMn79KH0') iframe.embed-responsive-item(src='//www.youtube.com/embed/Fn9HMn79KH0')
h3.wrappable link: &nbsp; h3.wrappable link: &nbsp;
a(href="http://www.youtube.com/watch/Fn9HMn79KH0") http://www.youtube.com/watch/Fn9HMn79KH0 a(href="http://www.youtube.com/watch/Fn9HMn79KH0") http://www.youtube.com/watch/Fn9HMn79KH0
.embed-responsive.embed-responsive-16by9.big-break .embed-responsive.embed-responsive-16by9.big-break
iframe.embed-responsive-item(src='//www.youtube.com/embed/S7iRBZJwOAs') iframe.embed-responsive-item(src='//www.youtube.com/embed/S7iRBZJwOAs')
h3.wrappable link: &nbsp; h3.wrappable link: &nbsp;
a(href="http://www.youtube.com/watch/S7iRBZJwOAs") http://www.youtube.com/watch/S7iRBZJwOAs a(href="http://www.youtube.com/watch/S7iRBZJwOAs") http://www.youtube.com/watch/S7iRBZJwOAs
.embed-responsive.embed-responsive-16by9.big-break .embed-responsive.embed-responsive-16by9.big-break
iframe.embed-responsive-item(src='//www.youtube.com/embed/BHNRg39ZblE') iframe.embed-responsive-item(src='//www.youtube.com/embed/BHNRg39ZblE')
h3.wrappable link: &nbsp; h3.wrappable link: &nbsp;
a(href="http://www.youtube.com/watch/BHNRg39ZblE") http://www.youtube.com/watch/BHNRg39ZblE a(href="http://www.youtube.com/watch/BHNRg39ZblE") http://www.youtube.com/watch/BHNRg39ZblE
.embed-responsive.embed-responsive-16by9.big-break .embed-responsive.embed-responsive-16by9.big-break
iframe.embed-responsive-item(src='//www.youtube.com/embed/YDfkHlDmehA') iframe.embed-responsive-item(src='//www.youtube.com/embed/YDfkHlDmehA')
h3.wrappable link: &nbsp; h3.wrappable link: &nbsp;
a(href="http://www.youtube.com/watch/YDfkHlDmehA") http://www.youtube.com/watch/YDfkHlDmehA a(href="http://www.youtube.com/watch/YDfkHlDmehA") http://www.youtube.com/watch/YDfkHlDmehA
h3 Got 3 minutes? Learn to code with us! h3 Got 3 minutes? Learn to code with us!
a.btn.btn-cta.signup-btn.btn-primary(href="/login") Start learning to code (it's free) a.btn.btn-cta.signup-btn.btn-primary(href="/login") Start learning to code (it's free)
br br
br br
include ../partials/footer
!= js('application')
script.
(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),
m = s.getElementsByTagName(o)[0];
a.async = 1;
a.src = g;
m.parentNode.insertBefore(a, m)
})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
ga('create', 'UA-55446531-1', 'auto');
ga('require', 'displayfeatures');
ga('send', 'pageview');
script(src="//cdn.optimizely.com/js/999692993.js")