From: Jenn Dodd Date: Thu, 23 Oct 2014 22:36:44 +0000 (-0400) Subject: Remove .media-object from docs. X-Git-Tag: v3.3.0~49^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F14801%2Fhead;p=thirdparty%2Fbootstrap.git Remove .media-object from docs. Signed-off-by: Geoff Pleiss --- diff --git a/docs/_includes/components/media.html b/docs/_includes/components/media.html index 9c166375e3..88488387a0 100644 --- a/docs/_includes/components/media.html +++ b/docs/_includes/components/media.html @@ -8,7 +8,7 @@
- Generic placeholder image + Generic placeholder image

Media heading

@@ -17,14 +17,14 @@
- Generic placeholder image + Generic placeholder image

Media heading

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.
- Generic placeholder image + Generic placeholder image

Nested media heading

@@ -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.
- Generic placeholder image + Generic placeholder image
- Generic placeholder image + Generic placeholder image - Generic placeholder image + Generic placeholder image

Deprecated pull-right pull-left example

@@ -58,7 +58,7 @@ {% highlight html %}
- ... + ...

Media heading

@@ -73,7 +73,7 @@
- Generic placeholder image + Generic placeholder image

Top aligned media

@@ -82,7 +82,7 @@
- Generic placeholder image + Generic placeholder image

Middle aligned media

@@ -91,7 +91,7 @@
- Generic placeholder image + Generic placeholder image

Bottom aligned media

@@ -102,7 +102,7 @@ {% highlight html %}
- ... + ...

Middle aligned media

@@ -117,7 +117,7 @@
  • - Generic placeholder image + Generic placeholder image

    Media heading

    @@ -125,7 +125,7 @@
    - Generic placeholder image + Generic placeholder image

    Nested media heading

    @@ -133,7 +133,7 @@
    - Generic placeholder image + Generic placeholder image

    Nested media heading

    @@ -145,7 +145,7 @@
    - Generic placeholder image + Generic placeholder image

    Nested media heading

    @@ -160,7 +160,7 @@