Merge branch 'bonfire-improvement' of https://github.com/FreeCodeCamp/freecodecamp into bonfire-improvement

Conflicts:
	public/css/main.less
This commit is contained in:
Michael Q Larson
2015-01-18 16:13:23 -08:00
4 changed files with 5051 additions and 26 deletions

View File

@@ -526,10 +526,9 @@ thead {
}
}
.codeMirrorView {
font-size: 22px;
font-family: 'Inconsolata', monospace;
font-weight: 300;
form.code {
font-size: 16px;
font-family: "Courier New", "Lucida Console", monospace;
}
//uncomment this to see the dimensions of all elements outlined in red
@@ -537,4 +536,4 @@ thead {
// border-color: red;
// border-width: 1px;
// border-style: solid;
//}
//}