Merge pull request #7905 from FreeCodeCamp/staging

Release staging

client/less/lib/bootstrap-social/bootstrap-social.less

@@ -86,7 +86,7 @@
   }
 }
 
-.btn-social(@color-bg, @color: #fff) {
+.btn-social(@color-bg, @color: @color-bg) {
   background-color: @color-bg;
   .button-variant(@color, @color-bg, rgba(0,0,0,.2));
 }

server/boot/t-wiki.js

@@ -1,11 +1,17 @@
 module.exports = function(app) {
   var router = app.loopback.Router();
   router.get('/wiki/*', showWiki);
-  router.get('/wiki', showWiki);
+  router.get('/wiki', (req, res) => res.redirect(301, '/wiki/en/'));
 
   app.use(router);
 
   function showWiki(req, res) {
-    res.render('wiki/show', { title: 'Wiki | Free Code Camp' });
+    res.render(
+      'wiki/show',
+      {
+        title: 'Wiki | Free Code Camp',
+        path: req.path.replace(/^\/wiki/, '')
+      }
+    );
   }
 };

server/views/account/settings.jade

@@ -26,7 +26,7 @@ block content
                           i.fa.fa-linkedin
                           | Add my LinkedIn to my portfolio
                   if (!user.google)
-                      a.btn.btn-lg.btn-block.btn-google-plus.btn-link-social(href='/link/google')
+                      a.btn.btn-lg.btn-block.btn-google.btn-link-social(href='/link/google')
                           i.fa.fa-google-plus
                           | Add my Google+ to my portfolio
         .spacer

server/views/wiki/show.jade

@@ -2,6 +2,19 @@ extends ../layout-wide
 block content
   iframe#wikiFrame(frameborder='no')
   script.
-      var lang = window.location.toString().match(/\/\w{2}\//);
-      lang = (lang) ? lang[0] : '/en/';
-      $('#wikiFrame').attr('src','//freecodecamp.github.io/wiki' + lang);
+    var wikiUrl = '//freecodecamp.github.io/wiki';
+    var wikiOrigin = /https?:\/\/freecodecamp.github.io/;
+    var requestedPath = !{JSON.stringify(path) || ''};
+    var lang = window.location.toString().match(/\/\w{2}\//);
+    lang = (lang) ? lang[0] : '/en/';
+    $('#wikiFrame').attr(
+      'src',
+      wikiUrl + (requestedPath ? requestedPath : lang)
+    );
+    window.addEventListener('message', function(e) {
+      if (!wikiOrigin.test(e.origin)) {
+        return null;
+      }
+      history.replaceState(history.state, null, e.data);
+      return null;
+    });