Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <otto@github.com>2012-12-20 06:46:55 +0400
committerMark Otto <otto@github.com>2012-12-20 06:47:34 +0400
commitdc6142751feced6761f67503323c0c6e62844d4e (patch)
tree0154a93a33d3d21bbd178f785cc2667916b0bd8e
parent529ecc5a77c9e653dd7219bd4457cb994e338075 (diff)
Fixes #6337: scope '.media .pull-left' and '.media .pull-right' to immediate children only
-rw-r--r--docs/assets/css/bootstrap.css4
-rw-r--r--less/media.less4
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 1940302cd0..6ef11ed9bd 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -5519,11 +5519,11 @@ a.thumbnail:hover {
margin: 0 0 5px;
}
-.media .pull-left {
+.media > .pull-left {
margin-right: 10px;
}
-.media .pull-right {
+.media > .pull-right {
margin-left: 10px;
}
diff --git a/less/media.less b/less/media.less
index 1decab71de..e461e446d2 100644
--- a/less/media.less
+++ b/less/media.less
@@ -37,10 +37,10 @@
// Media image alignment
// -------------------------
-.media .pull-left {
+.media > .pull-left {
margin-right: 10px;
}
-.media .pull-right {
+.media > .pull-right {
margin-left: 10px;
}