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

more redesign work on challenge views

Browse Source
This commit is contained in:
Quincy Larson
2016-01-09 22:12:32 -06:00
committed by Berkeley Martinez
parent 7e481833cd
commit 7eefcb0705
14 changed files with 261 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/less/lib/bootstrap/variables.less
View File

@ -26,7 +26,7 @@
//## Settings for some of the most global styles. //## Settings for some of the most global styles.
//** Background color for `<body>`. //** Background color for `<body>`.
@body-bg: #fefefe; @body-bg: #eee;
//** Global text color on `<body>`. //** Global text color on `<body>`.
@text-color: @gray-dark; @text-color: @gray-dark;

18
client/less/main.less
View File

@ -291,6 +291,8 @@ ul {
margin-right: 10px; margin-right: 10px;
white-space: nowrap; white-space: nowrap;
} }
background-color: #215f1e;
text-align: center;
} }
.navbar { .navbar {
white-space: nowrap; white-space: nowrap;
@ -427,13 +429,6 @@ thead {
} }
} }
.signin-button-nav {
@media (min-width: 991px) and (max-width: 1010px) {
margin-left: -10px;
margin-right: -5px;
}
}
.navbar-nav a { .navbar-nav a {
color: @gray-lighter; color: @gray-lighter;
font-size: 20px; font-size: 20px;
@ -444,16 +439,15 @@ thead {
color: @gray-lighter; color: @gray-lighter;
} }
.navbar-right {
background-color: #215f1e;
text-align: center;
}
.signup-btn-nav { .signup-btn-nav {
margin-top: -2px !important; margin-top: -2px !important;
padding-top: 10px !important; padding-top: 10px !important;
padding-bottom: 10px !important; padding-bottom: 10px !important;
margin-right: -12px; margin-right: -12px;
@media (min-width: 991px) and (max-width: 1010px) {
margin-left: -10px;
margin-right: -5px;
}
} }
.public-profile-img { .public-profile-img {

3
server/views/account/email-signin.jade
View File

@ -1,9 +1,8 @@
extends ../layout extends ../layout
block content block content
.jumbotron.text-center
.row .row
.col-xs-12 .col-xs-12
h2 Sign in with an email address here: h2.text-center Sign in with an email address here:
.col-sm-6.col-sm-offset-3 .col-sm-6.col-sm-offset-3
form(method='POST', action='/api/users/login') form(method='POST', action='/api/users/login')
input(type='hidden', name='_csrf', value=_csrf) input(type='hidden', name='_csrf', value=_csrf)

5
server/views/account/email-signup.jade
View File

@ -2,8 +2,7 @@ extends ../layout
block content block content
script. script.
var challengeName = 'Email Signup' var challengeName = 'Email Signup'
.jumbotron.text-center h2.text-center Sign up with an email address here:
h2 Sign up with an email address here:
form.form-horizontal(method='POST', action='/api/users', name="signupForm") form.form-horizontal(method='POST', action='/api/users', name="signupForm")
.row .row
.col-sm-6.col-sm-offset-3 .col-sm-6.col-sm-offset-3
@ -13,6 +12,6 @@ block content
.form-group .form-group
input.input-lg.form-control(type='password', name='password', id='password', placeholder='password', required, pattern=".{8,50}", title="Must be at least 8 characters and no longer than 50 characters.") input.input-lg.form-control(type='password', name='password', id='password', placeholder='password', required, pattern=".{8,50}", title="Must be at least 8 characters and no longer than 50 characters.")
.form-group .form-group
button.btn.btn-lg.btn-success.btn-block(type='submit') button.btn.btn-lg.btn-primary.btn-block(type='submit')
span.ion-person-add span.ion-person-add
| Signup | Signup

5
server/views/account/forgot.jade
View File

@ -1,12 +1,11 @@
extends ../layout extends ../layout
block content block content
.col-sm-8.col-sm-offset-2.jumbotron .col-sm-6.col-sm-offset-3
form(method='POST', action="/forgot") form(method='POST', action="/forgot")
h2.text-center Forgot Password Reset h2.text-center Forgot Password Reset
input(type='hidden', name='_csrf', value=_csrf) input(type='hidden', name='_csrf', value=_csrf)
.form-group .form-group
p Enter your email address. We'll send you password reset instructions. p.large-p Enter your email address. We'll send you password reset instructions.
input.form-control.input-lg(type='email', name='email', id='email', placeholder='Email', autofocus=true required) input.form-control.input-lg(type='email', name='email', id='email', placeholder='Email', autofocus=true required)
.form-group .form-group
button.btn.btn-primary.btn-lg.btn-block(type='submit') button.btn.btn-primary.btn-lg.btn-block(type='submit')

2
server/views/coursewares/showBonfire.jade
View File

@ -4,7 +4,6 @@ block content
link(rel='stylesheet', href='/bower_components/CodeMirror/addon/lint/lint.css') link(rel='stylesheet', href='/bower_components/CodeMirror/addon/lint/lint.css')
link(rel='stylesheet', href='/bower_components/CodeMirror/theme/monokai.css') link(rel='stylesheet', href='/bower_components/CodeMirror/theme/monokai.css')
link(rel='stylesheet', href='/css/ubuntu.css') link(rel='stylesheet', href='/css/ubuntu.css')
.row .row
.col-md-4.col-lg-3 .col-md-4.col-lg-3
.scroll-locker(id = "scroll-locker") .scroll-locker(id = "scroll-locker")
@ -14,6 +13,7 @@ block content
if (isCompleted) if (isCompleted)
| &nbsp; | &nbsp;
i.ion-checkmark-circled.text-primary(title="Completed") i.ion-checkmark-circled.text-primary(title="Completed")
hr
.row .row
.col-xs-12 .col-xs-12
.bonfire-instructions .bonfire-instructions

2
server/views/coursewares/showHTML.jade
View File

@ -4,7 +4,7 @@ block content
link(rel='stylesheet', href='/bower_components/CodeMirror/addon/lint/lint.css') link(rel='stylesheet', href='/bower_components/CodeMirror/addon/lint/lint.css')
link(rel='stylesheet', href='/bower_components/CodeMirror/theme/monokai.css') link(rel='stylesheet', href='/bower_components/CodeMirror/theme/monokai.css')
link(rel='stylesheet', href='/css/ubuntu.css') link(rel='stylesheet', href='/css/ubuntu.css')
.row.courseware-height .row
.col-md-3.col-lg-3 .col-md-3.col-lg-3
.scroll-locker(id = "scroll-locker") .scroll-locker(id = "scroll-locker")
.innerMarginFix(style = "width: 99%;") .innerMarginFix(style = "width: 99%;")

3
server/views/coursewares/showJS.jade
View File

@ -8,11 +8,12 @@ block content
.col-md-4.col-lg-3 .col-md-4.col-lg-3
.scroll-locker(id = "scroll-locker") .scroll-locker(id = "scroll-locker")
.innerMarginFix(style = "width: 99%;") .innerMarginFix(style = "width: 99%;")
#testCreatePanel.well #testCreatePanel
h3.text-center.negative-10= name h3.text-center.negative-10= name
if (isCompleted) if (isCompleted)
| &nbsp; | &nbsp;
i.ion-checkmark-circled.text-primary(title="Completed") i.ion-checkmark-circled.text-primary(title="Completed")
hr
.row .row
.col-xs-12 .col-xs-12
.bonfire-instructions .bonfire-instructions

27
server/views/home.jade
View File

@ -5,21 +5,17 @@ block content
.spacer .spacer
.row .row
.col-xs-12.col-sm-12.col-md-3 .col-xs-12.col-sm-12.col-md-3
h3.nowrap Get connected
img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_connect.svg.gz', alt='Get great references and connections to start your software engineer career') img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_connect.svg.gz', alt='Get great references and connections to start your software engineer career')
p.landing-p Join a community of 100,000+ motivated people. p.large-p Join a community of 100,000+ developers.
.col-xs-12.col-sm-12.col-md-3 .col-xs-12.col-sm-12.col-md-3
h3.nowrap Learn JavaScript
img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_learn.svg.gz', alt='Learn to code and learn full stack JavaScript') img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_learn.svg.gz', alt='Learn to code and learn full stack JavaScript')
p.landing-p Work together on Full Stack JavaScript coding challenges. p.large-p Work together on coding challenges.
.col-xs-12.col-sm-12.col-md-3 .col-xs-12.col-sm-12.col-md-3
h3.nowrap Build your portfolio
img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_portfolio.svg.gz', alt='Build a portfolio of apps for nonprofits') img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_portfolio.svg.gz', alt='Build a portfolio of apps for nonprofits')
p.landing-p Build apps that solve real problems for real people. p.large-p Build a portfolio of apps that solve real problems.
.col-xs-12.col-sm-12.col-md-3 .col-xs-12.col-sm-12.col-md-3
h3.nowrap Help nonprofits
img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_nonprofits.svg.gz', alt='Help empower nonprofits with code') img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_nonprofits.svg.gz', alt='Help empower nonprofits with code')
p.landing-p Give nonprofits a boost by empowering them with code. p.large-p Empowering nonprofits with code.
.big-break .big-break
.row .row
.col-xs-12.col-sm-8.col-sm-offset-2 .col-xs-12.col-sm-8.col-sm-offset-2
@ -90,14 +86,15 @@ block content
.spacer .spacer
.col-xs-offset-0.col-sm-offset-1.text-left .col-xs-offset-0.col-sm-offset-1.text-left
h2 Here's why you should join our open source community right now: h2 Here's why you should join our open source community right now:
.spacer
ul.large-li ul.large-li
li.ion-code &thinsp; You'll get help in real time from our community chat rooms. li.ion-code.large-p &thinsp; You'll get help in real time from our community chat rooms.
li.ion-code &thinsp; You'll meet up with other coders in your city. li.ion-code.large-p &thinsp; You'll meet up with other coders in your city.
li.ion-code &thinsp; You'll learn to code at your own pace, in your browser or on your phone. li.ion-code.large-p &thinsp; You'll learn to code at your own pace, in your browser or on your phone.
li.ion-code &thinsp; You'll work through our focused, interactive courses and tutorials. li.ion-code.large-p &thinsp; You'll work through our focused, interactive courses and tutorials.
li.ion-code &thinsp; You'll learn state-of-the-art full stack JavaScript technologies. li.ion-code.large-p &thinsp; You'll learn state-of-the-art full stack JavaScript technologies.
li.ion-code &thinsp; You'll build projects that help nonprofits carry out their missions more effectively. li.ion-code.large-p &thinsp; You'll build projects that help nonprofits carry out their missions more effectively.
li.ion-code &thinsp; You'll assemble a portfolio of real apps used by real people. li.ion-code.large-p &thinsp; You'll assemble a portfolio of real apps used by real people.
.big-break .big-break
.row .row
.col-xs-12.col-sm-8.col-sm-offset-2 .col-xs-12.col-sm-8.col-sm-offset-2

