aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-02-05 00:05:01 -0800
committerMark Otto <[email protected]>2012-02-05 00:05:01 -0800
commit31abeec0f2d84b3861d0c80c56c3112546bf0bfd (patch)
tree2fa38cc151a6bb93043fa1bd3b7924903b26ada3
parent125368d4db04fa5b2300975ed2ba59983309ee0f (diff)
downloadbootstrap-31abeec0f2d84b3861d0c80c56c3112546bf0bfd.tar.xz
bootstrap-31abeec0f2d84b3861d0c80c56c3112546bf0bfd.zip
manually handle #1703 for note on horizontal forms
-rw-r--r--docs/assets/bootstrap.zipbin52391 -> 52391 bytes
-rw-r--r--docs/templates/pages/upgrading.mustache1
-rw-r--r--docs/upgrading.html1
3 files changed, 2 insertions, 0 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 99ff15c06..d43ca5f9a 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
index d92cc04dd..56b0d4bf7 100644
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@ -82,6 +82,7 @@
<li>{{_i}}Default form style is now vertical (stacked) to use less CSS and add greater flexibility{{/i}}</li>
<li>{{_i}}Form classes standardized with <code>.form-</code> required as a prefix{{/i}}</li>
<li>{{_i}}New built-in form defaults for search, inline, and horizontal forms{{/i}}</li>
+ <li>{{_i}}For horizontal forms, previous classes <code>.clearfix</code> and <code>.input</code> are equivalent to the new <code>.control-group</code> and <code>.controls</code>.{{/i}}</li>
<li>{{_i}}More flexible horizontal form markup with classes for all styling, including new optional class for the <code>label</code>{{/i}}</li>
<li>{{_i}}Form states: colors updated and customizable via new LESS variables{{/i}}</li>
</ul>
diff --git a/docs/upgrading.html b/docs/upgrading.html
index ad3236f2b..5a7b0d2f6 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -158,6 +158,7 @@
<li>Default form style is now vertical (stacked) to use less CSS and add greater flexibility</li>
<li>Form classes standardized with <code>.form-</code> required as a prefix</li>
<li>New built-in form defaults for search, inline, and horizontal forms</li>
+ <li>For horizontal forms, previous classes <code>.clearfix</code> and <code>.input</code> are equivalent to the new <code>.control-group</code> and <code>.controls</code>.</li>
<li>More flexible horizontal form markup with classes for all styling, including new optional class for the <code>label</code></li>
<li>Form states: colors updated and customizable via new LESS variables</li>
</ul>