From 919b4ccb15209d47f7cc3f740654b0bcd5cf1870 Mon Sep 17 00:00:00 2001
From: Nicole Sullivan <nsullivan@pivotal.io>
Date: Tue, 14 Oct 2014 17:09:57 -0400
Subject: Fixes #14799: Add vertical alignment of image in media component

Signed-off-by: Jenn Dodd <jedodd@pivotal.io>
---
 docs/_includes/components/media.html | 94 ++++++++++++++++++++++++++++--------
 1 file changed, 75 insertions(+), 19 deletions(-)

(limited to 'docs/_includes/components')

diff --git a/docs/_includes/components/media.html b/docs/_includes/components/media.html
index 57aee1e1d..9c166375e 100644
--- a/docs/_includes/components/media.html
+++ b/docs/_includes/components/media.html
@@ -4,10 +4,10 @@
   <p class="lead">Abstract object styles for building various types of components (like blog comments, Tweets, etc) that feature a left- or right-aligned image alongside textual content.</p>
 
   <h3 id="media-default">Default media</h3>
-  <p>The default media allow to float a media object (images, video, audio) to the left or right of a content block.</p>
+  <p>The default media displays a media object (images, video, audio) to the left or right of a content block.</p>
   <div class="bs-example">
     <div class="media">
-      <a class="pull-left" href="#">
+      <a class="media-left" href="#">
         <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
       </a>
       <div class="media-body">
@@ -16,14 +16,14 @@
       </div>
     </div>
     <div class="media">
-      <a class="pull-left" href="#">
+      <a class="media-left" href="#">
         <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
       </a>
       <div class="media-body">
         <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.
         <div class="media">
-          <a class="pull-left" href="#">
+          <a class="media-left" href="#">
             <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
           </a>
           <div class="media-body">
@@ -33,10 +33,31 @@
         </div>
       </div>
     </div>
+    <div class="media">
+      <div class="media-body">
+        <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.
+      </div>
+      <a class="media-right" href="#">
+        <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
+      </a>
+    </div>
+    <div class="media">
+      <a class="pull-right" href="#">
+        <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
+      </a>
+      <a class="pull-left" href="#">
+        <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
+      </a>
+      <div class="media-body">
+        <h4 class="media-heading">Deprecated pull-right pull-left example</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.
+      </div>
+    </div>
   </div><!-- /.bs-example -->
 {% highlight html %}
 <div class="media">
-  <a class="pull-left" href="#">
+  <a class="media-left" href="#">
     <img class="media-object" src="..." alt="...">
   </a>
   <div class="media-body">
@@ -44,6 +65,50 @@
     ...
   </div>
 </div>
+{% endhighlight %}
+
+  <p>The classes <code>.pull-left</code> and <code>.pull-right</code> also exist and were previously used as part of the media component, but are deprecated for that use as of v3.3.0. They are approximately equivalent to <code>.media-left</code> and <code>.media-right</code>, except that <code>.media-right</code> should be placed after the <code>.media-body</code> in the html.</p>
+  <h3 id="media-alignment">Media alignment</h3>
+  <p>The images or other media can be aligned top, middle, or bottom. The default is top aligned.</p>
+  <div class="bs-example">
+    <div class="media">
+      <a class="media-left" href="#">
+        <img class="media-object" data-src="holder.js/40x40" alt="Generic placeholder image">
+      </a>
+      <div class="media-body">
+        <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.
+      </div>
+    </div>
+    <div class="media">
+      <a class="media-left media-middle" href="#">
+        <img class="media-object" data-src="holder.js/40x40" alt="Generic placeholder image">
+      </a>
+      <div class="media-body">
+        <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.
+      </div>
+    </div>
+    <div class="media">
+      <a class="media-left media-bottom" href="#">
+        <img class="media-object" data-src="holder.js/40x40" alt="Generic placeholder image">
+      </a>
+      <div class="media-body">
+        <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.
+      </div>
+    </div>
+  </div>
+{% highlight html %}
+<div class="media">
+  <a class="media-left media-middle" href="#">
+    <img class="media-object" data-src="..." alt="...">
+  </a>
+  <div class="media-body">
+    <h4 class="media-heading">Middle aligned media</h4>
+    ...
+  </div>
+</div>
 {% endhighlight %}
 
   <h3 id="media-list">Media list</h3>
