diff options
| author | Mark Otto <[email protected]> | 2014-02-07 18:36:27 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-07 18:36:27 -0800 |
| commit | 06f1293acfc767d950adc329cf4abfc2b5c0b78d (patch) | |
| tree | 738abb0672d3e0a5839a8657c431a202aa190ef0 /docs/examples | |
| parent | d91d9b0ade9165c20d781ced128a751d0ae1fbda (diff) | |
| parent | a2f08158d032c1025ca0c6bf411b8282b606fb7b (diff) | |
| download | bootstrap-06f1293acfc767d950adc329cf4abfc2b5c0b78d.tar.xz bootstrap-06f1293acfc767d950adc329cf4abfc2b5c0b78d.zip | |
Merge branch 'master' into panels_and_tables
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')
| -rw-r--r-- | docs/examples/dashboard/dashboard.css | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/examples/dashboard/dashboard.css b/docs/examples/dashboard/dashboard.css index 9cd455dfd..70c7029cc 100644 --- a/docs/examples/dashboard/dashboard.css +++ b/docs/examples/dashboard/dashboard.css @@ -29,12 +29,12 @@ 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; |