diff options
| author | Mark Otto <[email protected]> | 2013-12-14 16:46:40 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-14 16:46:40 -0800 |
| commit | 4c64c1eecdb52d943a50d2c181aeb915a3caed34 (patch) | |
| tree | 93b556ef583bb6a327cad76804bbdf4c5a4c6f4c /examples/offcanvas | |
| parent | 2b56ff04614c4617355d16c14784654e841bcf4d (diff) | |
| parent | d79431ca02683c9d1c754201260f66e5dda15614 (diff) | |
| download | bootstrap-4c64c1eecdb52d943a50d2c181aeb915a3caed34.tar.xz bootstrap-4c64c1eecdb52d943a50d2c181aeb915a3caed34.zip | |
Merge branch 'master' into pr/11302
Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.min.css
Diffstat (limited to 'examples/offcanvas')
| -rw-r--r-- | examples/offcanvas/index.html | 1 | ||||
| -rw-r--r-- | examples/offcanvas/offcanvas.css | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/examples/offcanvas/index.html b/examples/offcanvas/index.html index 1fc5c551e..a9350bdd6 100644 --- a/examples/offcanvas/index.html +++ b/examples/offcanvas/index.html @@ -31,6 +31,7 @@ <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/offcanvas/offcanvas.css b/examples/offcanvas/offcanvas.css index 71ad2ac2c..ef632dc00 100644 --- a/examples/offcanvas/offcanvas.css +++ b/examples/offcanvas/offcanvas.css @@ -2,7 +2,8 @@ * Style tweaks * -------------------------------------------------- */ -html { +html, +body { overflow-x: hidden; /* Prevent scroll on narrow devices */ } body { |