diff options
| author | Mark Otto <[email protected]> | 2013-12-14 16:29:47 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-14 16:29:47 -0800 |
| commit | 323a40cc53dabf0561c588c8f8ccd690c5bb0a03 (patch) | |
| tree | 0f4ab3c35f65a6f88a8b4a8a28001650cdf4ae7a /examples/non-responsive | |
| parent | 89e0f1669f2b4166051affa4eec819475660ed72 (diff) | |
| parent | 83c60ef3eec234b3dac94c841fd1f13f94aab36f (diff) | |
| download | bootstrap-323a40cc53dabf0561c588c8f8ccd690c5bb0a03.tar.xz bootstrap-323a40cc53dabf0561c588c8f8ccd690c5bb0a03.zip | |
Merge branch 'master' into pr/11162
Conflicts:
less/modals.less
Diffstat (limited to 'examples/non-responsive')
| -rw-r--r-- | examples/non-responsive/index.html | 5 | ||||
| -rw-r--r-- | examples/non-responsive/non-responsive.css | 24 |
2 files changed, 17 insertions, 12 deletions
diff --git a/examples/non-responsive/index.html b/examples/non-responsive/index.html index 52776e3fc..1c56b300f 100644 --- a/examples/non-responsive/index.html +++ b/examples/non-responsive/index.html @@ -19,7 +19,7 @@ <link href="non-responsive.css" rel="stylesheet"> <!-- Just for debugging purposes. Don't actually copy this line! --> - <!--[if lt IE 9]><script src="{{ page.base_url }}docs-assets/js/ie8-responsive-file-warning.js"></script><![endif]--> + <!--[if lt IE 9]><script src="../../docs-assets/js/ie8-responsive-file-warning.js"></script><![endif]--> <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> @@ -31,10 +31,11 @@ <body> <!-- Fixed navbar --> - <div class="navbar navbar-default navbar-fixed-top"> + <div class="navbar navbar-default navbar-fixed-top" role="navigation"> <div class="container"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> + <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> diff --git a/examples/non-responsive/non-responsive.css b/examples/non-responsive/non-responsive.css index 526b0b8be..9813bb9fe 100644 --- a/examples/non-responsive/non-responsive.css +++ b/examples/non-responsive/non-responsive.css @@ -8,6 +8,7 @@ body { padding-top: 70px; padding-bottom: 30px; + min-width: 970px; } /* Finesse the page header spacing */ @@ -63,6 +64,9 @@ body { .navbar-toggle { display: none; } +.navbar-collapse { + border-top: 0; +} .navbar-brand { margin-left: -15px; @@ -86,7 +90,7 @@ body { } /* Undo custom dropdowns */ -.navbar .open .dropdown-menu { +.navbar .navbar-nav .open .dropdown-menu { position: absolute; float: left; background-color: #fff; @@ -97,20 +101,20 @@ body { -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); } -.navbar .open .dropdown-menu > li > a { +.navbar-default .navbar-nav .open .dropdown-menu > li > a { color: #333; } -.navbar .open .dropdown-menu > li > a:hover, -.navbar .open .dropdown-menu > li > a:focus, -.navbar .open .dropdown-menu > .active > a, -.navbar .open .dropdown-menu > .active > a:hover, -.navbar .open .dropdown-menu > .active > a:focus { +.navbar .navbar-nav .open .dropdown-menu > li > a:hover, +.navbar .navbar-nav .open .dropdown-menu > li > a:focus, +.navbar .navbar-nav .open .dropdown-menu > .active > a, +.navbar .navbar-nav .open .dropdown-menu > .active > a:hover, +.navbar .navbar-nav .open .dropdown-menu > .active > a:focus { color: #fff !important; background-color: #428bca !important; } -.navbar .open .dropdown-menu > .disabled > a, -.navbar .open .dropdown-menu > .disabled > a:hover, -.navbar .open .dropdown-menu > .disabled > a:focus { +.navbar .navbar-nav .open .dropdown-menu > .disabled > a, +.navbar .navbar-nav .open .dropdown-menu > .disabled > a:hover, +.navbar .navbar-nav .open .dropdown-menu > .disabled > a:focus { color: #999 !important; background-color: transparent !important; } |