@@ -51,7 +116,7 @@
   <div class="bs-example">
     <ul class="media-list">
       <li class="media">
-        <a class="pull-left" href="#">
+        <a class="media-left" href="#">
           <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
         </a>
         <div class="media-body">
@@ -59,7 +124,7 @@
           <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 -->
           <div class="media">
-            <a class="pull-left" href="#">
+            <a class="media-left" href="#">
               <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
             </a>
             <div class="media-body">
@@ -67,7 +132,7 @@
               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 -->
               <div class="media">
-                <a class="pull-left" href="#">
+                <a class="media-left" href="#">
                   <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
                 </a>
                 <div class="media-body">
@@ -79,7 +144,7 @@
           </div>
           <!-- Nested media object -->
           <div class="media">
-            <a class="pull-left" href="#">
+            <a class="media-left" href="#">
               <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
             </a>
             <div class="media-body">
@@ -89,21 +154,12 @@
           </div>
         </div>
       </li>
-      <li class="media">
-        <a class="pull-right" href="#">
-          <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
-        </a>
-        <div class="media-body">
-          <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.
-        </div>
-      </li>
     </ul>
   </div>
 {% highlight html %}
 <ul class="media-list">
   <li class="media">
-    <a class="pull-left" href="#">
+    <a class="media-left" href="#">
       <img class="media-object" src="..." alt="...">
     </a>
     <div class="media-body">
-- 
cgit v1.2.3


From e8643ed8b3e9253d6d42cb811267525e931eb873 Mon Sep 17 00:00:00 2001
From: Jenn Dodd <jedodd@pivotal.io>
Date: Thu, 23 Oct 2014 18:36:44 -0400
Subject: Remove .media-object from docs.

Signed-off-by: Geoff Pleiss <gpleiss@pivotal.io>
---
 docs/_includes/components/media.html | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'docs/_includes/components')

diff --git a/docs/_includes/components/media.html b/docs/_includes/components/media.html
index 9c166375e..88488387a 100644
--- a/docs/_includes/components/media.html
+++ b/docs/_includes/components/media.html
@@ -8,7 +8,7 @@
   <div class="bs-example">
     <div class="media">
       <a class="media-left" href="#">
-        <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
+        <img data-src="holder.js/64x64" alt="Generic placeholder image">
       </a>
       <div class="media-body">
         <h4 class="media-heading">Media heading</h4>
@@ -17,14 +17,14 @@
     </div>
     <div class="media">
       <a class="media-left" href="#">
-        <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
+        <img data-src="holder.js/64x64" alt="Generic placeholder image">
       </a>
       <div class="media-body">
         <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.
         <div class="media">
           <a class="media-left" href="#">
-            <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
+            <img data-src="holder.js/64x64" alt="Generic placeholder image">
           </a>
           <div class="media-body">
             <h4 class="media-heading">Nested media heading</h4>
@@ -39,15 +39,15 @@
         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.
       </div>
       <a class="media-right" href="#">
-        <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
+        <img data-src="holder.js/64x64" alt="Generic placeholder image">
       </a>
     </div>
     <div class="media">
       <a class="pull-right" href="#">
-        <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
+        <img data-src="holder.js/64x64" alt="Generic placeholder image">
       </a>
       <a class="pull-left" href="#">
-        <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
+        <img data-src="holder.js/64x64" alt="Generic placeholder image">
       </a>
       <div class="media-body">
         <h4 class="media-heading">Deprecated pull-right pull-left example</h4>
@@ -58,7 +58,7 @@
 {% highlight html %}
 <div class="media">
   <a class="media-left" href="#">
