diff options
| author | Mark Otto <[email protected]> | 2011-09-08 23:02:13 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-09-08 23:02:13 -0700 |
| commit | 1a8fb2dbf76b19c899ff8ae73a87c3727c1113cf (patch) | |
| tree | fc67e274699dd774de3aefadf95635bf071d9b74 /docs/assets/css/docs.css | |
| parent | ba08055a7be248582ce6b5ba00bf04f5c821bcdd (diff) | |
| parent | 5960711d0f79f7031b444bafba9a856c77f697bc (diff) | |
| download | bootstrap-1a8fb2dbf76b19c899ff8ae73a87c3727c1113cf.tar.xz bootstrap-1a8fb2dbf76b19c899ff8ae73a87c3727c1113cf.zip | |
resolve conflict
Diffstat (limited to 'docs/assets/css/docs.css')
| -rw-r--r-- | docs/assets/css/docs.css | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index dd62bcb9e..b8ac95c42 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -222,6 +222,7 @@ div.topbar-wrapper div.topbar .topbar-inner { position: relative; height: 40px; margin: 5px 0 15px; + z-index: 1; } #bootstrap-js div.topbar-wrapper div.topbar { |