Merge pull request #6248 from bugron/fix/apply-overwritten-prs

Restores changes overwritten by the redesign

server/views/challenges/showBonfire.jade

@@ -97,7 +97,3 @@ block content
       common.username = !{JSON.stringify(user && user.username || '')};
 
     include ../partials/challenge-footer
-    script.
-      if (!!{JSON.stringify(MDNlinks.length)}) {
-          $('#MDN-links').addClass('collapse');
-      }

server/views/challenges/showJS.jade

@@ -91,10 +91,6 @@ block content
 
     include ../partials/challenge-footer
     script.
-      if (!!{JSON.stringify(MDNlinks.length)}) {
-          $('#MDN-links').addClass('collapse');
-      }
-
       common.init.push(function() {
         common.editor.setOption('mode', 'javascript');
       });

server/views/stories/news-nav.jade

@@ -8,7 +8,7 @@
             .button-spacer
     .col-xs-12.col-sm-9
         .input-group
-            input#searchArea.big-text-field.field-responsive.form-control(type='text', placeholder='Search our links')
+            input#searchArea.big-text-field.field-responsive.form-control(type='text', placeholder='Search term or @username')
             span.input-group-btn
                 button#searchbutton.btn.btn-bigger.btn-primary.btn-responsive(type='button') Search
         .spacer