github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-02-19 10:04:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.3.0-wip' into 3.0.0-wip

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/css/docs.css
	docs/assets/js/application.js
	docs/components.html
	docs/templates/pages/components.mustache
	less/sprites.less
This commit is contained in:
Mark Otto
2013-01-31 17:57:31 -08:00
parent d30f47efb2 baadc33c88
commit 83e5c01856
8 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/assets/css/docs.css
View File

@@ -149,6 +149,9 @@ section > ul li {
background-color: #eee;
border: 1px solid #ddd;
}
.show-grid [class*="span"]:hover {
background-color: #ddd;
}
@@ -522,4 +525,4 @@ input.focused {
.bs-docs-sidenav {
width: 260px;
}
}
}