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

Merge pull request #3666 from FreeCodeCamp/fix/commit

Browse Source 
update look of commit
This commit is contained in:
Berkeley Martinez
2015-10-08 17:26:07 -07:00
parent 920d9ba403 fcd7e096b2
commit 91df8cba6f
3 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/less/main.less
View File

@ -491,7 +491,7 @@ thead {
} }
.story-section { .story-section {
min-height: 500px; height: 400px;
} }
.testimonial-copy { .testimonial-copy {

29
server/views/commit/index.jade
View File

@ -22,7 +22,7 @@ block content
input(type='text' value='#{name}' name='nonprofit') input(type='text' value='#{name}' name='nonprofit')
.row .row
.col-xs-12.col-sm-6.col-sm-offset-3 .col-xs-12.col-sm-6.col-sm-offset-3
h3 Choose your goal: h3 Step 1: Choose your goal
.btn-group.btn-group-justified(data-toggle='buttons' role='group') .btn-group.btn-group-justified(data-toggle='buttons' role='group')
label.btn.btn-primary.btn-lg.active label.btn.btn-primary.btn-lg.active
input(type='radio' id=frontEndCert value=frontEndCert name='goal' checked="checked") input(type='radio' id=frontEndCert value=frontEndCert name='goal' checked="checked")
@ -33,7 +33,7 @@ block content
.spacer .spacer
.row .row
.col-xs-12.col-sm-6.col-sm-offset-3 .col-xs-12.col-sm-6.col-sm-offset-3
h3 Choose your monthly pledge: h3 Step 2: Choose your monthly pledge
.btn-group.btn-group-justified(data-toggle='buttons' role='group') .btn-group.btn-group-justified(data-toggle='buttons' role='group')
label.btn.btn-success label.btn.btn-success
input(type='radio' id='5-dollar-pledge' value='5' name='amount') input(type='radio' id='5-dollar-pledge' value='5' name='amount')
@ -48,23 +48,42 @@ block content
input(type='radio' id='50-dollar-pledge' value='50' name='amount') input(type='radio' id='50-dollar-pledge' value='50' name='amount')
| $50 per month | $50 per month
.spacer .spacer
.col-xs-12.col-sm-6.col-sm-offset-3
h3 Step 3: Set up your monthly donation
.row .row
.col-xs-12.col-sm-6.col-sm-offset-3.text-center .col-xs-12.col-sm-6.col-sm-offset-3.text-center
a#commit-btn-submit.btn.btn-block.btn-lg.signup-btn(href=donateUrl target='_blank') Commit (and open donate page) a#commit-btn-donate.btn.btn-block.btn-lg.btn-primary(href=donateUrl target='_blank') Open the #{displayName} donation page
.spacer
.col-xs-12.col-sm-6.col-sm-offset-3
h3#commit-step4-text.disabled
Step 4: Confirm
span#commit-step4-hidden.disabled (Do step 3 first)
span#commit-step4-show.hidden your commitment to your goal
.row
.col-xs-12.col-sm-6.col-sm-offset-3.text-center
button#commit-btn-submit.btn.btn-block.btn-lg.btn-primary.disabled Commit
if pledge if pledge
form.row(name='stop-pledge' action='/commit/stop-commitment' method='post') form.row(name='stop-pledge' action='/commit/stop-commitment' method='post')
.col-xs-12.col-sm-6.col-sm-offset-3.text-center .col-xs-12.col-sm-6.col-sm-offset-3.text-center
.button-spacer .button-spacer
button.btn.btn-block.btn-danger(name='submit' type='submit') Stop my current pledge button.btn.btn-block.btn-lg.btn-default(name='submit' type='submit') Stop my current pledge
else else
.row .row
.col-xs-12.col-sm-6.col-sm-offset-3.text-center .col-xs-12.col-sm-6.col-sm-offset-3.text-center
.button-spacer .button-spacer
a.btn.btn-block.btn-default(href='/') Maybe later a.btn.btn-block.btn-lg.btn-default(href='/map') Maybe later
.spacer .spacer
script. script.
$(function() { $(function() {
$('#commit-btn-donate').click(function() {
$('#commit-btn-submit').removeClass('disabled');
$('#commit-step4-text').removeClass('disabled');
$('#commit-step4-hidden').hide();
$('#commit-step4-show').removeClass('hidden');
});
$('#commit-btn-submit').click(function() { $('#commit-btn-submit').click(function() {
window.location.href = '/commit/pledge?' + $('form').serialize(); window.location.href = '/commit/pledge?' + $('form').serialize();
}); });

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

@ -11,8 +11,9 @@ block content
.story-section .story-section
a(href=story.linkedin target='_blank') a(href=story.linkedin target='_blank')
img.testimonial-image.img-responsive.img-center(src=story.image) img.testimonial-image.img-responsive.img-center(src=story.image)
h3.text-center h3.text-center= story.camper
a(href=story.linkedin target='_blank')= story.camper |  
a.fa.fa-linkedin-square.text-primary(alt="#{story.camper}'s LinkedIn Profile", href=story.linkedin, target='_blank')
p.text-justify= story.quote p.text-justify= story.quote