Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp

Conflicts: public/css/main.less
2015-06-04 00:22:16 -07:00
parent d6e09ad1e5 aa44bb2e3f
commit ee1f336475
1 changed files with 1 additions and 0 deletions
--- a/public/css/main.less
+++ b/public/css/main.less
@ -1092,6 +1092,7 @@ hr {
  .iframe-scroll {
    position: fixed !important;
    margin-top: 75px;
+    z-index: 1;
  }
 }
@media only screen and (max-width: 992px) {