mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-24 14:04:09 +03:00
Code Activity

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
parent 88ec5152da ced63b0a02
commit 0eb2c922d8
18 changed files with 2979 additions and 2099 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/_includes/components/media.html
+16 -16
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">
docs/assets/js/customize.min.js
Vendored
+7 -7
View File
File diff suppressed because one or more lines are too long
docs/assets/js/vendor/autoprefixer.js
Vendored
+2779 -1800
View File
File diff suppressed because one or more lines are too long
docs/examples/screenshots/blog.jpg
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 120 KiB

After

Width:  |  Height:  |  Size: 119 KiB

docs/examples/screenshots/cover.jpg
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

docs/examples/screenshots/dashboard.jpg
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 103 KiB

After

Width:  |  Height:  |  Size: 103 KiB

docs/examples/screenshots/equal-height-columns.jpg
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 126 KiB

After

Width:  |  Height:  |  Size: 126 KiB

docs/examples/screenshots/jumbotron.jpg
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 99 KiB

After

Width:  |  Height:  |  Size: 99 KiB

docs/examples/screenshots/navbar-static.jpg
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

docs/examples/screenshots/offcanvas.jpg
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 110 KiB

docs/examples/screenshots/sign-in.jpg
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

docs/examples/screenshots/starter-template.jpg
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

docs/examples/screenshots/sticky-footer.jpg
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

docs/examples/screenshots/theme.jpg
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 84 KiB

After

Width:  |  Height:  |  Size: 83 KiB