mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-30 16:50:00 +02:00
Code Issues Releases Wiki Activity

Merge pull request #20545 from twbs/simpler-media-margin

Browse Source 
v4: Remove media margin
This commit is contained in:
Mark Otto
2016-08-21 16:02:51 -07:00
committed by GitHub
parent eb5f803c5b 86e3a35161
commit c5e5572c13
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/layout/media-object.md
View File

@@ -45,7 +45,7 @@ Media components can also be nested.
<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 m-t-2">
<a class="media-left" href="#"> <a class="media-left" href="#">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image"> <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
@@ -123,7 +123,7 @@ With a bit of extra markup, you can use media inside list (useful for comment th
<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 m-t-2">
<a class="media-left" href="#"> <a class="media-left" href="#">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image"> <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
</a> </a>
@@ -131,7 +131,7 @@ With a bit of extra markup, you can use media inside list (useful for comment th
<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 m-t-2">
<div class="media-left"> <div class="media-left">
<a href="#"> <a href="#">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image"> <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
@@ -145,7 +145,7 @@ With a bit of extra markup, you can use media inside list (useful for comment th
</div> </div>
</div> </div>
<!-- Nested media object --> <!-- Nested media object -->
<div class="media"> <div class="media m-t-2">
<div class="media-left"> <div class="media-left">
<a href="#"> <a href="#">
<img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image"> <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
@@ -158,7 +158,7 @@ With a bit of extra markup, you can use media inside list (useful for comment th
</div> </div>
</div> </div>
</li> </li>
<li class="media"> <li class="media m-t-2">
<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.

8
scss/_media.scss
View File

@@ -1,7 +1,6 @@
@if $enable-flex { @if $enable-flex {
.media { .media {
display: flex; display: flex;
margin-bottom: $spacer;
} }
.media-body { .media-body {
flex: 1; flex: 1;
@@ -13,13 +12,6 @@
align-self: flex-end; align-self: flex-end;
} }
} @else { } @else {
.media {
margin-top: $media-margin-top;
&:first-child {
margin-top: 0;
}
}
.media, .media,
.media-body { .media-body {
overflow: hidden; overflow: hidden;