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

start simplifying views

Browse Source
This commit is contained in:
Quincy Larson
2016-01-09 15:32:52 -06:00
committed by Berkeley Martinez
parent b157fa3095
commit 4101a6c34a
11 changed files with 593 additions and 530 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: #457E86; @body-bg: #fefefe;
//** Global text color on `<body>`. //** Global text color on `<body>`.
@text-color: @gray-dark; @text-color: @gray-dark;

28
client/less/main.less
View File

@ -42,13 +42,17 @@ html {
overflow-x: hidden; overflow-x: hidden;
} }
input[type=checkbox] { //input[type=checkbox] {
/* Double-sized Checkboxes */ // /* Double-sized Checkboxes */
-ms-transform: scale(2); /* IE */ // -ms-transform: scale(2); /* IE */
-moz-transform: scale(2); /* FF */ // -moz-transform: scale(2); /* FF */
-webkit-transform: scale(2); /* Safari and Chrome */ // -webkit-transform: scale(2); /* Safari and Chrome */
-o-transform: scale(2); /* Opera */ // -o-transform: scale(2); /* Opera */
padding: 10px; // padding: 10px;
//}
.btn-group {
border-color: @brand-primary;
} }
body.full-screen-body-background { body.full-screen-body-background {
@ -327,13 +331,13 @@ ul {
} }
.navbar { .navbar {
background-color: #4a2b0f; background-color: #215f1e;
} }
.navbar-nav > li > a { .navbar-nav > li > a {
color: @gray-lighter; color: @gray-lighter;
&:hover { &:hover {
color: #4a2b0f; color: #215f1e;
} }
} }
@ -441,7 +445,7 @@ thead {
} }
.navbar-right { .navbar-right {
background-color: #4a2b0f; background-color: #215f1e;
text-align: center; text-align: center;
} }
@ -586,7 +590,7 @@ thead {
width: 100%; width: 100%;
height: 50px; height: 50px;
text-align: center; text-align: center;
background-color: #4a2b0f; background-color: #215f1e;
padding: 12px; padding: 12px;
bottom: 0; bottom: 0;
left: 0; left: 0;
@ -601,7 +605,7 @@ thead {
padding-top: 14px; padding-top: 14px;
padding-bottom: 12px; padding-bottom: 12px;
&:hover { &:hover {
color: #4a2b0f; color: #215f1e;
background-color: @gray-lighter; background-color: @gray-lighter;
text-decoration: none; text-decoration: none;
} }

74
server/views/account/show.jade
View File

@ -4,9 +4,7 @@ block content
script. script.
var challengeName = 'Profile View'; var challengeName = 'Profile View';
if (user && user.username === username) if (user && user.username === username)
.panel.panel-info h1.text-center Update your code portfolio
.panel-heading.text-center Update your code portfolio
.panel-body
.row .row
.col-xs-12 .col-xs-12
if (!user.isGithubCool) if (!user.isGithubCool)
@ -16,7 +14,7 @@ block content
else else
a.btn.btn-lg.btn-block.btn-github.btn-link-social(href='/link/github') a.btn.btn-lg.btn-block.btn-github.btn-link-social(href='/link/github')
i.fa.fa-github i.fa.fa-github
| Update my name, username, and location with data from my GitHub account | Update my portfolio from GitHub
if (!user.twitter) if (!user.twitter)
a.btn.btn-lg.btn-block.btn-twitter.btn-link-social(href='/link/twitter') a.btn.btn-lg.btn-block.btn-twitter.btn-link-social(href='/link/twitter')
i.fa.fa-twitter i.fa.fa-twitter
@ -34,10 +32,8 @@ block content
i.fa.fa-google-plus i.fa.fa-google-plus
| Add my Google+ to my portfolio | Add my Google+ to my portfolio
.panel.panel-info h1.text-center #{username}'s code portfolio
.panel-heading.text-center hr
h1 #{username}'s code portfolio
.panel-body
.row .row
.col-xs-12.col-sm-10.col-sm-offset-1.col-md-8.col-md-offset-2.text-center .col-xs-12.col-sm-10.col-sm-offset-1.col-md-8.col-md-offset-2.text-center
if picture if picture
@ -77,7 +73,6 @@ block content
// a.btn.btn-lg.btn-block.btn-twitter.btn-link-social(href='/leaderboard/add?username=#{username}') // a.btn.btn-lg.btn-block.btn-twitter.btn-link-social(href='/leaderboard/add?username=#{username}')
// i.fa.fa-plus-square // i.fa.fa-plus-square
// | Add them to my personal leaderboard // | Add them to my personal leaderboard
.spacer .spacer
.col-md-12 .col-md-12
#cal-heatmap.hidden-xs.hidden-sm.d3-centered #cal-heatmap.hidden-xs.hidden-sm.d3-centered
@ -183,6 +178,7 @@ block content
else else
a(href='/challenges/' + challenge.name)= challenge.name a(href='/challenges/' + challenge.name)= challenge.name
if (user && user.username === username) if (user && user.username === username)
<<<<<<< b157fa3095437bb5d39b91e23581589744f6aca0
.panel.panel-info .panel.panel-info
.panel-heading.text-center Manage your account .panel-heading.text-center Manage your account
.panel-body .panel-body
@ -242,3 +238,63 @@ block content
button.btn.btn-danger.btn-block(type='submit') button.btn.btn-danger.btn-block(type='submit')
span.ion-trash-b span.ion-trash-b
| I am 100% sure I want to delete my account and all of my progress | I am 100% sure I want to delete my account and all of my progress
=======
h1.text-center Manage your account
hr
.col-xs-12
a.btn.btn-lg.btn-block.btn-warning.btn-link-social(href='/logout')
span.ion-android-exit
| Sign me out of Free Code Camp
.col-xs-12
a.btn.btn-lg.btn-block.btn-primary.btn-link-social(href='mailto:team@freecodecamp.com')
span.ion-email
| Email us at team@freecodecamp.com
if (!user.isLocked)
.col-xs-12
a.btn.btn-lg.btn-block.btn-info.btn-link-social(href='/toggle-lockdown-mode')
span.ion-locked
| Hide all my solutions from other people
br
| (this will disable your certificates)
else
.col-xs-12
a.btn.btn-lg.btn-block.btn-info.btn-link-social(href='/toggle-lockdown-mode')
span.ion-unlocked
| Let other people see all my solutions
br
| (this will enable your certificates)
.col-xs-12
a.btn.btn-lg.btn-block.btn-success.btn-link-social(href='/commit')
span.ion-edit
| Edit my pledge
.col-xs-12
a.btn.btn-lg.btn-block.btn-danger.btn-link-social.confirm-deletion
span.ion-trash-b
| Delete my Free Code Camp account
script.
$('.confirm-deletion').on("click", function () {
$('#modal-dialog').modal('show');
});
#modal-dialog.modal.animated.wobble
.modal-dialog
.modal-content
.modal-header
a.close(href='#', data-dismiss='modal', aria-hidden='true') ×
h3 You don't really want to delete your account, do you?
.modal-body
p This will really delete all your data, including all your progress, news stories and brownie points.
p We won't be able to recover any of it for you later, even if you change your mind.
p If there's something we could do better, send us an email instead and we'll do our best: &thinsp;
a(href="mailto:team@freecodecamp.com") team@freecodecamp.com
| .
.modal-footer
a.btn.btn-success.btn-block(href='#', data-dismiss='modal', aria-hidden='true')
span.ion-happy
| Nevermind, I don't want to delete all of my progress
.spacer
form(action='/account/delete', method='POST')
input(type='hidden', name='_csrf', value=_csrf)
button.btn.btn-danger.btn-block(type='submit')
span.ion-trash-b
| I am 100% sure I want to delete my account and all of my progress
>>>>>>> start simplifying views

6
server/views/challengeMap/show.jade
View File

@ -1,9 +1,7 @@
extends ../layout extends ../layout
block content block content
.panel.panel-info h1.text-center Challenge Map
.panel-heading.text-center hr
h1 Challenge Map
.panel-body
if (Math.random() > 0.999) if (Math.random() > 0.999)
img.img-responsive.img-center.border-radius-5(src='https://s3.amazonaws.com/freecodecamp/wide-social-banner-dino.png') img.img-responsive.img-center.border-radius-5(src='https://s3.amazonaws.com/freecodecamp/wide-social-banner-dino.png')
audio(autoplay src='https://s3.amazonaws.com/freecodecamp/t-rex-roar.mp3') audio(autoplay src='https://s3.amazonaws.com/freecodecamp/t-rex-roar.mp3')

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

@ -9,7 +9,7 @@ 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;
@ -36,13 +36,13 @@ block content
| &nbsp; Run tests (ctrl + enter) | &nbsp; Run tests (ctrl + enter)
.button-spacer .button-spacer
.btn-group.input-group.btn-group-justified .btn-group.input-group.btn-group-justified
label.btn.btn-success#trigger-reset-modal label.btn.btn-primary.btn-primary-ghost#trigger-reset-modal
i.fa.fa-refresh i.fa.fa-refresh
| &nbsp; Reset | &nbsp; Reset
label.btn.btn-success#challenge-help-btn label.btn.btn-primary.btn-primary-ghost#challenge-help-btn
i.fa.fa-medkit i.fa.fa-medkit
| &nbsp; Help | &nbsp; Help
label.btn.btn-success#trigger-issue-modal label.btn.btn-primary.btn-primary-ghost#trigger-issue-modal
i.fa.fa-bug i.fa.fa-bug
| &nbsp; Bug | &nbsp; Bug
if (!user) if (!user)

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

@ -8,13 +8,13 @@ block content
.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%;")
.well
.row .row
.col-xs-12 .col-xs-12
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
.bonfire-instructions .bonfire-instructions
for sentence in details for sentence in details
p.wrappable.negative-10!= sentence p.wrappable.negative-10!= sentence
@ -24,17 +24,17 @@ block content
| &nbsp; Run tests (ctrl + enter) | &nbsp; Run tests (ctrl + enter)
.button-spacer .button-spacer
.btn-group.input-group.btn-group-justified .btn-group.input-group.btn-group-justified
label.btn.btn-success#trigger-reset-modal label.btn.btn-primary.btn-primary-ghost#trigger-reset-modal
i.fa.fa-refresh i.fa.fa-refresh
| &nbsp; Reset | &nbsp; Reset
label.btn.btn-success.hidden-sm.hidden-md.hidden-lg label.btn.btn-primary.btn-primary-ghost.hidden-sm.hidden-md.hidden-lg
a(href='//gitter.im/freecodecamp/help') a(href='//gitter.im/freecodecamp/help')
i.fa.fa-medkit i.fa.fa-medkit
| &nbsp; Help | &nbsp; Help
label.btn.btn-success.hidden-xs#challenge-help-btn label.btn.btn-primary.btn-primary-ghost.hidden-xs#challenge-help-btn
i.fa.fa-medkit i.fa.fa-medkit
| &nbsp; Help | &nbsp; Help
label.btn.btn-success#trigger-issue-modal label.btn.btn-primary.btn-primary-ghost#trigger-issue-modal
i.fa.fa-bug i.fa.fa-bug
| &nbsp; Bug | &nbsp; Bug
script. script.

6
server/views/coursewares/showStep.jade
View File

@ -3,9 +3,9 @@ block content
.row .row
.col-md-8.col-md-offset-2 .col-md-8.col-md-offset-2
for step, index in description for step, index in description
.thumbnail.challenge-step(class=index !== 0 ? 'hidden': '') .challenge-step(class=index !== 0 ? 'hidden': '')
a(href=step[0] data-lightbox='img-enlarge') a(href=step[0] data-lightbox='img-enlarge')
img.gif-block.img-center.img-responsive.thumbnail(src='#{step[0]}' alt='#{step[1]}') img.gif-block.img-center.img-responsive(src='#{step[0]}' alt='#{step[1]}')
.caption .caption
p.large-p!= step[2] p.large-p!= step[2]
.challenge-button-block .challenge-button-block
@ -15,7 +15,7 @@ block content
if index === 0 if index === 0
.col-sm-5.hidden-xs &nbsp; .col-sm-5.hidden-xs &nbsp;
else else
.btn.btn-warning.col-sm-5.col-xs-12.challenge-step-btn-prev(id='#{index - 1}') Go to my previous step .btn.btn-primary.btn-primary-ghost.col-sm-5.col-xs-12.challenge-step-btn-prev(id='#{index - 1}') Go to my previous step
.challenge-step-counter.large-p.col-sm-2.col-xs-12.text-center (#{index + 1} / #{description.length}) .challenge-step-counter.large-p.col-sm-2.col-xs-12.text-center (#{index + 1} / #{description.length})
if index + 1 === description.length if index + 1 === description.length
.btn.btn-primary.col-sm-5.col-xs-12.challenge-step-btn-finish(id='last' class=step[3] && !isCompleted ? 'disabled' : '') Finish challenge .btn.btn-primary.col-sm-5.col-xs-12.challenge-step-btn-finish(id='last' class=step[3] && !isCompleted ? 'disabled' : '') Finish challenge

6
server/views/coursewares/showZiplineOrBasejump.jade
View File

@ -3,7 +3,7 @@ block content
.row .row
.col-md-4.bonfire-top .col-md-4.bonfire-top
h1.text-center= name h1.text-center= name
.well hr
h4 h4
ol ol
for step, index in details for step, index in details
@ -24,10 +24,10 @@ block content
a.btn.btn-big.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge (ctrl + enter) a.btn.btn-big.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge (ctrl + enter)
.button-spacer .button-spacer
.btn-group.input-group.btn-group-justified .btn-group.input-group.btn-group-justified
.btn.btn-success.btn-big#challenge-help-btn .btn.btn-primary.btn-primary-ghost.btn-big#challenge-help-btn
i.fa.fa-medkit i.fa.fa-medkit
| &nbsp; Help | &nbsp; Help
.btn.btn-success.btn-big#trigger-issue-modal .btn.btn-primary.btn-primary-ghost.btn-big#trigger-issue-modal
i.fa.fa-bug i.fa.fa-bug
| &nbsp; Bug | &nbsp; Bug
if (!user) if (!user)

1
server/views/home.jade
View File

@ -1,6 +1,5 @@
extends layout extends layout
block content block content
.jumbotron
.text-center .text-center
h1.landing-heading Learn to code and help nonprofits. h1.landing-heading Learn to code and help nonprofits.
.spacer .spacer

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

@ -11,9 +11,9 @@ block content
script. script.
var challengeName = 'Camper News'; var challengeName = 'Camper News';
var page = !{JSON.stringify(page)}; var page = !{JSON.stringify(page)};
.panel.panel-info h1.text-center Camper News
.panel-heading.text-center Camper News hr
.panel-body .spacer
include news-nav include news-nav
.spacer .spacer
if (page === 'hot') if (page === 'hot')

8
server/views/stories/news-nav.jade
View File

@ -7,11 +7,17 @@
.spacer .spacer
.col-xs-12.col-sm-3 .col-xs-12.col-sm-3
span span
a.btn.btn-primary.btn-big.btn-block.btn-responsive(href='/stories/submit' class="#{ page === 'hot' ? '' : 'hidden' }") Submit a.btn.btn-primary.btn-big.btn-block.btn-responsive(href='/stories/submit' class="#{ page === 'hot' ? '' : 'hidden' }") Submit a link
span span
a.btn.btn-success.btn-big.btn-block.btn-responsive(href='/news/' class="#{ (page !== 'hot') ? '' : 'hidden' }") All a.btn.btn-success.btn-big.btn-block.btn-responsive(href='/news/' class="#{ (page !== 'hot') ? '' : 'hidden' }") All
.visible-xs .visible-xs
.button-spacer .button-spacer
.col-xs-12.col-sm-9
.input-group
input#searchArea.big-text-field.field-responsive.form-control(type='text', placeholder='Search our links')
span.input-group-btn
button#searchbutton.btn.btn-big.btn-primary.btn-responsive(type='button') Search
.spacer
#search-results #search-results