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/carousel | |
| 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/carousel')
| -rw-r--r-- | docs/examples/carousel/carousel.css | 19 | ||||
| -rw-r--r-- | docs/examples/carousel/index.html | 6 |
2 files changed, 12 insertions, 13 deletions
diff --git a/docs/examples/carousel/carousel.css b/docs/examples/carousel/carousel.css index a728bd899..076ac232a 100644 --- a/docs/examples/carousel/carousel.css +++ b/docs/examples/carousel/carousel.css @@ -16,19 +16,19 @@ body { .navbar-wrapper { position: absolute; top: 0; - left: 0; right: 0; + left: 0; z-index: 20; } /* Flip around the padding for proper display in narrow viewports */ .navbar-wrapper .container { - padding-left: 0; padding-right: 0; + padding-left: 0; } .navbar-wrapper .navbar { - padding-left: 15px; padding-right: 15px; + padding-left: 15px; } @@ -65,21 +65,21 @@ body { /* Pad the edges of the mobile views a bit */ .marketing { - padding-left: 15px; padding-right: 15px; + padding-left: 15px; } /* Center align the text within the three columns below the carousel */ .marketing .col-lg-4 { - text-align: center; margin-bottom: 20px; + text-align: center; } .marketing h2 { font-weight: normal; } .marketing .col-lg-4 p { - margin-left: 10px; margin-right: 10px; + margin-left: 10px; } @@ -106,8 +106,8 @@ body { /* Remove the edge padding needed for mobile */ .marketing { - padding-left: 0; padding-right: 0; + padding-left: 0; } /* Navbar positioning foo */ @@ -115,12 +115,12 @@ body { margin-top: 20px; } .navbar-wrapper .container { - padding-left: 15px; padding-right: 15px; + padding-left: 15px; } .navbar-wrapper .navbar { - padding-left: 0; padding-right: 0; + padding-left: 0; } /* The navbar becomes detached from the top, so we round the corners */ @@ -138,7 +138,6 @@ body { .featurette-heading { font-size: 50px; } - } @media (min-width: 992px) { diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html index 3f53947b8..df92c1e01 100644 --- a/docs/examples/carousel/index.html +++ b/docs/examples/carousel/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"> @@ -199,8 +199,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> |