gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging

Browse Source 
Conflicts:
	app.js
	controllers/fieldGuide.js
	controllers/story.js
	seed/challenges/basic-html5-and-css.json
	seed/challenges/bootstrap.json
	seed/field-guides.json
	server/views/partials/navbar.jade
	views/resources/jobs-form.jade
	views/resources/nonprofits-form.jade
	views/resources/pmi-acp-agile-project-managers-form.jade
This commit is contained in:
Quincy Larson
2015-06-09 13:48:29 -07:00
parent ccc440fb4f 78dac937f7
commit 61486c2d7c
515 changed files with 5784 additions and 235794 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/css/main.less
View File

@@ -336,6 +336,15 @@ ul {
}
}
.thin-progress-bar {
height: 8px;
margin-top:3px;
margin-bottom:0px;
width: 60%;
margin-right: auto;
margin-left: auto;
}
.panel-body {
margin-bottom: -6px;
}