From e66096368988300cce1b42c7788db6ffeec3acf8 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 31 Jul 2013 16:46:21 -0700 Subject: use separate `form-group`s in horiz form example for greater generality; fixes #8925 --- css.html | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'css.html') diff --git a/css.html b/css.html index d17bfcb34..e917cb40e 100644 --- a/css.html +++ b/css.html @@ -1302,11 +1302,19 @@ For example, <section> should be wrapped as inline.
+
+ +
+
+
+
+
+
@@ -1323,11 +1331,19 @@ For example, <section> should be wrapped as inline.
+
+ +
+
+
+
+
+
-- cgit v1.2.3 From 602e0c0ba04449e5b84c0490e3a22cb7b82f7131 Mon Sep 17 00:00:00 2001 From: ChrisRiddell Date: Sat, 3 Aug 2013 17:48:15 +0930 Subject: fix Horizontal form docs --- css.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'css.html') diff --git a/css.html b/css.html index 15682d97b..3254f84b2 100644 --- a/css.html +++ b/css.html @@ -1305,7 +1305,7 @@ For example, <section> should be wrapped as inline.
-
+
-
+
@@ -1334,7 +1334,7 @@ For example, <section> should be wrapped as inline.
-
+
-
+
-- cgit v1.2.3 From 23ef8c0c209844dd8b92d2a5ac82daffa7bd2914 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 3 Aug 2013 21:39:57 -0700 Subject: Greater standardization of sizing terminology In class names: * large => lg * small => sm * mini => xs ("Extra small") In screen size categories: * Tiny => Extra small --- css.html | 76 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) (limited to 'css.html') diff --git a/css.html b/css.html index 3254f84b2..38433ee5a 100644 --- a/css.html +++ b/css.html @@ -69,7 +69,7 @@ base_url: "../"

With the launch of Bootstrap 3, icons have been moved to a separate repository. This keeps the primary project as lean as possible, makes it easier for folks to swap icon libraries, and makes Glyphicons icon fonts more readily available to more people outside Bootstrap.

- Visit Glyphicons for Bootstrap or download from GitHub + Visit Glyphicons for Bootstrap or download from GitHub

@@ -91,7 +91,7 @@ base_url: "../" - Tiny devices + Extra small devices Phones (<768px) @@ -1585,35 +1585,35 @@ For example, <section> should be wrapped as inline.

Control sizing

-

Set heights using classes like .input-large, and set widths using grid column classes like .col-lg-*.

+

Set heights using classes like .input-lg, and set widths using grid column classes like .col-lg-*.

Height sizing

Create larger or smaller form controls that match button sizes.

- + - + - + - +
{% highlight html %} - + - + - + - + {% endhighlight %}

Column sizing

@@ -1701,54 +1701,54 @@ For example, <section> should be wrapped as inline. {% endhighlight %}

Button sizes

-

Fancy larger or smaller buttons? Add .btn-large or .btn-small for additional sizes.

+

Fancy larger or smaller buttons? Add .btn-lg or .btn-sm for additional sizes.

- - + +

- - + +

- - + +

{% highlight html %}

- - + +

- - + +

- - + +

{% endhighlight %}

Create block level buttons—those that span the full width of a parent— by adding .btn-block.

- - + +
{% highlight html %} - - + + {% endhighlight %} @@ -1758,12 +1758,12 @@ For example, <section> should be wrapped as inline.

Button element

Add the disabled attribute to <button> buttons.

- - + +

{% highlight html %} - - + + {% endhighlight %}
@@ -1774,12 +1774,12 @@ For example, <section> should be wrapped as inline.

Anchor element

Add the .disabled class to <a> buttons.

- Primary link - Link + Primary link + Link

{% highlight html %} -Primary link -Link +Primary link +Link {% endhighlight %}

We use .disabled as a utility class here, similar to the common .active class, so no prefix is required. -- cgit v1.2.3 From cabcd36019cb7000c537bcd8292d4905239685f7 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 3 Aug 2013 21:59:30 -0700 Subject: add missing ref to .btn-xs in button sizes docs --- css.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'css.html') diff --git a/css.html b/css.html index 38433ee5a..86cd4771d 100644 --- a/css.html +++ b/css.html @@ -1701,7 +1701,7 @@ For example, <section> should be wrapped as inline. {% endhighlight %}

Button sizes

-

Fancy larger or smaller buttons? Add .btn-lg or .btn-sm for additional sizes.

+

Fancy larger or smaller buttons? Add .btn-lg, .btn-sm, or .btn-xs for additional sizes.

-- cgit v1.2.3