Skip to content
GitLab
Commit 38217ee4 authored by Mark Otto's avatar Mark Otto
Browse files

Merge branch 'pr/14801' 

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
parents a0e6bd96 6e3c55a1
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 160 additions and 98 deletions
+160 -98
dist/css/bootstrap.css
+ 21
- 15
View file @ 38217ee4
...@@ -4887,29 +4887,35 @@ a.thumbnail.active { ...@@ -4887,29 +4887,35 @@ a.thumbnail.active {
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
} }
.media, .media {
.media-body {
overflow: hidden;
zoom: 1;
}
.media,
.media .media {
margin-top: 15px; margin-top: 15px;
} }
.media:first-child { .media:first-child {
margin-top: 0; margin-top: 0;
} }
.media-object { .media-right,
display: block; .media > .pull-right {
} padding-left: 10px;
.media-heading {
margin: 0 0 5px;
} }
.media-left,
.media > .pull-left { .media > .pull-left {
margin-right: 10px; padding-right: 10px;
} }
.media > .pull-right { .media-left,
margin-left: 10px; .media-right,
.media-body {
display: table-cell;
vertical-align: top;
}
.media-middle {
vertical-align: middle;
}
.media-bottom {
vertical-align: bottom;
}
.media-heading {
margin-top: 0;
margin-bottom: 5px;
} }
.media-list { .media-list {
padding-left: 0; padding-left: 0;
......
dist/css/bootstrap.css.map
-39 bytes (0%)
View file @ 38217ee4
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
dist/css/bootstrap.min.css
+ 1
- 1
View file @ 38217ee4
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/_includes/components/media.html
+ 87
- 28
View file @ 38217ee4
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
<p class="lead">Abstract object styles for building various types of components (like blog comments, Tweets, etc) that feature a left- or right-aligned image alongside textual content.</p> <p class="lead">Abstract object styles for building various types of components (like blog comments, Tweets, etc) that feature a left- or right-aligned image alongside textual content.</p>
<h3 id="media-default">Default media</h3> <h3 id="media-default">Default media</h3>
<p>The default media allow to float a media object (images, video, audio) to the left or right of a content block.</p> <p>The default media displays a media object (images, video, audio) to the left or right of a content block.</p>
<div class="bs-example"> <div class="bs-example">
<div class="media"> <div class="media">
<a class="pull-left" href="#"> <a class="media-left" href="#">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image"> <img data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Media heading</h4> <h4 class="media-heading">Media heading</h4>
...@@ -16,15 +16,15 @@ ...@@ -16,15 +16,15 @@
</div> </div>
</div> </div>
<div class="media"> <div class="media">
<a class="pull-left" href="#"> <a class="media-left" href="#">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image"> <img data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Media heading</h4> <h4 class="media-heading">Media heading</h4>
Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus. Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.
<div class="media"> <div class="media">
<a class="pull-left" href="#"> <a class="media-left" href="#">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image"> <img data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Nested media heading</h4> <h4 class="media-heading">Nested media heading</h4>
...@@ -33,17 +33,85 @@ ...@@ -33,17 +33,85 @@
</div> </div>
</div> </div>
</div> </div>
<div class="media">
<div class="media-body">
<h4 class="media-heading">Media heading</h4>
Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
</div>
<a class="media-right" href="#">
<img data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
<div class="media">
<a class="pull-right" href="#">
<img data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
<a class="pull-left" href="#">
<img data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
<div class="media-body">
<h4 class="media-heading">Deprecated pull-right pull-left example</h4>
Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
</div>
</div>
</div><!-- /.bs-example --> </div><!-- /.bs-example -->
{% highlight html %} {% highlight html %}
<div class="media"> <div class="media">
<a class="pull-left" href="#"> <a class="media-left" href="#">
<img class="media-object" src="..." alt="..."> <img src="..." alt="...">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Media heading</h4> <h4 class="media-heading">Media heading</h4>
... ...
</div> </div>
</div> </div>
{% endhighlight %}
<p>The classes <code>.pull-left</code> and <code>.pull-right</code> also exist and were previously used as part of the media component, but are deprecated for that use as of v3.3.0. They are approximately equivalent to <code>.media-left</code> and <code>.media-right</code>, except that <code>.media-right</code> should be placed after the <code>.media-body</code> in the html.</p>
<h3 id="media-alignment">Media alignment</h3>
<p>The images or other media can be aligned top, middle, or bottom. The default is top aligned.</p>
<div class="bs-example">
<div class="media">
<a class="media-left" href="#">
<img data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
<div class="media-body">
<h4 class="media-heading">Top aligned media</h4>
<p>Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.</p>
<p>Donec sed odio dui. Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
</div>
</div>
<div class="media">
<a class="media-left media-middle" href="#">
<img data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
<div class="media-body">
<h4 class="media-heading">Middle aligned media</h4>
<p>Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.</p>
<p>Donec sed odio dui. Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
</div>
</div>
<div class="media">
<a class="media-left media-bottom" href="#">
<img data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
<div class="media-body">
<h4 class="media-heading">Bottom aligned media</h4>
<p>Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.</p>
<p>Donec sed odio dui. Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
</div>
</div>
</div>
{% highlight html %}
<div class="media">
<a class="media-left media-middle" href="#">
<img data-src="..." alt="...">
</a>
<div class="media-body">
<h4 class="media-heading">Middle aligned media</h4>
...
</div>
</div>
{% endhighlight %} {% endhighlight %}
<h3 id="media-list">Media list</h3> <h3 id="media-list">Media list</h3>
...@@ -51,24 +119,24 @@ ...@@ -51,24 +119,24 @@
<div class="bs-example"> <div class="bs-example">
<ul class="media-list"> <ul class="media-list">
<li class="media"> <li class="media">
<a class="pull-left" href="#"> <a class="media-left" href="#">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image"> <img data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Media heading</h4> <h4 class="media-heading">Media heading</h4>
<p>Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.</p> <p>Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.</p>
<!-- Nested media object --> <!-- Nested media object -->
<div class="media"> <div class="media">
<a class="pull-left" href="#"> <a class="media-left" href="#">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image"> <img data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Nested media heading</h4> <h4 class="media-heading">Nested media heading</h4>
Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
<!-- Nested media object --> <!-- Nested media object -->
<div class="media"> <div class="media">
<a class="pull-left" href="#"> <a class="media-left" href="#">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image"> <img data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Nested media heading</h4> <h4 class="media-heading">Nested media heading</h4>
...@@ -79,8 +147,8 @@ ...@@ -79,8 +147,8 @@
</div> </div>
<!-- Nested media object --> <!-- Nested media object -->
<div class="media"> <div class="media">
<a class="pull-left" href="#"> <a class="media-left" href="#">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image"> <img data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Nested media heading</h4> <h4 class="media-heading">Nested media heading</h4>
...@@ -89,22 +157,13 @@ ...@@ -89,22 +157,13 @@
</div> </div>
</div> </div>
</li> </li>
<li class="media">
<a class="pull-right" href="#">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
<div class="media-body">
<h4 class="media-heading">Media heading</h4>
Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.
</div>
</li>
</ul> </ul>
</div> </div>
{% highlight html %} {% highlight html %}
<ul class="media-list"> <ul class="media-list">
<li class="media"> <li class="media">
<a class="pull-left" href="#"> <a class="media-left" href="#">
<img class="media-object" src="..." alt="..."> <img src="..." alt="...">
</a> </a>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Media heading</h4> <h4 class="media-heading">Media heading</h4>
......
docs/assets/js/customize.min.js
+ 1
- 1
View file @ 38217ee4
This diff is collapsed.
docs/assets/js/raw-files.min.js
+ 1
- 1
View file @ 38217ee4
This diff is collapsed.
docs/dist/css/bootstrap.css
+ 21
- 15
View file @ 38217ee4
...@@ -4887,29 +4887,35 @@ a.thumbnail.active { ...@@ -4887,29 +4887,35 @@ a.thumbnail.active {
background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
} }
.media, .media {
.media-body {
overflow: hidden;
zoom: 1;
}
.media,
.media .media {
margin-top: 15px; margin-top: 15px;
} }
.media:first-child { .media:first-child {
margin-top: 0; margin-top: 0;
} }
.media-object { .media-right,
display: block; .media > .pull-right {
} padding-left: 10px;
.media-heading {
margin: 0 0 5px;
} }
.media-left,
.media > .pull-left { .media > .pull-left {
margin-right: 10px; padding-right: 10px;
} }
.media > .pull-right { .media-left,
margin-left: 10px; .media-right,
.media-body {
display: table-cell;
vertical-align: top;
}
.media-middle {
vertical-align: middle;
}
.media-bottom {
vertical-align: bottom;
}
.media-heading {
margin-top: 0;
margin-bottom: 5px;
} }
.media-list { .media-list {
padding-left: 0; padding-left: 0;
......
docs/dist/css/bootstrap.css.map
-39 bytes (0%)
View file @ 38217ee4
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
docs/dist/css/bootstrap.min.css
+ 1
- 1
View file @ 38217ee4
This source diff could not be displayed because it is too large. You can view the blob instead.
less/media.less
+ 27
- 36
View file @ 38217ee4
// Media objects .media {
// Source: http://stubbornella.org/content/?p=497 // Proper spacing between instances of .media
// -------------------------------------------------- margin-top: 15px;
&:first-child {
margin-top: 0;
}
}
.media-right,
.media > .pull-right {
padding-left: 10px;
}
// Common styles .media-left,
// ------------------------- .media > .pull-left {
padding-right: 10px;
}
// Clear the floats .media-left,
.media, .media-right,
.media-body { .media-body {
overflow: hidden; display: table-cell;
zoom: 1; vertical-align: top;
} }
// Proper spacing between instances of .media .media-middle {
.media, vertical-align: middle;
.media .media {
margin-top: 15px;
}
.media:first-child {
margin-top: 0;
} }
// For images and videos, set to block .media-bottom {
.media-object { vertical-align: bottom;
display: block;
} }
// Reset margins on headings for tighter default spacing // Reset margins on headings for tighter default spacing
.media-heading { .media-heading {
margin: 0 0 5px; margin-top: 0;
} margin-bottom: 5px;
// Media image alignment
// -------------------------
.media {
> .pull-left {
margin-right: 10px;
}
> .pull-right {
margin-left: 10px;
}
} }
// Media list variation // Media list variation
// ------------------------- //
// Undo default ul/ol styles // Undo default ul/ol styles
.media-list { .media-list {
padding-left: 0; padding-left: 0;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment