diff --git a/client/less/lib/bootstrap/variables.less b/client/less/lib/bootstrap/variables.less index 86168ec0b3..99210569f7 100755 --- a/client/less/lib/bootstrap/variables.less +++ b/client/less/lib/bootstrap/variables.less @@ -14,9 +14,9 @@ @gray-light: lighten(@gray-base, 46.7%); // #777 @gray-lighter: lighten(@gray-base, 93.5%); // #eee -@brand-primary: forestgreen; -@brand-success: #457e86; -@brand-info: #2b414f; +@brand-primary: darkgreen; +@brand-success: #457E86; +@brand-info: #4A2B0F; @brand-warning: #f0ad4e; @brand-danger: #d9534f; diff --git a/client/less/main.less b/client/less/main.less index 5461b43c63..40233c8f9e 100644 --- a/client/less/main.less +++ b/client/less/main.less @@ -333,7 +333,7 @@ a { } p { - font-size: 20px; + font-size: 16px; } .map-aside-body p { diff --git a/server/views/map/show.jade b/server/views/map/show.jade index 477c6777f4..953d5a8d01 100644 --- a/server/views/map/show.jade +++ b/server/views/map/show.jade @@ -1,5 +1,61 @@ extends ../layout-wide block content + #accordion.panel-group + for superBlock, index in superBlocks + .panel.panel-default + .panel-heading + h4.panel-title + a.collapsed(data-toggle='collapse', data-parent='#accordion', href='#collapse'+superBlock.name.split(' ').join('-')) + | #{superBlock.name} + div(id = 'collapse'+superBlock.name.split(' ').join('-') class = "panel-collapse collapse") + .panel-body + #nested.panel-group + for challengeBlock in superBlock.blocks + .panel.panel-default + .panel-heading + h4.panel-title + a(data-toggle='collapse', data-parent='#nested', href='#nested-collapse'+challengeBlock.name.split(' ').join('-')) + | #{challengeBlock.name} + div(id = "nested-collapse"+challengeBlock.name.split(' ').join('-') class = "panel-collapse collapse") + .panel-body + for challenge in challengeBlock.challenges + if challenge.completed + p.text-primary.ion-checkmark-circled.padded-ionic-icon.negative-15(name="#{challenge.dashedName}")   + a.faded(href="/challenges/#{challenge.dashedName}" target='_parent') + = challenge.title + span.sr-only= " Complete" + else if challenge.isRequired + p.ion-ios-circle-outline.padded-ionic-icon.negative-15(name="#{challenge.dashedName}")   + a(name="#{challenge.dashedName}" target='_parent' 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 + span.text-primary     + strong * + else + p.ion-ios-circle-outline.padded-ionic-icon.negative-15(name="#{challenge.dashedName}")   + a(name="#{challenge.dashedName}" target='_parent' 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 + + + + .row .col-xs-12.col-md-6.col-md-offset-3 for superBlock, index in superBlocks @@ -18,7 +74,7 @@ block content .col-xs-12.col-sm-9.col-md-10 if challenge.completed p.text-primary.ion-checkmark-circled.padded-ionic-icon.negative-15(name="#{challenge.dashedName}")   - a(href="/challenges/#{challenge.dashedName}" target='_parent') + a.faded(href="/challenges/#{challenge.dashedName}" target='_parent') = challenge.title span.sr-only= " Complete" else if challenge.isRequired