From d873af866216c0c04a2457963cb1761444cd0b81 Mon Sep 17 00:00:00 2001 From: Capi Etheriel Date: Thu, 21 Nov 2013 15:13:05 -0200 Subject: Make it clear there's a nested media element in the first example --- components.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components.html') diff --git a/components.html b/components.html index f991cccda..53a788f3f 100644 --- a/components.html +++ b/components.html @@ -3160,7 +3160,7 @@ body { padding-bottom: 70px; } Generic placeholder image
-

Media heading

+

Nested 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.
-- cgit v1.2.3 From 62299240d82b0024d6b369d2f38165b1a51e77a4 Mon Sep 17 00:00:00 2001 From: Jonas Weber Date: Thu, 21 Nov 2013 22:54:02 +0100 Subject: Issue #11550 : Easily copyable classes Removed all the periods. Tested in Chrome and Firefox (current versions). In Chrome you get a stray newline when triple-clicking, in Firefox it is clean. fixes #11550 --- components.html | 400 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 200 insertions(+), 200 deletions(-) (limited to 'components.html') diff --git a/components.html b/components.html index f991cccda..eb917614f 100644 --- a/components.html +++ b/components.html @@ -19,803 +19,803 @@ base_url: "../" -- cgit v1.2.3 From 56f4cf0316b03af888c22c62e4ef24e437b4a370 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 28 Nov 2013 11:38:28 -0800 Subject: Fixes #11634: Add warning to docs to not combine icon classes with other elements --- components.html | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'components.html') diff --git a/components.html b/components.html index 53a788f3f..ca6ae40ec 100644 --- a/components.html +++ b/components.html @@ -822,6 +822,10 @@ base_url: "../"

How to use

For performance reasons, all icons require a base class and individual icon class. To use, place the following code just about anywhere. Be sure to leave a space between the icon and text for proper padding.

+
+

Don't mix with other components

+

Icon classes cannot be combined with other elements. They are designed to be standalone elements.

+
{% highlight html %} {% endhighlight %} -- cgit v1.2.3 From 61c641ea05c317e06bb3b9df0d9956abffc32e7e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 29 Nov 2013 21:08:16 -0800 Subject: fixes #10699: use xs grid classes in regular thumbnail docs --- components.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'components.html') diff --git a/components.html b/components.html index ca6ae40ec..dead13da2 100644 --- a/components.html +++ b/components.html @@ -2780,22 +2780,22 @@ body { padding-bottom: 70px; }

By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.

-
+
Generic placeholder thumbnail
-
+
Generic placeholder thumbnail
-
+
Generic placeholder thumbnail
-
+
Generic placeholder thumbnail @@ -2804,7 +2804,7 @@ body { padding-bottom: 70px; }
{% highlight html %}
-
+
... -- cgit v1.2.3 From 6bc09dd94949e05827c541795e4133b0cdbf7cae Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 16:29:52 -0800 Subject: Fixes #11268: Account for badges within buttons by matching background to text color and text color to background --- components.html | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'components.html') diff --git a/components.html b/components.html index 41b77f97f..e4c128ae3 100644 --- a/components.html +++ b/components.html @@ -2697,6 +2697,10 @@ body { padding-bottom: 70px; } +
+
{% highlight html %}
    -- cgit v1.2.3