Skip to content

B
bootstrap
Commit 78e81a1d authored by Mark Otto's avatar Mark Otto
Browse files
Options

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

Conflicts:
	docs/assets/css/pack.min.css
parents 7e7264e2 95f24dca
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
docs/assets/css/docs.css
View file @ 78e81a1d
...@@ -1211,7 +1211,7 @@ h1[id] { ...@@ -1211,7 +1211,7 @@ h1[id] {
.bs-customizer .toggle { .bs-customizer .toggle {
float: right; float: right;
margin-top: 85px; /* On account of ghetto navbar fix */ margin-top: 25px;
} }
/* Headings and form contrls */ /* Headings and form contrls */
......
docs/assets/css/pack.min.css
View file @ 78e81a1d
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment