Merge branch 'master' of github.com:twbs/bootstrap

Conflicts: docs/assets/css/pack.min.css

Merge branch 'master' of github.com:twbs/bootstrap
Conflicts: docs/assets/css/pack.min.css
78e81a1d · Mark Otto · 7e7264e2 · 95f24dca · 78e81a1d · 78e81a1d
Commit 78e81a1d authored 11 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 2 deletions
+2 -2
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -1211,7 +1211,7 @@ h1[id] {

 .bs-customizer .toggle {
  float: right;
-  margin-top: 85px; /* On account of ghetto navbar fix */
+  margin-top: 25px;
 }

 /* Headings and form contrls */

--- a/docs/assets/css/pack.min.css
+++ b/docs/assets/css/pack.min.css