2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-21 13:24:08 +03:00

Merge branch 'master' into docs_derp

Conflicts:
	docs/_includes/footer.html
	docs/assets/css/docs.css
This commit is contained in:
Mark Otto
2014-01-01 12:27:09 -08:00
46 changed files with 107 additions and 92 deletions
+6 -1
View File
@@ -133,8 +133,13 @@ body {
.bs-docs-nav .navbar-toggle .icon-bar {
background-color: #563d7c;
}
.bs-docs-nav .navbar-toggle:hover {
.bs-docs-nav .navbar-header .navbar-toggle {
border-color: #fff;
}
.bs-docs-nav .navbar-header .navbar-toggle:hover,
.bs-docs-nav .navbar-header .navbar-toggle:focus {
background-color: #f9f9f9;
border-color: #f9f9f9;
}