From c36b8352d222d800a981d8606e214cdef1c1aad8 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Mon, 11 Jan 2016 18:25:20 -0600 Subject: [PATCH] further build up challengemap --- server/views/account/signin.jade | 2 +- server/views/challengeMap/show.jade | 44 ++++++++++++++--------- server/views/coursewares/showBonfire.jade | 13 ++++--- server/views/coursewares/showHTML.jade | 1 + server/views/coursewares/showJS.jade | 1 + 5 files changed, 36 insertions(+), 25 deletions(-) diff --git a/server/views/account/signin.jade b/server/views/account/signin.jade index e6a01f3cee..eba1c665a9 100644 --- a/server/views/account/signin.jade +++ b/server/views/account/signin.jade @@ -1,6 +1,6 @@ extends ../layout block content - .jumbotron.text-center + .text-center h2 Sign in with one of these options: a.btn.btn-lg.btn-block.btn-github.btn-social(href='/auth/github') i.fa.fa-github diff --git a/server/views/challengeMap/show.jade b/server/views/challengeMap/show.jade index c03bec4de1..3e08c5e801 100644 --- a/server/views/challengeMap/show.jade +++ b/server/views/challengeMap/show.jade @@ -1,6 +1,6 @@ extends ../layout-wide block content - .col-xs-12.col-sm-3.col-sm-offset-9 + .col-xs-12.col-sm-4.col-sm-offset-8 for superBlock, index in superBlocks for challengeBlock in superBlock.blocks h4.bold #{challengeBlock.name} (#{challengeBlock.time}) @@ -11,22 +11,32 @@ block content = challenge.title span.sr-only= " Complete" else - p.negative-15 - a(name="#{challenge.dashedName}" href="/challenges/#{challenge.dashedName}" class=challenge.isComingSoon ? 'disabled' : '') - span= challenge.title - span.sr-only= " Incomplete" - if challenge.markNew - span.text-success.small     - strong - em New - if challengeBlock.isComingSoon - span.text-success.small     - strong - em Coming Soon - if challenge.type === "bonfire" - span.text-info.small     - strong - em Required + if challenge.type === "bonfire" + p.ion-asterisk.padded-ionic-icon.negative-15(name="#{challenge.dashedName}")   + a(name="#{challenge.dashedName}" href="/challenges/#{challenge.dashedName}" class=challenge.isComingSoon ? 'disabled' : '') + span= challenge.title + span.sr-only= " Incomplete" + if challenge.markNew + span.text-success.small     + strong + em New + if challengeBlock.isComingSoon + span.text-success.small     + strong + em Coming Soon + else + p.ion-ios-circle-outline.padded-ionic-icon.negative-15(name="#{challenge.dashedName}")   + a(name="#{challenge.dashedName}" href="/challenges/#{challenge.dashedName}" class=challenge.isComingSoon ? 'disabled' : '') + span= challenge.title + span.sr-only= " Incomplete" + if challenge.markNew + span.text-success.small     + strong + em New + if challengeBlock.isComingSoon + span.text-success.small     + strong + em Coming Soon if (index < superBlocks.length) hr diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index b931e109c0..7e0d32ac6e 100644 --- a/server/views/coursewares/showBonfire.jade +++ b/server/views/coursewares/showBonfire.jade @@ -23,13 +23,12 @@ block content else p.wrappable.negative-10!= sentence if (MDNlinks.length) - .negative-30-bottom - #MDN-links - p.negative-10 Here are some helpful links: - for link, index in MDNlinks - .negative-10 - ul: li: a(href=""+link, target="_blank") !{MDNkeys[index]} - + #MDN-links + p.negative-10 Here are some helpful links: + for link, index in MDNlinks + .negative-10 + ul: li: a(href=""+link, target="_blank") !{MDNkeys[index]} + .button-spacer if (user) label.negative-10.btn.btn-primary.btn-block.btn-lg#submitButton i.fa.fa-play diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade index 78d7e8670a..0aec76b139 100644 --- a/server/views/coursewares/showHTML.jade +++ b/server/views/coursewares/showHTML.jade @@ -19,6 +19,7 @@ block content for sentence in details p.wrappable.negative-10!= sentence .negative-bottom-margin-30 + .button-spacer label.negative-10.btn.btn-primary.btn-lg.btn-block#submitButton i.fa.fa-play |   Run tests (ctrl + enter) diff --git a/server/views/coursewares/showJS.jade b/server/views/coursewares/showJS.jade index 8253b33c82..4eb7c2bb59 100644 --- a/server/views/coursewares/showJS.jade +++ b/server/views/coursewares/showJS.jade @@ -29,6 +29,7 @@ block content for link, index in MDNlinks .negative-10 ul: li: a(href="" + link, target="_blank") !{MDNkeys[index]} + .button-spacer if (user) form.form-horizontal(novalidate='novalidate', name='completedWithForm') .form-group.text-center.negative-10