From: Mark Otto Date: Mon, 22 Aug 2011 03:51:13 +0000 (-0700) Subject: resolve conflicts X-Git-Tag: v1.1.0~13^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23ec21d0498a4a5c18dcbef9ec835bb0ef80aa22;p=thirdparty%2Fbootstrap.git resolve conflicts --- 23ec21d0498a4a5c18dcbef9ec835bb0ef80aa22 diff --cc bootstrap-1.0.0.css index d84e577795,7ec9acc0bd..08bbb7bba8 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.css @@@ -6,7 -6,7 +6,7 @@@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sun Aug 21 20:38:48 PDT 2011 - * Date: Sun Aug 21 20:47:15 PDT 2011 ++ * Date: Sun Aug 21 20:50:48 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@@ -977,6 -1008,13 +1008,13 @@@ form.form-stacked .inputs-list li labe font-weight: normal; padding-top: 0; } -form.form-stacked div.error { ++form.form-stacked .error { + padding-top: 10px; + padding-bottom: 10px; + padding-left: 10px; + margin-top: 0; + margin-left: -10px; + } form.form-stacked .actions { margin-left: -20px; padding-left: 20px; diff --cc bootstrap-1.0.0.min.css index 38a865b4cd,f30ba03326..c861689c64 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@@ -131,6 -132,7 +132,7 @@@ form.form-stacked legend{margin-left:0; form.form-stacked label{display:block;float:none;width:auto;font-weight:bold;text-align:left;line-height:20px;padding-top:0;} form.form-stacked .clearfix{margin-bottom:9px;}form.form-stacked .clearfix div.input{margin-left:0;} form.form-stacked .inputs-list{margin-bottom:0;}form.form-stacked .inputs-list li{padding-top:0;}form.form-stacked .inputs-list li label{font-weight:normal;padding-top:0;} -form.form-stacked div.error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;} ++form.form-stacked .error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;} form.form-stacked .actions{margin-left:-20px;padding-left:20px;} table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:13.5px;text-align:left;vertical-align:middle;border-bottom:1px solid #ddd;} table th{padding-top:9px;font-weight:bold;border-bottom-width:2px;} diff --cc docs/index.html index 3ad2bb08bb,311edc0934..983ea7d871 --- a/docs/index.html +++ b/docs/index.html @@@ -572,298 -596,340 +596,300 @@@ +
- -
-

Forms

-
- -
-
-

Default styles

-

All forms are given default styles to present them in a readable and scalable way. Styles are provided for text inputs, select lists, textareas, radio buttons and checkboxes, and buttons.

-
-
-
-
- Example form legend -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- Some Value Here -
-
-
- -
- -
-
-
- -
- - Small snippet of help text -
-
-
-
- Example form legend -
- -
-
- @ - -
-
-
-
- -
-
- - -
-
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
-
- Example form legend -
- -
-
    -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
- - Note: Labels surround all the options for much larger click areas and a more usable form. - -
-
-
- -
-
- - - to - - - All times are shown as Pacific Standard Time (GMT -08:00). -
-
-
-
- -
- - - Block of help text to describe the field above if need be. - -
-
-
- -
-
    -
  • - -
    • -
  • - -
    • -
-
-
-
- - -
-
-
-
-
- -
- -
-
-

Stacked forms

-

Add .form-stacked to your form’s HTML and you’ll have labels on top of their fields instead of to their left. This works great if your forms are short or you have two columns of inputs for heavier forms.

-
-
-
-
- Example form legend -
- -
- -
-
-
- -
- -
-
-
-
- Example form legend -
- -
-
    -
  • - -
    • -
  • - -
    • -
- - Note: Labels surround all the options for much larger click areas and a more usable form. - -
-
-
-
- - -
-
-
-
- -
-
-

Buttons

-

As a convention, buttons are used for actions while links are used for objects. For instance, "Download" could be a button and "recent activity" could be a link.

-

All buttons default to a light gray style, but a blue .primary class is available. Plus, rolling your own styles is easy peasy.

+
+

Forms

-
-

Example buttons

-

Button styles can be applied to anything with the .btn applied. Typically you’ll want to apply these to only <a>, <button>, and select <input> elements. Here’s how it looks:

-
+
+
+

Default styles

+

All forms are given default styles to present them in a readable and scalable way. Styles are provided for text inputs, select lists, textareas, radio buttons and checkboxes, and buttons.

+
+
- - +
+ Example form legend +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ Some Value Here +
+
+
+ +
+ +
+
+
+ +
+ + Small snippet of help text +
+
+
+
+ Example form legend +
+ +
+
+ @ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+
+ Example form legend +
+ +
+
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
+ + Note: Labels surround all the options for much larger click areas and a more usable form. + +
+
+
+ +
+
+ + + to + + + All times are shown as Pacific Standard Time (GMT -08:00). +
+
+
+
+ +
+ + + Block of help text to describe the field above if need be. + +
+
+
+ +
+
    +
  • + +
    • +
  • + +
    • +
+
+
+
+ + +
+
-

Alternate sizes

-

Fancy larger or smaller buttons? Have at it!

-
- Primary action - Action +
+ +
+ -<<<<<<< .merge_file_CXRuoN +
+
+

Stacked forms

+

Add .form-stacked to your form’s HTML and you’ll have labels on top of their fields instead of to their left. This works great if your forms are short or you have two columns of inputs for heavier forms.

-======= -
-
-

Buttons

-

As a convention, buttons are used for actions while links are used for objects. For instance, "Download" could be a button and "recent activity" could be a link.

-

All buttons default to a light gray style, but a blue .primary class is available. Plus, rolling your own styles is easy peasy.

-
-
-

Example buttons

-

Button styles can be applied to anything with the .btn applied. Typically you’ll want to apply these to only <a>, <button>, and select <input> elements. Here’s how it looks:

-
-
- - -
-
-

Alternate sizes

-

Fancy larger or smaller buttons? Have at it!

-
- Primary action - Action ->>>>>>> .merge_file_hNGrGI
-
- Primary action - Action +
+
+
+ Example form legend +
+ +
+ +
+
+
+ +
+ +
+
+
+
+ Example form legend +
+ +
+ + Small snippet of help text +
+
+
+ +
+
    +
  • + +
    • +
  • + +
    • +
+ + Note: Labels surround all the options for much larger click areas and a more usable form. + +
+
+
+
+ + +
+
-

Disabled state

-

For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s .disabled for links and :disabled for <button> elements.

-

Note: If you're developing for older browsers like IE8 or below -- you're going to want to use the .disabled class for <button> elements as well. -

Links

-
- Primary action - Action -<<<<<<< .merge_file_CXRuoN +
+ +
+
+

Buttons

+

As a convention, buttons are used for actions while links are used for objects. For instance, "Download" could be a button and "recent activity" could be a link.

+

All buttons default to a light gray style, but a blue .primary class is available. Plus, rolling your own styles is easy peasy.

-

Buttons

-
-
- - -
+
+

Example buttons

+

Button styles can be applied to anything with the .btn applied. Typically you’ll want to apply these to only <a>, <button>, and select <input> elements. Here’s how it looks:

+
+ + +
+

Alternate sizes

+

Fancy larger or smaller buttons? Have at it!

+
+ Primary action + Action +
+
+ Primary action + Action +
+

Disabled state

+

For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s .disabled for links and :disabled for <button> elements.

+

Links

+
+ Primary action + Action +
+

Buttons

+
+ + +
-======= -

Disabled state

-

For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s .disabled for links and :disabled for <button> elements.

-

Note: If you're developing for older browsers like IE8 or below -- you're going to want to use the .disabled class for <button> elements as well. -

Links

-
- Primary action - Action -
-

Buttons

-
-
- - -
->>>>>>> .merge_file_hNGrGI
-
-
+
@@@ -875,6 -943,30 +903,30 @@@

Fixed topbar

-<<<<<<< .merge_file_CXRuoN +
+

Project Name

+ +
+ +
+ + ======= ++>>>>>>> .merge_file_ugVE3k

Project Name

@@@ -1165,11 -1267,11 +1226,7 @@@ Lorem ipsum dolar sit amet illo error <
--<<<<<<< HEAD --======= -- -->>>>>>> 842ad01fce710c50dc9c0174ab790f91e66c46b1
diff --cc lib/forms.less index 3a847ae841,cd5cffc316..d528bcd3f3 --- a/lib/forms.less +++ b/lib/forms.less @@@ -342,6 -342,13 +342,13 @@@ form.form-stacked } } } - div.error { ++ .error { + padding-top: 10px; + padding-bottom: 10px; + padding-left: 10px; + margin-top: 0; + margin-left: -10px; + } .actions { margin-left: -20px; padding-left: 20px;