Merge branch 'master' into bonfire-improvement

Conflicts:
	views/bonfire/bonfire.jade
This commit is contained in:
Michael Q Larson
2015-01-21 15:42:08 -08:00
12 changed files with 71 additions and 43 deletions

View File

@@ -226,10 +226,15 @@ ul {
height: 30px;
margin-top: -5px;
}
@media (min-width: 767px) and (max-width: 890px) {
height: 30px;
margin-top: -5px;
}
}
.navbar-right {
@media (min-width: 768px) {
@media (min-width: 767px) {
padding-right: 50px;
}
@media (max-width: 991px) and (min-width: 768px) {