0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-28 20:52:21 +01:00

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

Conflicts:
	docs/assets/css/pack.min.css
This commit is contained in:
Mark Otto 2014-01-15 16:25:29 -08:00
commit 78e81a1de9
2 changed files with 2 additions and 2 deletions

View File

@ -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 */

File diff suppressed because one or more lines are too long