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/carousel | |
| 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/carousel')
| -rw-r--r-- | docs/examples/carousel/carousel.css | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/examples/carousel/carousel.css b/docs/examples/carousel/carousel.css index 076ac232a..08448b99c 100644 --- a/docs/examples/carousel/carousel.css +++ b/docs/examples/carousel/carousel.css @@ -116,11 +116,11 @@ body { } .navbar-wrapper .container { padding-right: 15px; - padding-left: 15px; + padding-left: 15px; } .navbar-wrapper .navbar { padding-right: 0; - padding-left: 0; + padding-left: 0; } /* The navbar becomes detached from the top, so we round the corners */ |