diff options
| author | Mark Otto <[email protected]> | 2012-10-01 11:27:40 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-10-01 11:27:40 -0700 |
| commit | e6d6c7a413d69afc41c3c57b72f1b0dedfdbb516 (patch) | |
| tree | cba5e4f18108c82b0d67298e671acd3c69b15fa7 /docs/assets/css/docs.css | |
| parent | 8da78223ffe7922f46167e7429c40339e7bc53d2 (diff) | |
| parent | c6c1ada60074e420fa93174cb3db167faf618e2b (diff) | |
| download | bootstrap-e6d6c7a413d69afc41c3c57b72f1b0dedfdbb516.tar.xz bootstrap-e6d6c7a413d69afc41c3c57b72f1b0dedfdbb516.zip | |
Merge branch '2.1.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
less/navs.less
Diffstat (limited to 'docs/assets/css/docs.css')
| -rw-r--r-- | docs/assets/css/docs.css | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index bba138415..1a8e2fdeb 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -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 |