From 564d8c620f125872faa0bddac211324cd6603b96 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Fri, 15 Jan 2016 04:03:31 -0800 Subject: [PATCH] fix style issues throughout app --- client/less/main.less | 4 ++++ server/views/account/show.jade | 23 ++++++++++----------- server/views/challenges/showBonfire.jade | 19 ++++++++--------- server/views/challenges/showJS.jade | 2 +- server/views/challenges/showVideo.jade | 23 ++++++++++----------- server/views/partials/challenge-modals.jade | 8 +++---- server/views/resources/stories.jade | 2 +- 7 files changed, 41 insertions(+), 40 deletions(-) diff --git a/client/less/main.less b/client/less/main.less index 90ba25035e..ecf34c742a 100644 --- a/client/less/main.less +++ b/client/less/main.less @@ -219,6 +219,10 @@ ul { font-size: 24px; } +.small-p { + font-size: 14px; +} + .map-p { font-size: 20px; } diff --git a/server/views/account/show.jade b/server/views/account/show.jade index c9a3c44d76..a38f6fd050 100644 --- a/server/views/account/show.jade +++ b/server/views/account/show.jade @@ -61,18 +61,17 @@ block content a(href='#{pledge.donateUrl}?ref=freecodecamp.com' target='_blank') #{pledge.displayName} | each month until they have completed their #{pledge.goal}. .spacer - if isFrontEndCert - a.btn.btn-primary(href='/' + username + '/front-end-certification') View My Front End Development Certification - if isDataVisCert - .button-spacer - a.btn.btn-success(href='/' + username + '/data-visualization-certification') View My Data Visualization Certification - if isBackEndCert - .button-spacer - a.btn.btn-success(href='/' + username + '/back-end-certification') View My Back End Development Certification - //if (user && user.username !== username) - // a.btn.btn-lg.btn-block.btn-twitter.btn-link-social(href='/leaderboard/add?username=#{username}') - // i.fa.fa-plus-square - // | Add them to my personal leaderboard + .row + .col-xs-12.col-sm-10.col-sm-offset-1.col-md-8.col-md-offset-2 + if isFrontEndCert + a.btn.btn-primary.btn-block(href='/' + username + '/front-end-certification') View My Front End Development Certification + if isDataVisCert + .button-spacer + a.btn.btn-primary.btn-block(href='/' + username + '/data-visualization-certification') View My Data Visualization Certification + if isBackEndCert + .button-spacer + a.btn.btn-primary.btn-block(href='/' + username + '/back-end-certification') View My Back End Development Certification + .spacer .col-md-12 #cal-heatmap.hidden-xs.hidden-sm.d3-centered diff --git a/server/views/challenges/showBonfire.jade b/server/views/challenges/showBonfire.jade index abdb1457bf..1ced7be390 100644 --- a/server/views/challenges/showBonfire.jade +++ b/server/views/challenges/showBonfire.jade @@ -9,7 +9,7 @@ block content .scroll-locker(id = "scroll-locker") .innerMarginFix(style=' width: 99%') #testCreatePanel - h3.text-center.negative-10= name + h4.text-center= name if (isCompleted) |   i.ion-checkmark-circled.text-primary(title="Completed") @@ -21,24 +21,23 @@ block content if (/blockquote|h4|table/.test(sentence)) !=sentence else - p.wrappable.negative-10!= sentence + p.wrappable!= sentence if (MDNlinks.length) #MDN-links - p.negative-10 Here are some helpful links: + p Here are some helpful links: for link, index in MDNlinks - .negative-10 - ul: li: a(href=""+link, target="_blank") !{MDNkeys[index]} + ul: li: a(href=""+link, target="_blank") !{MDNkeys[index]} .button-spacer if (user) - label.negative-10.btn.btn-primary.btn-block.btn-lg#submitButton + label.btn.btn-primary.btn-block.btn-lg#submitButton | Run tests (ctrl + enter) .button-spacer .btn-group.input-group.btn-group-justified - label.btn.btn-primary.btn-primary-ghost#trigger-reset-modal + label.btn.btn-primary.btn-primary-ghost.btn-lg#trigger-reset-modal |   Reset - label.btn.btn-primary.btn-primary-ghost#challenge-help-btn + label.btn.btn-primary.btn-primary-ghost.btn-lg#challenge-help-btn |   Help - label.btn.btn-primary.btn-primary-ghost#trigger-issue-modal + label.btn.btn-primary.btn-primary-ghost.btn-lg#trigger-issue-modal |   Bug if (!user) .button-spacer @@ -50,7 +49,7 @@ block content .form-group.codeMirrorView textarea#codeOutput(style='display: none;') br - #testSuite.negative-10 + #testSuite br .col-md-8.col-lg-9 diff --git a/server/views/challenges/showJS.jade b/server/views/challenges/showJS.jade index 975a7b4e19..5d353ef2a6 100644 --- a/server/views/challenges/showJS.jade +++ b/server/views/challenges/showJS.jade @@ -9,7 +9,7 @@ block content .scroll-locker(id = "scroll-locker") .innerMarginFix(style = "width: 99%;") #testCreatePanel - h3.text-center= name + h4.text-center= name if (isCompleted) |   i.ion-checkmark-circled.text-primary(title="Completed") diff --git a/server/views/challenges/showVideo.jade b/server/views/challenges/showVideo.jade index 7be94ee6fd..62a0de1aa9 100644 --- a/server/views/challenges/showVideo.jade +++ b/server/views/challenges/showVideo.jade @@ -2,16 +2,15 @@ extends ../layout-wide block content .row .col-xs-12.col-sm-12.col-md-4.bonfire-top - h1.text-center= name - .well - h4 - ol - for step, index in description - .row.checklist-element(id="#{dashedName + index}") - .col-xs-3.col-sm-1.col-md-2.padded-ionic-icon.text-center - input(type='checkbox' class='challenge-list-checkbox') - .col-xs-9.col-sm-11.col-md-10 - li.step-text.wrappable!= step + h4.text-center= name + hr + ol + for step, index in description + .row.checklist-element(id="#{dashedName + index}") + .col-xs-3.col-sm-1.col-md-2.padded-ionic-icon.text-center + input(type='checkbox' class='challenge-list-checkbox') + .col-xs-9.col-sm-11.col-md-10 + li.step-text.wrappable!= step .col-xs-12.col-sm-12.col-md-8 .embed-responsive.embed-responsive-16by9 iframe.embed-responsive-item(src='//player.vimeo.com/video/#{video}') @@ -24,8 +23,8 @@ block content var userLoggedIn = true; .button-spacer .btn-group.input-group.btn-group-justified - .btn.btn-success.btn-big#challenge-help-btn Get help - .btn.btn-success.btn-big#trigger-issue-modal Report a bug + .btn.btn-primary.btn-big#challenge-help-btn Get help + .btn.btn-primary.btn-big#trigger-issue-modal Report a bug if (!user) .button-spacer a.btn.btn-big.signup-btn.btn-block(href='/login') Sign in so you can save your progress diff --git a/server/views/partials/challenge-modals.jade b/server/views/partials/challenge-modals.jade index 128be1c95d..d934881695 100644 --- a/server/views/partials/challenge-modals.jade +++ b/server/views/partials/challenge-modals.jade @@ -5,10 +5,10 @@ a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × .modal-body.text-center h3 Before you submit a new issue, read "Help I've Found a Bug" and browse other issues with this challenge. - a.btn.btn-lg.btn-success.btn-block#help-ive-found-a-bug-wiki-article(name='_csrf', value=_csrf) Read "Help I've Found a Bug" - a.btn.btn-lg.btn-success.btn-block#search-issue(name='_csrf', value=_csrf) Browse other issues with this challenge + a.btn.btn-lg.btn-primary.btn-block#help-ive-found-a-bug-wiki-article(name='_csrf', value=_csrf) Read "Help I've Found a Bug" + a.btn.btn-lg.btn-primary.btn-block#search-issue(name='_csrf', value=_csrf) Browse other issues with this challenge a.btn.btn-lg.btn-primary.btn-block#report-issue(name='_csrf', value=_csrf) Create my GitHub issue - a.btn.btn-lg.btn-info.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Cancel + a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Cancel #reset-modal.modal(tabindex='-1') .modal-dialog.animated.fadeInUp.fast-animation @@ -17,5 +17,5 @@ a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × .modal-body h3 This will restore your code editor to its original state. - a.btn.btn-lg.btn-info.btn-block#reset-button(href='#', data-dismiss='modal', aria-hidden='true') Clear my code + a.btn.btn-lg.btn-warning.btn-block#reset-button(href='#', data-dismiss='modal', aria-hidden='true') Clear my code a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Cancel diff --git a/server/views/resources/stories.jade b/server/views/resources/stories.jade index 17008cbd2e..79739bdcbb 100644 --- a/server/views/resources/stories.jade +++ b/server/views/resources/stories.jade @@ -13,7 +13,7 @@ block content h3.text-center= 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.small-p.text-justify= story.quote .col-xs-12.col-sm-10.col-sm-offset-1 if moreStories .text-center