Skip to content
GitLab
Commit 6e3c55a1 authored by Mark Otto's avatar Mark Otto
Browse files

grunt

parent 42c29183
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 41 additions and 36 deletions
+41 -36
dist/css/bootstrap.css
+ 14
- 13
View file @ 6e3c55a1
...@@ -4889,31 +4889,32 @@ a.thumbnail.active { ...@@ -4889,31 +4889,32 @@ a.thumbnail.active {
.media { .media {
margin-top: 15px; margin-top: 15px;
} }
.media .media-right, .media:first-child {
.media .pull-right { margin-top: 0;
}
.media-right,
.media > .pull-right {
padding-left: 10px; padding-left: 10px;
} }
.media .media-left, .media-left,
.media .pull-left { .media > .pull-left {
padding-right: 10px; padding-right: 10px;
} }
.media:first-child { .media-left,
margin-top: 0; .media-right,
} .media-body {
.media .media-left,
.media .media-right,
.media .media-body {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
} }
.media .media-middle { .media-middle {
vertical-align: middle; vertical-align: middle;
} }
.media .media-bottom { .media-bottom {
vertical-align: bottom; vertical-align: bottom;
} }
.media-heading { .media-heading {
margin: 0 0 5px 0; 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 @ 6e3c55a1
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
dist/css/bootstrap.min.css
+ 1
- 1
View file @ 6e3c55a1
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/_includes/components/media.html
+ 9
- 6
View file @ 6e3c55a1
...@@ -73,29 +73,32 @@ ...@@ -73,29 +73,32 @@
<div class="bs-example"> <div class="bs-example">
<div class="media"> <div class="media">
<a class="media-left" href="#"> <a class="media-left" href="#">
<img data-src="holder.js/40x40" 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">Top aligned media</h4> <h4 class="media-heading">Top aligned media</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. <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> </div>
<div class="media"> <div class="media">
<a class="media-left media-middle" href="#"> <a class="media-left media-middle" href="#">
<img data-src="holder.js/40x40" 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">Middle aligned media</h4> <h4 class="media-heading">Middle aligned media</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. <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> </div>
<div class="media"> <div class="media">
<a class="media-left media-bottom" href="#"> <a class="media-left media-bottom" href="#">
<img data-src="holder.js/40x40" 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">Bottom aligned media</h4> <h4 class="media-heading">Bottom aligned media</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. <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> </div>
</div> </div>
......
docs/assets/js/customize.min.js
+ 1
- 1
View file @ 6e3c55a1
This diff is collapsed.
docs/assets/js/raw-files.min.js
+ 1
- 1
View file @ 6e3c55a1
This diff is collapsed.
docs/dist/css/bootstrap.css
+ 14
- 13
View file @ 6e3c55a1
...@@ -4889,31 +4889,32 @@ a.thumbnail.active { ...@@ -4889,31 +4889,32 @@ a.thumbnail.active {
.media { .media {
margin-top: 15px; margin-top: 15px;
} }
.media .media-right, .media:first-child {
.media .pull-right { margin-top: 0;
}
.media-right,
.media > .pull-right {
padding-left: 10px; padding-left: 10px;
} }
.media .media-left, .media-left,
.media .pull-left { .media > .pull-left {
padding-right: 10px; padding-right: 10px;
} }
.media:first-child { .media-left,
margin-top: 0; .media-right,
} .media-body {
.media .media-left,
.media .media-right,
.media .media-body {
display: table-cell; display: table-cell;
vertical-align: top; vertical-align: top;
} }
.media .media-middle { .media-middle {
vertical-align: middle; vertical-align: middle;
} }
.media .media-bottom { .media-bottom {
vertical-align: bottom; vertical-align: bottom;
} }
.media-heading { .media-heading {
margin: 0 0 5px 0; 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 @ 6e3c55a1
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
docs/dist/css/bootstrap.min.css
+ 1
- 1
View file @ 6e3c55a1
This source diff could not be displayed because it is too large. You can view the blob instead.
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