From 74a264fb98ced0228d385d601e9edd913bb1b173 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 18:19:17 -0700 Subject: fixes #13021: add .form-group-sm/-lg --- docs/_includes/css/forms.html | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'docs/_includes/css') diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html index 95bb29c59..947c5179c 100644 --- a/docs/_includes/css/forms.html +++ b/docs/_includes/css/forms.html @@ -670,6 +670,42 @@ {% endhighlight %} +

Horizontal form group sizes

+

Quickly size labels and form controls within .form-horizontal by adding .form-group-lg or .form-group-sm.

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

Column sizing

Wrap inputs in grid columns, or any custom parent element, to easily enforce desired widths.

-- cgit v1.2.3 From 91d2cf848bc6fcd07bf2b16ce0308b0372d28b2e Mon Sep 17 00:00:00 2001 From: Bas Bosman Date: Thu, 19 Jun 2014 14:56:43 +0200 Subject: Fix @gray-light in docs --- docs/_includes/css/less.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes/css') diff --git a/docs/_includes/css/less.html b/docs/_includes/css/less.html index eadbda775..a6fbbaa11 100644 --- a/docs/_includes/css/less.html +++ b/docs/_includes/css/less.html @@ -28,7 +28,7 @@ @gray-darker: lighten(#000, 13.5%); // #222 @gray-dark: lighten(#000, 20%); // #333 @gray: lighten(#000, 33.5%); // #555 -@gray-light: lighten(#000, 60%); // #999 +@gray-light: lighten(#000, 46.7%); // #777 @gray-lighter: lighten(#000, 93.5%); // #eee {% endhighlight %} -- cgit v1.2.3 From 00cc166671a4ecfe3284662db14c8bf151de5bb5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 19 Jun 2014 15:22:49 -0700 Subject: ids over names --- docs/_includes/css/forms.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/_includes/css') diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html index 947c5179c..2a1848e50 100644 --- a/docs/_includes/css/forms.html +++ b/docs/_includes/css/forms.html @@ -677,13 +677,13 @@
- +
- +
@@ -693,13 +693,13 @@
- +
- +
-- cgit v1.2.3 From d4ce4dbf122158e3d0d714ac8eead0144f071d05 Mon Sep 17 00:00:00 2001 From: Ilya Radchenko Date: Mon, 23 Jun 2014 12:25:14 -0400 Subject: fix typo in css - buttons --- docs/_includes/css/buttons.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes/css') diff --git a/docs/_includes/css/buttons.html b/docs/_includes/css/buttons.html index 15b0f5ed2..bfc5ded80 100644 --- a/docs/_includes/css/buttons.html +++ b/docs/_includes/css/buttons.html @@ -88,7 +88,7 @@

Active state

-

Buttons will appear pressed (with a darker background, darker border, and inset shadow) when active. For <button> elements, this is done via :active. For <a> elements, it's done with .active. However, you may use .active on <button>s should you need to replicate the active state progammatically.

+

Buttons will appear pressed (with a darker background, darker border, and inset shadow) when active. For <button> elements, this is done via :active. For <a> elements, it's done with .active. However, you may use .active on <button>s should you need to replicate the active state programmatically.

Button element

No need to add :active as it's a pseudo-class, but if you need to force the same appearance, go ahead and add .active.

-- cgit v1.2.3 From 32bde78e1996a92e6b801e1f4a475d5ab48685f8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 23 Jun 2014 10:41:45 -0700 Subject: grid class inconsistency /cc @juthilo --- docs/_includes/css/grid.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/_includes/css') diff --git a/docs/_includes/css/grid.html b/docs/_includes/css/grid.html index 8ff53dd71..f1ee7fcd1 100644 --- a/docs/_includes/css/grid.html +++ b/docs/_includes/css/grid.html @@ -353,10 +353,10 @@ Level 1: .col-md-9
- Level 2: .col-xs-8 .col-md-6 + Level 2: .col-xs-8 .col-sm-6
- Level 2: .col-xs-4 .col-md-6 + Level 2: .col-xs-4 .col-sm-6
@@ -364,13 +364,13 @@ {% highlight html %}
- Level 1: .col-md-9 + Level 1: .col-sm-9
- Level 2: .col-xs-8 .col-md-6 + Level 2: .col-xs-8 .col-sm-6
- Level 2: .col-xs-4 .col-md-6 + Level 2: .col-xs-4 .col-sm-6
-- cgit v1.2.3 From 25b06d927fa8fb056b3b146db263498a34401fb8 Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Mon, 23 Jun 2014 23:36:18 +0200 Subject: grid class inconsistency 2 https://github.com/twbs/bootstrap/commit/32bde78e1996a92e6b801e1f4a475d5ab48685f8 --- docs/_includes/css/grid.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/_includes/css') diff --git a/docs/_includes/css/grid.html b/docs/_includes/css/grid.html index f1ee7fcd1..429ef90f9 100644 --- a/docs/_includes/css/grid.html +++ b/docs/_includes/css/grid.html @@ -347,10 +347,10 @@

Nesting columns

-

To nest your content with the default grid, add a new .row and set of .col-md-* columns within an existing .col-md-* column. Nested rows should include a set of columns that add up to 12 or less (it is not required that you use all 12 available columns).

+

To nest your content with the default grid, add a new .row and set of .col-sm-* columns within an existing .col-sm-* column. Nested rows should include a set of columns that add up to 12 or less (it is not required that you use all 12 available columns).

- Level 1: .col-md-9 + Level 1: .col-sm-9
Level 2: .col-xs-8 .col-sm-6 -- cgit v1.2.3