diff options
| author | Mark Otto <[email protected]> | 2014-03-08 20:34:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-08 20:34:29 -0800 |
| commit | ef5d8e98e2e9aa87496eef8359667f7e052ae636 (patch) | |
| tree | 0d202235247562f094df841960170b1245ea728b /docs/examples/offcanvas | |
| parent | dc5917bedfda321b72310209d2807ea10347f7ed (diff) | |
| parent | e4d13e238d0d6ea241f4e77328f6551206d17362 (diff) | |
| download | bootstrap-ef5d8e98e2e9aa87496eef8359667f7e052ae636.tar.xz bootstrap-ef5d8e98e2e9aa87496eef8359667f7e052ae636.zip | |
Merge branch 'master' into sr-only-focusable
Conflicts:
dist/css/bootstrap.css
Diffstat (limited to 'docs/examples/offcanvas')
| -rw-r--r-- | docs/examples/offcanvas/offcanvas.css | 10 | ||||
| -rw-r--r-- | docs/examples/offcanvas/offcanvas.js | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/docs/examples/offcanvas/offcanvas.css b/docs/examples/offcanvas/offcanvas.css index 50130a885..2a72199d5 100644 --- a/docs/examples/offcanvas/offcanvas.css +++ b/docs/examples/offcanvas/offcanvas.css @@ -21,10 +21,18 @@ footer { .row-offcanvas { position: relative; -webkit-transition: all .25s ease-out; - -moz-transition: all .25s ease-out; + -o-transition: all .25s ease-out; transition: all .25s ease-out; } + .row-offcanvas-right { + right: 0; + } + + .row-offcanvas-left { + left: 0; + } + .row-offcanvas-right .sidebar-offcanvas { right: -50%; /* 6 columns */ diff --git a/docs/examples/offcanvas/offcanvas.js b/docs/examples/offcanvas/offcanvas.js index 12f2dff51..ade5751fd 100644 --- a/docs/examples/offcanvas/offcanvas.js +++ b/docs/examples/offcanvas/offcanvas.js @@ -1,5 +1,5 @@ -$(document).ready(function() { - $('[data-toggle=offcanvas]').click(function() { - $('.row-offcanvas').toggleClass('active'); +$(document).ready(function () { + $('[data-toggle=offcanvas]').click(function () { + $('.row-offcanvas').toggleClass('active') }); });
\ No newline at end of file |