aboutsummaryrefslogtreecommitdiff
path: root/examples/offcanvas
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-11-30 23:35:56 -0800
committerMark Otto <[email protected]>2013-11-30 23:35:56 -0800
commit53047fa587fc8ca5cc0cad751f71fca5470d453a (patch)
treea013806bef23a01e7ff0615f82b629703c553d6a /examples/offcanvas
parentba4c5dae9b8e34e90e86ba28aa6bd5acf3351f0d (diff)
parent57070dcf4525fe82cab6a93300861867aa7f2d1e (diff)
downloadbootstrap-53047fa587fc8ca5cc0cad751f71fca5470d453a.tar.xz
bootstrap-53047fa587fc8ca5cc0cad751f71fca5470d453a.zip
Merge branch 'master' into pr/11536
Conflicts: dist/css/bootstrap.min.css
Diffstat (limited to 'examples/offcanvas')
-rw-r--r--examples/offcanvas/offcanvas.css3
1 files changed, 2 insertions, 1 deletions
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 {