2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00

Merge branch 'wpbrains-media-component' into 2.1.2-wip

This commit is contained in:
Mark Otto
2012-09-17 18:15:44 -07:00
7 changed files with 399 additions and 0 deletions
+14
View File
@@ -158,6 +158,20 @@
}
}
// Medias
// Reset float and spacing to stack
.media .pull-left,
.media .pull-right {
float: none;
display: block;
margin-bottom: 10px;
}
// Remove side margins since we stack instead of indent
.media-object {
margin-right: 0;
margin-left: 0;
}
// Modals
.modal {
top: 10px;