diff options
| author | Mark Otto <[email protected]> | 2014-02-08 16:52:22 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-08 16:52:22 -0800 |
| commit | e9199718d64dadc22d61b4cea8c77a2307455823 (patch) | |
| tree | b10f0174a9d564da40df55d658136fef74b6adb9 /docs/examples/dashboard | |
| parent | 4787a69efbe0fcd81228781b3c91dfe198aa0f1b (diff) | |
| parent | 7f88009394e72395aa7a458ae442b0c3037dbd15 (diff) | |
| download | bootstrap-e9199718d64dadc22d61b4cea8c77a2307455823.tar.xz bootstrap-e9199718d64dadc22d61b4cea8c77a2307455823.zip | |
Merge branch 'master' into fix-12154
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')
| -rw-r--r-- | docs/examples/dashboard/dashboard.css | 15 | ||||
| -rw-r--r-- | docs/examples/dashboard/index.html | 6 |
2 files changed, 12 insertions, 9 deletions
diff --git a/docs/examples/dashboard/dashboard.css b/docs/examples/dashboard/dashboard.css index 750124bf8..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; - left: 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; } @@ -42,13 +44,13 @@ body { /* Sidebar navigation */ .nav-sidebar { - margin-left: -20px; margin-right: -21px; /* 20px padding + 1px border */ margin-bottom: 20px; + margin-left: -20px; } .nav-sidebar > li > a { - padding-left: 20px; padding-right: 20px; + padding-left: 20px; } .nav-sidebar > .active > a { color: #fff; @@ -65,8 +67,8 @@ body { } @media (min-width: 768px) { .main { + padding-right: 40px; padding-left: 40px; - pading-right: 40px; } } .main .page-header { @@ -89,5 +91,6 @@ body { margin-bottom: 20px; } .placeholder img { + display: inline-block; border-radius: 50%; } diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html index d06644878..1d5508878 100644 --- a/docs/examples/dashboard/index.html +++ b/docs/examples/dashboard/index.html @@ -3,7 +3,7 @@ <head> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="description" content=""> <meta name="author" content=""> <link rel="shortcut icon" href="../../assets/ico/favicon.ico"> @@ -236,8 +236,8 @@ <!-- Bootstrap core JavaScript ================================================== --> <!-- Placed at the end of the document so the pages load faster --> - <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script> + <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script> - <script src="../../assets/js/holder.js"></script> + <script src="../../assets/js/docs.min.js"></script> </body> </html> |