diff options
| author | Mark Otto <[email protected]> | 2014-02-08 16:52:22 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-08 16:52:22 -0800 |
| commit | e9199718d64dadc22d61b4cea8c77a2307455823 (patch) | |
| tree | b10f0174a9d564da40df55d658136fef74b6adb9 /docs/examples/screenshots | |
| parent | 4787a69efbe0fcd81228781b3c91dfe198aa0f1b (diff) | |
| parent | 7f88009394e72395aa7a458ae442b0c3037dbd15 (diff) | |
| download | bootstrap-e9199718d64dadc22d61b4cea8c77a2307455823.tar.xz bootstrap-e9199718d64dadc22d61b4cea8c77a2307455823.zip | |
Merge branch 'master' into fix-12154
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/examples/screenshots')
| -rw-r--r-- | docs/examples/screenshots/carousel.jpg | bin | 82379 -> 82270 bytes |
| -rw-r--r-- | docs/examples/screenshots/grid.jpg | bin | 100105 -> 99951 bytes |
| -rw-r--r-- | docs/examples/screenshots/jumbotron-narrow.jpg | bin | 68675 -> 68573 bytes |
| -rw-r--r-- | docs/examples/screenshots/justified-nav.jpg | bin | 79170 -> 79037 bytes |
| -rw-r--r-- | docs/examples/screenshots/navbar-fixed.jpg | bin | 38093 -> 37932 bytes |
| -rw-r--r-- | docs/examples/screenshots/navbar-static.jpg | bin | 39712 -> 39671 bytes |
| -rw-r--r-- | docs/examples/screenshots/navbar.jpg | bin | 41029 -> 40956 bytes |
| -rw-r--r-- | docs/examples/screenshots/non-responsive.jpg | bin | 61233 -> 61060 bytes |
| -rw-r--r-- | docs/examples/screenshots/starter-template.jpg | bin | 22620 -> 22590 bytes |
| -rw-r--r-- | docs/examples/screenshots/sticky-footer-navbar.jpg | bin | 39387 -> 39249 bytes |
10 files changed, 0 insertions, 0 deletions
diff --git a/docs/examples/screenshots/carousel.jpg b/docs/examples/screenshots/carousel.jpg Binary files differindex a63a1ba9d..500863682 100644 --- a/docs/examples/screenshots/carousel.jpg +++ b/docs/examples/screenshots/carousel.jpg diff --git a/docs/examples/screenshots/grid.jpg b/docs/examples/screenshots/grid.jpg Binary files differindex 2407cf293..ef624e866 100644 --- a/docs/examples/screenshots/grid.jpg +++ b/docs/examples/screenshots/grid.jpg diff --git a/docs/examples/screenshots/jumbotron-narrow.jpg b/docs/examples/screenshots/jumbotron-narrow.jpg Binary files differindex 915d10f4c..3af127c0f 100644 --- a/docs/examples/screenshots/jumbotron-narrow.jpg +++ b/docs/examples/screenshots/jumbotron-narrow.jpg diff --git a/docs/examples/screenshots/justified-nav.jpg b/docs/examples/screenshots/justified-nav.jpg Binary files differindex 5f57923e6..098bf6fb6 100644 --- a/docs/examples/screenshots/justified-nav.jpg +++ b/docs/examples/screenshots/justified-nav.jpg diff --git a/docs/examples/screenshots/navbar-fixed.jpg b/docs/examples/screenshots/navbar-fixed.jpg Binary files differindex 16a03b0bc..419bb7e50 100644 --- a/docs/examples/screenshots/navbar-fixed.jpg +++ b/docs/examples/screenshots/navbar-fixed.jpg diff --git a/docs/examples/screenshots/navbar-static.jpg b/docs/examples/screenshots/navbar-static.jpg Binary files differindex 8fe3529fb..1cd8b37c6 100644 --- a/docs/examples/screenshots/navbar-static.jpg +++ b/docs/examples/screenshots/navbar-static.jpg diff --git a/docs/examples/screenshots/navbar.jpg b/docs/examples/screenshots/navbar.jpg Binary files differindex 3120c507a..b58877c08 100644 --- a/docs/examples/screenshots/navbar.jpg +++ b/docs/examples/screenshots/navbar.jpg diff --git a/docs/examples/screenshots/non-responsive.jpg b/docs/examples/screenshots/non-responsive.jpg Binary files differindex 0b8953ce1..4262d5dd0 100644 --- a/docs/examples/screenshots/non-responsive.jpg +++ b/docs/examples/screenshots/non-responsive.jpg diff --git a/docs/examples/screenshots/starter-template.jpg b/docs/examples/screenshots/starter-template.jpg Binary files differindex 2545aa32f..aaba1b88d 100644 --- a/docs/examples/screenshots/starter-template.jpg +++ b/docs/examples/screenshots/starter-template.jpg diff --git a/docs/examples/screenshots/sticky-footer-navbar.jpg b/docs/examples/screenshots/sticky-footer-navbar.jpg Binary files differindex 6226bf4ac..05b7d8d21 100644 --- a/docs/examples/screenshots/sticky-footer-navbar.jpg +++ b/docs/examples/screenshots/sticky-footer-navbar.jpg |
