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/cover | |
| 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/cover')
| -rw-r--r-- | docs/examples/cover/cover.css | 4 | ||||
| -rw-r--r-- | docs/examples/cover/index.html | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/examples/cover/cover.css b/docs/examples/cover/cover.css index bac1b08c9..fb478ed09 100644 --- a/docs/examples/cover/cover.css +++ b/docs/examples/cover/cover.css @@ -48,8 +48,8 @@ body { vertical-align: top; } .cover-container { - margin-left: auto; margin-right: auto; + margin-left: auto; } /* Padding for spacing */ @@ -73,8 +73,8 @@ body { margin-left: 20px; } .masthead-nav > li > a { - padding-left: 0; padding-right: 0; + padding-left: 0; font-size: 16px; font-weight: bold; color: #fff; /* IE8 proofing */ diff --git a/docs/examples/cover/index.html b/docs/examples/cover/index.html index 2bef11385..b8ea5ae0f 100644 --- a/docs/examples/cover/index.html +++ b/docs/examples/cover/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"> @@ -68,8 +68,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> |