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

Conflicts:
	public/css/main.less
This commit is contained in:
Quincy Larson
2015-06-04 00:22:16 -07:00

View File

@ -1092,6 +1092,7 @@ hr {
.iframe-scroll { .iframe-scroll {
position: fixed !important; position: fixed !important;
margin-top: 75px; margin-top: 75px;
z-index: 1;
} }
} }
@media only screen and (max-width: 992px) { @media only screen and (max-width: 992px) {