From feb0678a46d98d279461de5adb119ca99894fb93 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Sat, 6 Jun 2015 22:51:39 -0700 Subject: [PATCH] start shrinking down the views. --- controllers/challenge.js | 7 ++----- public/css/main.less | 4 ++++ views/coursewares/showHTML.jade | 26 +++++++------------------- 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/controllers/challenge.js b/controllers/challenge.js index 12a3c3655e5..f9f2057b074 100644 --- a/controllers/challenge.js +++ b/controllers/challenge.js @@ -200,8 +200,7 @@ exports.returnIndividualChallenge = function(req, res, next) { title: challenge.name, dashedName: dashedName, name: challenge.name, - brief: challenge.description[0], - details: challenge.description.slice(1), + details: challenge.description, tests: challenge.tests, challengeSeed: challenge.challengeSeed, verb: resources.randomVerb(), @@ -218,8 +217,7 @@ exports.returnIndividualChallenge = function(req, res, next) { title: challenge.name, dashedName: dashedName, name: challenge.name, - brief: challenge.description[0], - details: challenge.description.slice(1), + details: challenge.description, tests: challenge.tests, challengeSeed: challenge.challengeSeed, verb: resources.randomVerb(), @@ -283,7 +281,6 @@ exports.returnIndividualChallenge = function(req, res, next) { dashedName: dashedName, name: challenge.name, difficulty: Math.floor(+challenge.difficulty), - brief: challenge.description.shift(), details: challenge.description, tests: challenge.tests, challengeSeed: challenge.challengeSeed, diff --git a/public/css/main.less b/public/css/main.less index 245fc0a9748..90215200751 100644 --- a/public/css/main.less +++ b/public/css/main.less @@ -251,6 +251,10 @@ ul { margin-top: -20px; } +.negative-bottom-margin-30 { + margin-bottom: -30px; +} + .large-p { font-size: 18px; } diff --git a/views/coursewares/showHTML.jade b/views/coursewares/showHTML.jade index a3cf951946c..56cc0fbc80e 100644 --- a/views/coursewares/showHTML.jade +++ b/views/coursewares/showHTML.jade @@ -25,26 +25,14 @@ block content .well .row .col-xs-12 - h2.text-center= name + h4.text-center.negative-10= name .bonfire-instructions - p.wrappable!= brief - #brief-instructions - #more-info.btn.btn-primary.btn-block.btn-primary-ghost - span.ion-arrow-down-b - | More information - #long-instructions.row.hide - .col-xs-12 - for sentence in details - p.wrappable!= sentence - #less-info.btn.btn-primary.btn-block.btn-primary-ghost - span.ion-arrow-up-b - | Less information - br + for sentence in details + p.wrappable.!= sentence + .negative-bottom-margin-30 if (user) - a.btn.btn-primary.btn-big.btn-block#next-courseware-button - | Go to my next challenge - br - | (ctrl + enter) + a.btn.btn-primary.btn-sm.btn-block.negative-10#next-courseware-button Go to my next challenge (ctrl + enter) + if (user.sentSlackInvite) .button-spacer .btn-group.input-group.btn-group-justified @@ -58,7 +46,7 @@ block content script. var userLoggedIn = true; else - a.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress + a.btn.signup-btn.btn-block.btn-sm.btn-block.negative-15(href='/login') Sign in so you can save your progress script. var userLoggedIn = false; .button-spacer