Merge pull request #9338 from FreeCodeCamp/staging

Release staging

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;
+    text-decoration: none;
-      color:darkgreen;
+    color:darkgreen;
   }
   a:focus:hover {
-      text-decoration: underline;
+    text-decoration: underline;
-      color:#001800;
+    color:#001800;
   }
   h2 > a {
-      width:100%;
+    width:100%;
-      display:block;
+    display:block;
-      background:#efefef;
+    background:#efefef;
-      padding:10px 0;
+    padding:10px 0;
-      padding-left:50px;
+    padding-left:50px;
-      padding-right:20px;
+    padding-right:20px;
-    }
+  }
 
   h3 {
     margin:15px 0;
@@ -194,17 +211,16 @@
   }
 
   .challengeBlockDescription {
-      margin:0;
+    margin:0;
-      margin-top:-10px;
+    margin-top:-10px;
-      padding:0 15px 23px 30px;
+    padding:0 15px 23px 30px;
-    }
+  }
 
   span.no-link-underline {
     position:absolute;
     margin-left:-30px;
     color: #666;
   }
-
   div > div:last-child {
     margin-bottom:30px
   }  
@@ -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;

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 <code>else</code> statements');",
+        "assert(!/else/g.test(code), 'message: You should not use any <code>else</code> statements anywhere in the editor');",
-        "assert(!/if/g.test(code), 'message: You should not use any <code>if</code> statements');",
+        "assert(!/if/g.test(code), 'message: You should not use any <code>if</code> statements anywhere in the editor');",
         "assert(code.match(/break/g).length >= 4, 'message: You should have at least four <code>break</code> statements');",
         "assert(chainToSwitch(\"bob\") === \"Marley\", 'message: <code>chainToSwitch(\"bob\")</code> should be \"Marley\"');",
         "assert(chainToSwitch(42) === \"The Answer\", 'message: <code>chainToSwitch(42)</code> should be \"The Answer\"');",
@@ -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 <code>id</code>, a property (<code>prop</code>), and a <code>value</code>.",
         "For the given <code>id</code> in <code>collection</code>:",
@@ -4537,7 +4536,7 @@
         "    \"2548\": {",
         "      \"album\": \"Slippery When Wet\",",
         "      \"artist\": \"Bon Jovi\",",
-        "      tracks: [ ",
+        "      \"tracks\": [ ",
         "        \"Let It Rock\", ",
         "        \"You Give Love a Bad Name\" ",
         "      ]",

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