diff options
| author | Mark Otto <[email protected]> | 2014-10-26 22:59:02 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-10-26 22:59:02 -0700 |
| commit | f07477d29072bc0a7b57bd17988c6d01f7b18266 (patch) | |
| tree | 5c5cbc9f08e1e07cedf29b301b5273758881eee9 /docs/examples/carousel | |
| parent | f26821a83a5766f0ce2b68aff12577679b6d8282 (diff) | |
| parent | dcee894a8ca811abcc47ac59f63bb3918efafab1 (diff) | |
| download | bootstrap-f07477d29072bc0a7b57bd17988c6d01f7b18266.tar.xz bootstrap-f07477d29072bc0a7b57bd17988c6d01f7b18266.zip | |
Merge branch 'master' into derp
Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css.map
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css.map
less/progress-bars.less
less/theme.less
Diffstat (limited to 'docs/examples/carousel')
| -rw-r--r-- | docs/examples/carousel/carousel.css | 3 | ||||
| -rw-r--r-- | docs/examples/carousel/index.html | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/docs/examples/carousel/carousel.css b/docs/examples/carousel/carousel.css index a5143f5e0..8833f82dd 100644 --- a/docs/examples/carousel/carousel.css +++ b/docs/examples/carousel/carousel.css @@ -8,7 +8,6 @@ body { } - /* CUSTOMIZE THE NAVBAR -------------------------------------------------- */ @@ -62,7 +61,6 @@ body { } - /* MARKETING CONTENT -------------------------------------------------- */ @@ -95,7 +93,6 @@ body { } - /* RESPONSIVE CSS -------------------------------------------------- */ diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html index ec31b8155..5668bab8b 100644 --- a/docs/examples/carousel/index.html +++ b/docs/examples/carousel/index.html @@ -114,7 +114,6 @@ </div><!-- /.carousel --> - <!-- Marketing messaging and featurettes ================================================== --> <!-- Wrap the rest of the page in another container to center all the content. --> |