Skip to content
GitLab
Commit 7bf002d6 authored by Julian Thilo's avatar Julian Thilo
Browse files

Fix #15194: Shrink media link area

parent bc5a753b
5 merge requests!28721Hot test,!15198Fix #15194: Shrink media link area,!16605Test pull please ignore,!22103test,!25326Adjust examples
Hide whitespace changes
Inline Side-by-side
Showing
with 80 additions and 48 deletions
+80 -48
docs/_includes/components/media.html
+ 80
- 48
View file @ 7bf002d6
...@@ -7,25 +7,31 @@ ...@@ -7,25 +7,31 @@
<p>The default media displays 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="media-left" href="#"> <div class="media-left">
<img data-src="holder.js/64x64" alt="Generic placeholder image"> <a href="#">
</a> <img data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
<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> </div>
</div> </div>
<div class="media"> <div class="media">
<a class="media-left" href="#"> <div class="media-left">
<img data-src="holder.js/64x64" alt="Generic placeholder image"> <a href="#">
</a> <img data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
<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="media-left" href="#"> <div class="media-left">
<img data-src="holder.js/64x64" alt="Generic placeholder image"> <a href="#">
</a> <img data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
<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. 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.
...@@ -38,28 +44,36 @@ ...@@ -38,28 +44,36 @@
<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. 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>
<a class="media-right" href="#"> <div class="media-right">
<img data-src="holder.js/64x64" alt="Generic placeholder image"> <a href="#">
</a> <img data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
</div> </div>
<div class="media"> <div class="media">
<a class="media-left" href="#"> <div class="media-left">
<img data-src="holder.js/64x64" alt="Generic placeholder image"> <a href="#">
</a> <img data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
<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. 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>
<a class="media-right" href="#"> <div class="media-right">
<img data-src="holder.js/64x64" alt="Generic placeholder image"> <a href="#">
</a> <img data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
</div> </div>
</div><!-- /.bs-example --> </div><!-- /.bs-example -->
{% highlight html %} {% highlight html %}
<div class="media"> <div class="media">
<a class="media-left" href="#"> <div class="media-left">
<img src="..." alt="..."> <a href="#">
</a> <img src="..." alt="...">
</a>
</div>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Media heading</h4> <h4 class="media-heading">Media heading</h4>
... ...
...@@ -72,9 +86,11 @@ ...@@ -72,9 +86,11 @@
<p>The images or other media can be aligned top, middle, or bottom. The default is top aligned.</p> <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="bs-example">
<div class="media"> <div class="media">
<a class="media-left" href="#"> <div class="media-left">
<img data-src="holder.js/64x64" alt="Generic placeholder image"> <a href="#">
</a> <img data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Top aligned media</h4> <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>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>
...@@ -82,9 +98,11 @@ ...@@ -82,9 +98,11 @@
</div> </div>
</div> </div>
<div class="media"> <div class="media">
<a class="media-left media-middle" href="#"> <div class="media-left media-middle">
<img data-src="holder.js/64x64" alt="Generic placeholder image"> <a href="#">
</a> <img data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Middle aligned media</h4> <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>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>
...@@ -92,9 +110,11 @@ ...@@ -92,9 +110,11 @@
</div> </div>
</div> </div>
<div class="media"> <div class="media">
<a class="media-left media-bottom" href="#"> <div class="media-left media-bottom">
<img data-src="holder.js/64x64" alt="Generic placeholder image"> <a href="#">
</a> <img data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Bottom aligned media</h4> <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>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>
...@@ -104,9 +124,11 @@ ...@@ -104,9 +124,11 @@
</div> </div>
{% highlight html %} {% highlight html %}
<div class="media"> <div class="media">
<a class="media-left media-middle" href="#"> <div class="media-left media-middle">
<img data-src="..." alt="..."> <a href="#">
</a> <img src="..." alt="...">
</a>
</div>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Middle aligned media</h4> <h4 class="media-heading">Middle aligned media</h4>
... ...
...@@ -119,25 +141,31 @@ ...@@ -119,25 +141,31 @@
<div class="bs-example"> <div class="bs-example">
<ul class="media-list"> <ul class="media-list">
<li class="media"> <li class="media">
<a class="media-left" href="#"> <div class="media-left">
<img data-src="holder.js/64x64" alt="Generic placeholder image"> <a href="#">
</a> <img data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
<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="media-left" href="#"> <div class="media-left">
<img data-src="holder.js/64x64" alt="Generic placeholder image"> <a href="#">
</a> <img data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
<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="media-left" href="#"> <div class="media-left">
<img data-src="holder.js/64x64" alt="Generic placeholder image"> <a href="#">
</a> <img data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
<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.
...@@ -147,9 +175,11 @@ ...@@ -147,9 +175,11 @@
</div> </div>
<!-- Nested media object --> <!-- Nested media object -->
<div class="media"> <div class="media">
<a class="media-left" href="#"> <div class="media-left">
<img data-src="holder.js/64x64" alt="Generic placeholder image"> <a href="#">
</a> <img data-src="holder.js/64x64" alt="Generic placeholder image">
</a>
</div>
<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.
...@@ -162,9 +192,11 @@ ...@@ -162,9 +192,11 @@
{% highlight html %} {% highlight html %}
<ul class="media-list"> <ul class="media-list">
<li class="media"> <li class="media">
<a class="media-left" href="#"> <div class="media-left">
<img src="..." alt="..."> <a href="#">
</a> <img src="..." alt="...">
</a>
</div>
<div class="media-body"> <div class="media-body">
<h4 class="media-heading">Media heading</h4> <h4 class="media-heading">Media heading</h4>
... ...
......
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