diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f53a3b458d..3ac976ea26 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -980,8 +980,8 @@ textarea[class*="span"], .row-fluid select[class*="span"], .row-fluid textarea[class*="span"], .row-fluid .uneditable-input[class*="span"] { - float: none; - margin-left: 0; + xmargin-left: 0; + xfloat: none; } .input-append input[class*="span"], diff --git a/docs/base-css.html b/docs/base-css.html index 7504f24699..b87c278299 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -872,7 +872,7 @@ For example, <code><section></code> should be wrapped as inlin

Forms

-

Default styles

+

Default styles

Individual form controls receive styling, but without any required base class on the <form> or large changes in markup. Results in stacked, left-aligned labels on top of form controls.

Legend @@ -901,7 +901,7 @@ For example, <code><section></code> should be wrapped as inlin
-

Optional layouts

+

Optional layouts

Included with Bootstrap are three optional form layouts for common use cases.

Search form

@@ -998,7 +998,7 @@ For example, <code><section></code> should be wrapped as inlin
-

Supported form controls

+

Supported form controls

Examples of standard form controls supported in an example form layout.

Inputs

@@ -1120,7 +1120,7 @@ For example, <code><section></code> should be wrapped as inlin
-

Extending form controls

+

Extending form controls

Adding on top of existing browser controls, Bootstrap includes other useful form components.

Prepended and appended inputs

@@ -1211,7 +1211,7 @@ For example, <code><section></code> should be wrapped as inlin </form> -

Control sizing

+

Control sizing

Use relative sizing classes like .input-large or match your inputs to the grid column sizes using .span* classes.

Relative sizing

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index cc83e0d733..c242fef50a 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -809,7 +809,7 @@

{{_i}}Forms{{/i}}

-

{{_i}}Default styles{{/i}}

+

{{_i}}Default styles{{/i}}

{{_i}}Individual form controls receive styling, but without any required base class on the <form> or large changes in markup. Results in stacked, left-aligned labels on top of form controls.{{/i}}

Legend @@ -838,7 +838,7 @@
-

{{_i}}Optional layouts{{/i}}

+

{{_i}}Optional layouts{{/i}}

{{_i}}Included with Bootstrap are three optional form layouts for common use cases.{{/i}}

{{_i}}Search form{{/i}}

@@ -935,7 +935,7 @@
-

{{_i}}Supported form controls{{/i}}

+

{{_i}}Supported form controls{{/i}}

{{_i}}Examples of standard form controls supported in an example form layout.{{/i}}

{{_i}}Inputs{{/i}}

@@ -1057,7 +1057,7 @@
-

{{_i}}Extending form controls{{/i}}

+

{{_i}}Extending form controls{{/i}}

{{_i}}Adding on top of existing browser controls, Bootstrap includes other useful form components.{{/i}}

{{_i}}Prepended and appended inputs{{/i}}

@@ -1148,7 +1148,7 @@ </form> -

{{_i}}Control sizing{{/i}}

+

{{_i}}Control sizing{{/i}}

{{_i}}Use relative sizing classes like .input-large or match your inputs to the grid column sizes using .span* classes.{{/i}}

{{_i}}Relative sizing{{/i}}

diff --git a/less/forms.less b/less/forms.less index 557f872780..afb84caee3 100644 --- a/less/forms.less +++ b/less/forms.less @@ -275,8 +275,8 @@ textarea[class*="span"], .row-fluid select[class*="span"], .row-fluid textarea[class*="span"], .row-fluid .uneditable-input[class*="span"] { - float: none; - margin-left: 0; + xfloat: none; + xmargin-left: 0; } // Ensure input-prepend/append never wraps .input-append input[class*="span"], diff --git a/less/tests/grid.html b/less/tests/grid.html new file mode 100644 index 0000000000..1360d3ebc7 --- /dev/null +++ b/less/tests/grid.html @@ -0,0 +1,93 @@ + + + + + Bootstrap + + + + + + + + + + + + + + + + + + + + + + + + + +
+

Grids

+
+ + +

Default grid columns

+
+
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
+
+
4
+
4
+
4
+
+
+
6
+
6
+
+
+
12
+
+
+ + + +

Inputs

+ +

No additional markup

+ + + + +

With .controls-row

+
+ + + +
+ + +
+ + +