Merge branch 'master' into bootstrap-update

Conflicts: assets/css/app.css
2014-11-29 00:12:51 -06:00 · 2014-11-29 00:12:51 -06:00 · 012c8ed145
parent ada1c6a4e4 66db5c5f6a
commit 012c8ed145
1 changed files with 9 additions and 0 deletions
--- a/assets/css/app.css
+++ b/assets/css/app.css
@ -35,6 +35,15 @@ body {
    margin-top: 28px;
 }

+.navbar .navbar-inner {
+    padding: 0;
+}
+
+.navbar .nav {
+    margin: 0;
+    width: 100%;
+}
+
 .navbar .nav li {
    display: table-cell;
    width: 1%;