-    <img class="media-object" src="..." alt="...">
+    <img src="..." alt="...">
   </a>
   <div class="media-body">
     <h4 class="media-heading">Media heading</h4>
@@ -73,7 +73,7 @@
   <div class="bs-example">
     <div class="media">
       <a class="media-left" href="#">
-        <img class="media-object" data-src="holder.js/40x40" alt="Generic placeholder image">
+        <img data-src="holder.js/40x40" alt="Generic placeholder image">
       </a>
       <div class="media-body">
         <h4 class="media-heading">Top aligned media</h4>
@@ -82,7 +82,7 @@
     </div>
     <div class="media">
       <a class="media-left media-middle" href="#">
-        <img class="media-object" data-src="holder.js/40x40" alt="Generic placeholder image">
+        <img data-src="holder.js/40x40" alt="Generic placeholder image">
       </a>
       <div class="media-body">
         <h4 class="media-heading">Middle aligned media</h4>
@@ -91,7 +91,7 @@
     </div>
     <div class="media">
       <a class="media-left media-bottom" href="#">
-        <img class="media-object" data-src="holder.js/40x40" alt="Generic placeholder image">
+        <img data-src="holder.js/40x40" alt="Generic placeholder image">
       </a>
       <div class="media-body">
         <h4 class="media-heading">Bottom aligned media</h4>
@@ -102,7 +102,7 @@
 {% highlight html %}
 <div class="media">
   <a class="media-left media-middle" href="#">
-    <img class="media-object" data-src="..." alt="...">
+    <img data-src="..." alt="...">
   </a>
   <div class="media-body">
     <h4 class="media-heading">Middle aligned media</h4>
@@ -117,7 +117,7 @@
     <ul class="media-list">
       <li class="media">
         <a class="media-left" href="#">
-          <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
+          <img data-src="holder.js/64x64" alt="Generic placeholder image">
         </a>
         <div class="media-body">
           <h4 class="media-heading">Media heading</h4>
@@ -125,7 +125,7 @@
           <!-- Nested media object -->
           <div class="media">
             <a class="media-left" href="#">
-              <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
+              <img data-src="holder.js/64x64" alt="Generic placeholder image">
             </a>
             <div class="media-body">
               <h4 class="media-heading">Nested media heading</h4>
@@ -133,7 +133,7 @@
               <!-- Nested media object -->
               <div class="media">
                 <a class="media-left" href="#">
-                  <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
+                  <img data-src="holder.js/64x64" alt="Generic placeholder image">
                 </a>
                 <div class="media-body">
                   <h4 class="media-heading">Nested media heading</h4>
@@ -145,7 +145,7 @@
           <!-- Nested media object -->
           <div class="media">
             <a class="media-left" href="#">
-              <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
+              <img data-src="holder.js/64x64" alt="Generic placeholder image">
             </a>
             <div class="media-body">
               <h4 class="media-heading">Nested media heading</h4>
@@ -160,7 +160,7 @@
 <ul class="media-list">
   <li class="media">
     <a class="media-left" href="#">
-      <img class="media-object" src="..." alt="...">
+      <img src="..." alt="...">
     </a>
     <div class="media-body">
       <h4 class="media-heading">Media heading</h4>
-- 
cgit v1.2.3


From 6e3c55a115ae0674c402a0c420c5b66a29ab072a Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sat, 25 Oct 2014 18:13:50 -0700
Subject: grunt

---
 docs/_includes/components/media.html | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'docs/_includes/components')

diff --git a/docs/_includes/components/media.html b/docs/_includes/components/media.html
index 88488387a..1ea4176d4 100644
--- a/docs/_includes/components/media.html
+++ b/docs/_includes/components/media.html
@@ -73,29 +73,32 @@
   <div class="bs-example">
     <div class="media">
       <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>
       <div class="media-body">
         <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 class="media">
       <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>
       <div class="media-body">
         <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 class="media">
       <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>
       <div class="media-body">
         <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>
-- 
cgit v1.2.3