diff options
| author | Mark Otto <[email protected]> | 2014-02-08 16:01:56 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-08 16:01:56 -0800 |
| commit | e3cfd5821db94df0d6eb483d1f859da9dddd55a8 (patch) | |
| tree | 8af2dc5a1442b8974ecc7809ca516f2c67fde39b /docs/examples/dashboard/dashboard.css | |
| parent | 08ff305ed7ba689238d4524b0285d37d15aaf8fa (diff) | |
| parent | 842af44fccb338f165eb2ea64bdaffd999850881 (diff) | |
| download | bootstrap-e3cfd5821db94df0d6eb483d1f859da9dddd55a8.tar.xz bootstrap-e3cfd5821db94df0d6eb483d1f859da9dddd55a8.zip | |
Merge branch 'master' into pr/12462
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/examples/dashboard/dashboard.css')
| -rw-r--r-- | docs/examples/dashboard/dashboard.css | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/examples/dashboard/dashboard.css b/docs/examples/dashboard/dashboard.css index 565aff50e..70c7029cc 100644 --- a/docs/examples/dashboard/dashboard.css +++ b/docs/examples/dashboard/dashboard.css @@ -29,12 +29,14 @@ body { @media (min-width: 768px) { .sidebar { position: fixed; - top: 0; + top: 51px; bottom: 0; left: 0; z-index: 1000; display: block; - padding: 70px 20px 20px; + padding: 20px; + overflow-x: hidden; + overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ background-color: #f5f5f5; border-right: 1px solid #eee; } |