Follow up commit: fix collapse clearing and navbar brand/nav spacing

dist/css/bootstrap.css

@@ -2926,6 +2926,7 @@ button.close {
   float: left;
   padding-top: 15px;
   padding-bottom: 15px;
+  margin-right: 15px;
   font-size: 18px;
   line-height: 20px;
   color: #777777;
@@ -3113,6 +3114,9 @@ button.close {
 }
 
 @media screen and (min-width: 768px) {
+  .nav-collapse {
+    clear: none;
+  }
   .navbar-nav {
     float: left;
     margin-top: 0;

less/navbar.less

@@ -128,6 +128,7 @@
 // Brand/project name
 .navbar-brand {
   float: left;
+  margin-right: 15px;
   padding-top: @navbar-padding-vertical;
   padding-bottom: @navbar-padding-vertical;
   font-size: @font-size-large;
@@ -322,6 +323,11 @@
 
 @media screen and (min-width: @grid-float-breakpoint) {
 
+  // Undo clearing to keep nav and brand horizontal
+  .nav-collapse {
+    clear: none;
+  }
+
   .navbar-nav {
     float: left;
     // undo margin to make nav extend full height of navbar