From: Mark Otto <otto@github.com>
Date: Thu, 20 Dec 2012 02:46:55 +0000 (-0800)
Subject: Fixes #6337: scope '.media .pull-left' and '.media .pull-right' to immediate children... 
X-Git-Tag: v2.3.0^2~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc6142751feced6761f67503323c0c6e62844d4e;p=thirdparty%2Fbootstrap.git

Fixes #6337: scope '.media .pull-left' and '.media .pull-right' to immediate children only
---

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;
 }