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

Merge branch '2.1.2-wip' into exploratory

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
	less/navs.less
This commit is contained in:
Mark Otto
2012-10-01 11:27:40 -07:00
parent 8da78223ff c6c1ada600
commit e6d6c7a413
7 changed files with 84 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/docs.css
+4 -1
View File
@@ -756,7 +756,7 @@ form.bs-docs-example {
}
.bs-docs-sidenav > li > a {
display: block;
*width: 190px;
width: 190px \9;
margin: 0 0 -1px;
padding: 8px 14px;
border: 1px solid #e5e5e5;
@@ -823,6 +823,9 @@ form.bs-docs-example {
.bs-docs-sidenav {
width: 258px;
}
.bs-docs-sidenav > li > a {
width: 230px \9; /* Override the previous IE8-9 hack */
}
}
/* Desktop