rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:twbs/bootstrap

Browse source
This commit is contained in:
Mark Otto 2014-11-30 17:11:24 -08:00
commit 0eb2c922d8
18 changed files with 2979 additions and 2099 deletions
Download patch file Download diff file Expand all files Collapse all files

32
docs/_includes/components/media.html
View file

@ -9,7 +9,7 @@
<div class="media">
<div class="media-left">
<a href="#">
<img data-src="holder.js/64x64" alt="Generic placeholder image">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
<div class="media-body">
@ -20,7 +20,7 @@
<div class="media">
<div class="media-left">
<a href="#">
<img data-src="holder.js/64x64" alt="Generic placeholder image">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
<div class="media-body">
@ -29,7 +29,7 @@
<div class="media">
<div class="media-left">
<a href="#">
<img data-src="holder.js/64x64" alt="Generic placeholder image">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
<div class="media-body">
@ -46,14 +46,14 @@
</div>
<div class="media-right">
<a href="#">
<img data-src="holder.js/64x64" alt="Generic placeholder image">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
</div>
<div class="media">
<div class="media-left">
<a href="#">
<img data-src="holder.js/64x64" alt="Generic placeholder image">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
<div class="media-body">
@ -62,7 +62,7 @@
</div>
<div class="media-right">
<a href="#">
<img data-src="holder.js/64x64" alt="Generic placeholder image">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
</div>
@ -71,7 +71,7 @@
<div class="media">
<div class="media-left">
<a href="#">
<img src="..." alt="...">
<img class="media-object" src="..." alt="...">
</a>
</div>
<div class="media-body">
@ -88,7 +88,7 @@
<div class="media">
<div class="media-left">
<a href="#">
<img data-src="holder.js/64x64" alt="Generic placeholder image">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
<div class="media-body">
@ -100,7 +100,7 @@
<div class="media">
<div class="media-left media-middle">
<a href="#">
<img data-src="holder.js/64x64" alt="Generic placeholder image">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
<div class="media-body">
@ -112,7 +112,7 @@
<div class="media">
<div class="media-left media-bottom">
<a href="#">
<img data-src="holder.js/64x64" alt="Generic placeholder image">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
<div class="media-body">
@ -126,7 +126,7 @@
<div class="media">
<div class="media-left media-middle">
<a href="#">
<img src="..." alt="...">
<img class="media-object" src="..." alt="...">
</a>
</div>
<div class="media-body">
@ -143,7 +143,7 @@
<li class="media">
<div class="media-left">
<a href="#">
<img data-src="holder.js/64x64" alt="Generic placeholder image">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
<div class="media-body">
@ -153,7 +153,7 @@
<div class="media">
<div class="media-left">
<a href="#">
<img data-src="holder.js/64x64" alt="Generic placeholder image">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
<div class="media-body">
@ -163,7 +163,7 @@
<div class="media">
<div class="media-left">
<a href="#">
<img data-src="holder.js/64x64" alt="Generic placeholder image">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
<div class="media-body">
@ -177,7 +177,7 @@
<div class="media">
<div class="media-left">
<a href="#">
<img data-src="holder.js/64x64" alt="Generic placeholder image">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
<div class="media-body">
@ -194,7 +194,7 @@
<li class="media">
<div class="media-left">
<a href="#">
<img src="..." alt="...">
<img class="media-object" src="..." alt="...">
</a>
</div>
<div class="media-body">

14
docs/assets/js/customize.min.js vendored
View file

File diff suppressed because one or more lines are too long

4579
docs/assets/js/vendor/autoprefixer.js vendored
View file

File diff suppressed because one or more lines are too long

BIN
docs/examples/screenshots/blog.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 120 KiB

After

Width:  |  Height:  |  Size: 119 KiB

Before After
Before After

BIN
docs/examples/screenshots/cover.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Before After
Before After

BIN
docs/examples/screenshots/dashboard.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 103 KiB

After

Width:  |  Height:  |  Size: 103 KiB

Before After
Before After

BIN
docs/examples/screenshots/equal-height-columns.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 126 KiB

After

Width:  |  Height:  |  Size: 126 KiB

Before After
Before After

BIN
docs/examples/screenshots/jumbotron.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 99 KiB

After

Width:  |  Height:  |  Size: 99 KiB

Before After
Before After

BIN
docs/examples/screenshots/navbar-static.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

Before After
Before After

BIN
docs/examples/screenshots/offcanvas.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 110 KiB

Before After
Before After

BIN
docs/examples/screenshots/sign-in.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

BIN
docs/examples/screenshots/starter-template.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Before After
Before After

BIN
docs/examples/screenshots/sticky-footer.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Before After
Before After

BIN
docs/examples/screenshots/theme.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 84 KiB

After

Width:  |  Height:  |  Size: 83 KiB

Before After
Before After