From 25e21bab96bb784cc90db37a19b5681cc41da429 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 22:05:07 -0700 Subject: [PATCH] fix crappy merge --- docs/index.html | 284 +----------------------------------------------- 1 file changed, 6 insertions(+), 278 deletions(-) diff --git a/docs/index.html b/docs/index.html index 0b9cbd825f..fe9a66f239 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1,3 +1,4 @@ + @@ -12,7 +13,7 @@ - + @@ -599,263 +600,8 @@
-<<<<<<< HEAD - -
-

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

->>>>>>> f169c99f726c250f0bb2f68ea4eedaaf3fbe15c0
@@ -864,9 +610,6 @@
-<<<<<<< HEAD -   -=======
Example form legend
@@ -1033,11 +776,9 @@
- - +  
->>>>>>> f169c99f726c250f0bb2f68ea4eedaaf3fbe15c0
@@ -1105,8 +846,7 @@
- - +  
@@ -1118,19 +858,11 @@

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.

-<<<<<<< HEAD -

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!

@@ -1151,10 +883,8 @@

Buttons

- - +  
->>>>>>> f169c99f726c250f0bb2f68ea4eedaaf3fbe15c0
@@ -1638,8 +1368,6 @@ Lorem ipsum dolar sit amet illo error ipsum verita - -