Merge branch 'master' into grunt

This commit is contained in:
Ben Word
2013-02-15 11:00:26 -06:00
22 changed files with 747 additions and 937 deletions

View File

@@ -21,10 +21,6 @@ body { }
.banner { }
/* Fixed Topbar Navigation */
body.top-navbar { padding-top: 60px; }
body.admin-bar .navbar-fixed-top { top: 28px; }
/* ==========================================================================
@@ -87,9 +83,6 @@ figure.alignnone { margin-left: 0; margin-right: 0; }
Media Queries
========================================================================== */
@media (max-width: 979px) {
/* Fix top padding when using the responsive grid with the fixed topbar */
body.top-navbar {
padding-top: 0;
}
}
@media (max-width: 767px) {
}