3
server/views/nonprofits/show.jade
View File

@ -2,9 +2,6 @@ extends ../layout
block content block content
script. script.
var challengeName = 'Nonprofits View'; var challengeName = 'Nonprofits View';
.panel.panel-info
.panel-heading.text-center= title
.panel-body
.row .row
.col-xs-12.col-sm-10.col-sm-offset-1 .col-xs-12.col-sm-10.col-sm-offset-1
.row .row

3
server/views/partials/navbar.jade
View File

@ -24,9 +24,8 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
li li
a(href='/about') About a(href='/about') About
if !user if !user
li &thinsp; &thinsp; &thinsp;
li li
a.btn.signup-btn.signup-btn-nav.signin-button-nav(href='/login') Sign in a(href='/login') Sign in
else else
li.brownie-points-nav li.brownie-points-nav
a(href='/' + user.username) [&thinsp;#{user.progressTimestamps.length}&thinsp;] a(href='/' + user.username) [&thinsp;#{user.progressTimestamps.length}&thinsp;]

54
server/views/resources/links.jade Normal file
View File

@ -0,0 +1,54 @@
extends ../layout
block content
table.table.link-table
tr
td.text-right
.ion-erlenmeyer-flask
td
a(href="/labs") Cool Apps Built by Campers
tr
td.text-right
.ion-chatbox
td
a(href="/stories") Stories from Campers
tr
td.text-right
.ion-speakerphone
td
a(href='//medium.freecodecamp.com', target='_blank') Medium Publication
tr
td.text-right
.ion-social-github
td
a(href="//github.com/freecodecamp", target='_blank') GitHub Repository
tr
td.text-right
.ion-social-reddit
td
a(href="//www.reddit.com/r/freecodecamp", target='_blank') Subreddit
tr
td.text-right
.ion-social-linkedin
td
a(href="//www.linkedin.com/edu/school?id=166029", target='_blank') LinkedIn University Page
tr
td.text-right
.ion-social-twitter
td
a(href="//twitter.com/freecodecamp", target='_blank') Twitter Feed
tr
td.text-right
.ion-social-facebook
td
a(href="//facebook.com/freecodecamp") Facebook Page
tr
td.text-right
.ion-social-twitch-outline
td
a(href="//twitch.tv/freecodecamp", target='_blank') Twitch.tv Channel
tr
td.text-right
.ion-locked
td
a(href="//github.com/FreeCodeCamp/freecodecamp/wiki/Free-Code-Camp's-Privacy-Policy") Privacy Policy
.spacer

12
server/views/resources/nonprofits.jade
View File

@ -1,6 +1,5 @@
extends ../layout extends ../layout
block content block content
.jumbotron
.text-center .text-center
.row .row
.col-xs-12 .col-xs-12
@ -16,23 +15,22 @@ block content
hr hr
.spacer .spacer
h2 Our process: h2 Our process:
.spacer
.row .row
.col-xs-12.col-sm-12.col-md-4 .col-xs-12.col-sm-12.col-md-4
h3.nowrap Your idea
img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_portfolio.svg.gz', alt='Image of a briefcase') img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_portfolio.svg.gz', alt='Image of a briefcase')
p.landing-p You tell us how we can help you. p.large-p You tell us how we can help you.
.col-xs-12.col-sm-12.col-md-4 .col-xs-12.col-sm-12.col-md-4
h3.nowrap Our team
img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_nonprofits.svg.gz', alt='Image of people putting their hands together in a huddle') img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_nonprofits.svg.gz', alt='Image of people putting their hands together in a huddle')
p.landing-p We'll hand pick developers and a project manager. p.large-p We'll hand pick developers and a project manager.
.col-xs-12.col-sm-12.col-md-4 .col-xs-12.col-sm-12.col-md-4
h3.nowrap Your solution
img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_connect.svg.gz', alt='image of two people high-fiving') img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_connect.svg.gz', alt='image of two people high-fiving')
p.landing-p Together we'll set milestones and complete your project. p.large-p Together we'll set milestones and complete your project.
.spacer .spacer
hr hr
.spacer .spacer
h2 Solutions we can help you build: h2 Solutions we can help you build:
.spacer
.text-center.negative-35 .text-center.negative-35
.col-xs-12.col-sm-12.col-md-3 .col-xs-12.col-sm-12.col-md-3
.landing-skill-icon.ion-android-globe .landing-skill-icon.ion-android-globe

6
server/views/resources/stories.jade
View File

@ -1,8 +1,7 @@
extends ../layout extends ../layout
block content block content
.panel.panel-info h1.text-center Stories from happy campers
.panel-heading.text-center Stories from happy campers hr
.panel-body.text-left
.row .row
.col-xs-12.col-sm-10.col-sm-offset-1 .col-xs-12.col-sm-10.col-sm-offset-1
.row .row
@ -24,4 +23,3 @@ block content
if !user if !user
.text-center .text-center
a.btn.btn-cta.signup-btn.btn-block(href="/login") Start learning to code (it's free) a.btn.btn-cta.signup-btn.btn-block(href="/login") Start learning to code (it's free)
.spacer