From 951a24fe63c169c47002692ac0a4cab353d8ec26 Mon Sep 17 00:00:00 2001 From: Manish-Giri Date: Wed, 22 Jun 2016 21:54:22 -0400 Subject: [PATCH 1/5] Fixed quotations in Record Collection --- .../basic-javascript.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed/challenges/01-front-end-development-certification/basic-javascript.json b/seed/challenges/01-front-end-development-certification/basic-javascript.json index 4cd62c2f5b..ce029c7fb0 100644 --- a/seed/challenges/01-front-end-development-certification/basic-javascript.json +++ b/seed/challenges/01-front-end-development-certification/basic-javascript.json @@ -4537,7 +4537,7 @@ " \"2548\": {", " \"album\": \"Slippery When Wet\",", " \"artist\": \"Bon Jovi\",", - " tracks: [ ", + " \"tracks\": [ ", " \"Let It Rock\", ", " \"You Give Love a Bad Name\" ", " ]", From bf485ddc34926c3d499286ac7899c656db07b604 Mon Sep 17 00:00:00 2001 From: sthodup1 Date: Wed, 22 Jun 2016 22:14:46 -0500 Subject: [PATCH 2/5] basicJavascript.json - Clarify testing criteria --- .../basic-javascript.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/seed/challenges/01-front-end-development-certification/basic-javascript.json b/seed/challenges/01-front-end-development-certification/basic-javascript.json index 4cd62c2f5b..7383770dc5 100644 --- a/seed/challenges/01-front-end-development-certification/basic-javascript.json +++ b/seed/challenges/01-front-end-development-certification/basic-javascript.json @@ -3639,8 +3639,8 @@ "function chainToSwitch(val) {\n var answer = \"\";\n\n switch (val) {\n case \"bob\":\n answer = \"Marley\";\n break;\n case 42:\n answer = \"The Answer\";\n break;\n case 1:\n answer = \"There is no #1\";\n break;\n case 99:\n answer = \"Missed me by this much!\";\n break;\n case 7:\n answer = \"Ate Nine\";\n }\n return answer; \n}" ], "tests": [ - "assert(!/else/g.test(code), 'message: You should not use any else statements');", - "assert(!/if/g.test(code), 'message: You should not use any if statements');", + "assert(!/else/g.test(code), 'message: You should not use any else statements anywhere in the editor');", + "assert(!/if/g.test(code), 'message: You should not use any if statements anywhere in the editor');", "assert(code.match(/break/g).length >= 4, 'message: You should have at least four break statements');", "assert(chainToSwitch(\"bob\") === \"Marley\", 'message: chainToSwitch(\"bob\") should be \"Marley\"');", "assert(chainToSwitch(42) === \"The Answer\", 'message: chainToSwitch(42) should be \"The Answer\"');", From 0a2a5b798ff00f5e5bf2e41bb1eb5659a87c1ef0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Fortier?= Date: Thu, 23 Jun 2016 00:10:17 -0400 Subject: [PATCH 3/5] navbar redirect to next-challenge navbar always redirects to next-challenge --- server/views/partials/navbar.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/views/partials/navbar.jade b/server/views/partials/navbar.jade index f81e1e2d9b..305fb9e179 100644 --- a/server/views/partials/navbar.jade +++ b/server/views/partials/navbar.jade @@ -3,7 +3,7 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height button.hamburger.navbar-toggle(type='button', data-toggle='collapse', data-target='.navbar-collapse') .col-xs-12 span.hamburger-text Menu - a.navbar-brand(href='/') + a.navbar-brand(href='/challenges/next-challenge') img.img-responsive.nav-logo(src='https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg', alt='learn to code javascript at Free Code Camp logo') .collapse.navbar-collapse ul.nav.navbar-nav.navbar-right.hamburger-dropdown @@ -33,4 +33,4 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height a(href='/' + user.username) [ #{user.points} ] li.hidden-xs.hidden-sm.avatar a(href='/' + user.username) - img.profile-picture.float-right(src='#{user.picture}') + img.profile-picture.float-right(src='#{user.picture}') \ No newline at end of file From a3b3334f1f2eec6386bae14fef8a54fde1945e0a Mon Sep 17 00:00:00 2001 From: Arun Date: Thu, 23 Jun 2016 15:11:12 +0530 Subject: [PATCH 4/5] Fix redundancy in description --- .../01-front-end-development-certification/basic-javascript.json | 1 - 1 file changed, 1 deletion(-) diff --git a/seed/challenges/01-front-end-development-certification/basic-javascript.json b/seed/challenges/01-front-end-development-certification/basic-javascript.json index ce029c7fb0..630b72504d 100644 --- a/seed/challenges/01-front-end-development-certification/basic-javascript.json +++ b/seed/challenges/01-front-end-development-certification/basic-javascript.json @@ -4517,7 +4517,6 @@ "id": "56533eb9ac21ba0edf2244cf", "title": "Record Collection", "description": [ - "You are given an object representing (a small part of) your record collection. Each album is identified by a unique id number and has several properties. Not all albums have complete information.", "You are given a JSON object representing (a small part of) your record collection. Each album is identified by a unique id number (its key) and has several properties. Not all albums have complete information.", "Write a function which takes an id, a property (prop), and a value.", "For the given id in collection:", From b2f9c9f47c5cc67741cb35291c43e7a09c1a5c56 Mon Sep 17 00:00:00 2001 From: "Daniel L. Weber" Date: Fri, 17 Jun 2016 16:11:30 -0400 Subject: [PATCH 5/5] Improved mobile layouts to map page Made adjustments to accomodate iphone Made buttons responsive instead of hard coded widths Ajusted media query widths Changed order of buttons so input is on left Added padding before collapse button when that row is collapsed Map aside styled as originally was --- client/less/map.less | 169 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 150 insertions(+), 19 deletions(-) diff --git a/client/less/map.less b/client/less/map.less index 49ca40f0b3..bfaeedfcac 100644 --- a/client/less/map.less +++ b/client/less/map.less @@ -74,16 +74,33 @@ padding-top:30px; } p { - margin: 5px 0 20px; + margin: 5px 0 20px; @media (max-width: 720px) { margin-bottom:10px; } + @media only screen and (min-width: 480px) and (max-width: 670px) { + margin-top: -30px; + margin-bottom: 10px; + font-size: 14px; + } + @media only screen and (min-width: 200px) and (max-width: 479px) { + margin-top: -30px; + margin-bottom: 10px; + font-size: 12px; + } } hr { margin:30px 0; + @media (max-width: 720px) { margin:25px 0; } + @media only screen and (min-width: 480px) and (max-width: 670px) { + margin: 15px 0; + } + @media only screen and (min-width: 200px) and (max-width: 479px) { + margin: 10px 0; + } } .flashMessage { position:fixed; @@ -145,25 +162,25 @@ #nested { margin:0 10px; @media (max-width: 400px) { - margin:0; + margin:0; } } a:focus { - text-decoration: none; - color:darkgreen; + text-decoration: none; + color:darkgreen; } a:focus:hover { - text-decoration: underline; - color:#001800; + text-decoration: underline; + color:#001800; } h2 > a { - width:100%; - display:block; - background:#efefef; - padding:10px 0; - padding-left:50px; - padding-right:20px; - } + width:100%; + display:block; + background:#efefef; + padding:10px 0; + padding-left:50px; + padding-right:20px; + } h3 { margin:15px 0; @@ -194,20 +211,19 @@ } .challengeBlockDescription { - margin:0; - margin-top:-10px; - padding:0 15px 23px 30px; - } + margin:0; + margin-top:-10px; + padding:0 15px 23px 30px; + } span.no-link-underline { position:absolute; margin-left:-30px; color: #666; } - div > div:last-child { margin-bottom:30px - } + } } .challengeBlockTime { font-size: 18px; @@ -258,6 +274,81 @@ } } +@media only screen and (min-width: 480px) and (max-width: 670px) { + .map-fixed-header { + .row.map-buttons { + width: 50%; + float: left; + padding-bottom: 10px; + margin-left: 0px; + margin-right: 0px; + button, button.map-buttons { + width: 100%; + } + .input-group { + margin-top: 0; + width: 100%; + } + } + .map-buttons:first-of-type { + float: right; + padding-left: 10px; + } + hr { + clear: both; + margin: 9px 0; + } + } + .map-accordion { + top: 136px; + h2 { + margin: 5px 0; + a { + font-size: 16px; + } + } + h3 > a { + font-size: 15px; + } + h3:first-child { + margin-top: 10px; + } + } +} +@media only screen and (min-width: 200px) and (max-width: 479px) { + .map-fixed-header { + .row.map-buttons { + width: 100%; + padding-bottom: 10px; + margin-left: 0px; + margin-right: 0px; + button, button.map-buttons { + width: 100%; + } + .input-group { + margin-top: 0; + width: 100%; + } + } + } + + .map-accordion { + top: 172px; + h2 { + margin: 10px 0; + a { + font-size: 18px; + } + } + h3 > a { + font-size: 17px; + } + h3:first-child { + margin-top: 10px; + } + } +} + .map-aside-action-item { display: -webkit-flex; display: flex; @@ -316,6 +407,46 @@ background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNzEuNDI5IDE3MS40MjkiIGZpbGw9IiMzYTMxMzMiPjxwYXRoIGQ9Ik0xMjIuNDMzLDEwNi4xMzhsLTE2LjI5NSwxNi4yOTVjLTAuNzQ0LDAuNzQ0LTEuNiwxLjExNi0yLjU2NiwxLjExNmMtMC45NjgsMC0xLjgyMy0wLjM3Mi0yLjU2Ny0xLjExNmwtMTUuMjktMTUuMjkgbC0xNS4yOSwxNS4yOWMtMC43NDQsMC43NDQtMS42LDEuMTE2LTIuNTY3LDEuMTE2cy0xLjgyMy0wLjM3Mi0yLjU2Ny0xLjExNmwtMTYuMjk0LTE2LjI5NWMtMC43NDQtMC43NDQtMS4xMTYtMS42LTEuMTE2LTIuNTY2IGMwLTAuOTY4LDAuMzcyLTEuODIzLDEuMTE2LTIuNTY3bDE1LjI5LTE1LjI5bC0xNS4yOS0xNS4yOWMtMC43NDQtMC43NDQtMS4xMTYtMS42LTEuMTE2LTIuNTY3czAuMzcyLTEuODIzLDEuMTE2LTIuNTY3IEw2NS4yOSw0OC45OTZjMC43NDQtMC43NDQsMS42LTEuMTE2LDIuNTY3LTEuMTE2czEuODIzLDAuMzcyLDIuNTY3LDEuMTE2bDE1LjI5LDE1LjI5bDE1LjI5LTE1LjI5IGMwLjc0NC0wLjc0NCwxLjYtMS4xMTYsMi41NjctMS4xMTZjMC45NjcsMCwxLjgyMiwwLjM3MiwyLjU2NiwxLjExNmwxNi4yOTUsMTYuMjk0YzAuNzQ0LDAuNzQ0LDEuMTE2LDEuNiwxLjExNiwyLjU2NyBzLTAuMzcyLDEuODIzLTEuMTE2LDIuNTY3bC0xNS4yOSwxNS4yOWwxNS4yOSwxNS4yOWMwLjc0NCwwLjc0NCwxLjExNiwxLjYsMS4xMTYsMi41NjcgQzEyMy41NDksMTA0LjUzOSwxMjMuMTc3LDEwNS4zOTQsMTIyLjQzMywxMDYuMTM4eiBNMTQ2LjQyOSw4NS43MTRjMC0xMS4wMTItMi43MTctMjEuMTY4LTguMTQ4LTMwLjQ2OSBzLTEyLjc5Ny0xNi42NjctMjIuMDk4LTIyLjA5OFM5Ni43MjYsMjUsODUuNzE0LDI1cy0yMS4xNjgsMi43MTYtMzAuNDY5LDguMTQ3UzM4LjU3OSw0NS45NDUsMzMuMTQ3LDU1LjI0NlMyNSw3NC43MDMsMjUsODUuNzE0IHMyLjcxNiwyMS4xNjgsOC4xNDcsMzAuNDY5czEyLjc5NywxNi42NjYsMjIuMDk4LDIyLjA5OHMxOS40NTcsOC4xNDgsMzAuNDY5LDguMTQ4czIxLjE2OC0yLjcxNywzMC40NjktOC4xNDggczE2LjY2Ni0xMi43OTcsMjIuMDk4LTIyLjA5OFMxNDYuNDI5LDk2LjcyNiwxNDYuNDI5LDg1LjcxNHogTTE3MS40MjksODUuNzE0YzAsMTUuNTUxLTMuODMyLDI5Ljg5My0xMS40OTYsNDMuMDI0IGMtNy42NjQsMTMuMTMzLTE4LjA2MiwyMy41My0zMS4xOTQsMzEuMTk0Yy0xMy4xMzIsNy42NjQtMjcuNDc0LDExLjQ5Ni00My4wMjQsMTEuNDk2cy0yOS44OTItMy44MzItNDMuMDI0LTExLjQ5NiBjLTEzLjEzMy03LjY2NC0yMy41MzEtMTguMDYyLTMxLjE5NC0zMS4xOTRDMy44MzIsMTE1LjYwNywwLDEwMS4yNjUsMCw4NS43MTRTMy44MzIsNTUuODIyLDExLjQ5Niw0Mi42OSBjNy42NjQtMTMuMTMzLDE4LjA2Mi0yMy41MzEsMzEuMTk0LTMxLjE5NEM1NS44MjIsMy44MzIsNzAuMTY0LDAsODUuNzE0LDBzMjkuODkzLDMuODMyLDQzLjAyNCwxMS40OTYgYzEzLjEzMyw3LjY2NCwyMy41MywxOC4wNjIsMzEuMTk0LDMxLjE5NEMxNjcuNTk3LDU1LjgyMiwxNzEuNDI5LDcwLjE2NCwxNzEuNDI5LDg1LjcxNHoiLz48L3N2Zz4=) } +.map-aside-body { + .map-fixed-header { + p { + margin-top: 0; + font-size: 16px; + } + .row.map-buttons { + float: none; + width: 100%; + text-align: center; + button { + width: 300px; + } + .input-group { + width: 300px; + padding-top: 5px; + } + } + } + .map-buttons:first-of-type { + float: none; + padding-left: 0; + } + .map-accordion { + top: 180px; + h2 { + margin: 15px 0; + a { + padding: 10px 0; + padding-left: 50px; + padding-right: 20px; + font-size: 20px; + } + } + h3 > a { + font-size: 20px; + } + } +} + .night { .map-fixed-header { background-color: @night-body-bg;