fix: resolved merge conflict

docs/pages/checkboxes.md

@@ -96,10 +96,10 @@ variation_groups:
               <label class="a-label" for="test_checkbox_error">Error</label>
           </div>
         variation_description: ''
-        variation_name: Standard checkbox
+        variation_name: Checkbox
         variation_specs: ''
       - variation_is_deprecated: false
-        variation_name: Standard checkbox with helper text
+        variation_name: Checkbox (with helper text)
         variation_code_snippet: >-
           <div class="m-form-field m-form-field__checkbox">
               <input class="a-checkbox" type="checkbox" id="test_checkbox_basic_helper">
@@ -188,7 +188,7 @@ variation_groups:
           -->
         variation_specs: ''
       - variation_is_deprecated: false
-        variation_name: Large target area checkbox with helper text
+        variation_name: Large target area checkbox (with helper text)
         variation_code_snippet: >-
           <div class="m-form-field m-form-field__checkbox
           m-form-field__lg-target">

docs/pages/radio-buttons.md

@@ -64,11 +64,10 @@ variation_groups:
                      checked>
               <label class="a-label" for="test_radio_basic_disabled_selected">Disabled/selected</label>
           </div>
-        variation_specs: ''
-        variation_name: Standard radio button
-      - variation_name: Standard radio button with helper text
-        variation_description:
-          Radio button inputs can have labels that span multiple
+        variation_specs: ""
+        variation_name: Radio button
+      - variation_name: Radio button (with helper text)
+        variation_description: Radio button inputs can have labels that span multiple
           lines and can include optional helper text that appears below the main
           label text.
         variation_code_snippet: |-
@@ -81,11 +80,10 @@ variation_groups:
                   </small>
               </label>
           </div>
-        variation_specs: ''
+        variation_specs: ""
       - variation_is_deprecated: false
         variation_name: Large target area radio button
-        variation_description:
-          For better usability, consider using radio buttons with
+        variation_description: For better usability, consider using radio buttons with
           large target areas. These are easier to interact with (especially on
           smaller screens) and harder to miss. They are especially desirable
           when the form will have heavy mobile usage. Given the amount of real
@@ -150,9 +148,9 @@ variation_groups:
                      checked>
               <label class="a-label" for="test_radio_lg_disabled_selected">Disabled/selected</label>
           </div>
-        variation_specs: ''
+        variation_specs: ""
       - variation_is_deprecated: false
-        variation_name: Large target area radio button with helper text
+        variation_name: Large target area radio button (with helper text)
         variation_code_snippet: |-
           <div class="m-form-field m-form-field__radio m-form-field__lg-target">
               <input class="a-radio" type="radio" id="test_radio_lg_helper">
@@ -163,7 +161,7 @@ variation_groups:
                   </small>
                 </label>
           </div>
-guidelines: ''
+guidelines: ""
 eyebrow: Components
 title: Radio buttons
 description: Use radio buttons when the user can select exactly one option from
@@ -181,10 +179,10 @@ use_cases: >-
 
 
   Consider using radio buttons with large target areas. If these won’t fit into your design and you need to use the standard radio button make sure the target area is at least 45 x 45 px and includes the label text.
-behavior: ''
+behavior: ""
 accessibility: There are some issues with Voiceover reading radio buttons. To
   get around this, consider using the aria-describedby attribute.
-related_items: ''
+related_items: ""
 last_updated: 2020-01-28T15:55:47.394Z
-research: ''
+research: ""
 ---

docs/pages/text-inputs.md

@@ -3,11 +3,12 @@ layout: variation
 section: components
 status: Released
 variation_groups:
-  - variation_group_name: Text inputs
+  - variation_group_name: Single line text inputs
     variations:
-      - variation_code_snippet: >
+      - variation_code_snippet: >-
           <!--States are shown for demonstration purposes only-->
 
+
           <h4>
 
           States
@@ -18,7 +19,7 @@ variation_groups:
                 type="text"
                 id="textinput-example-default"
                 placeholder="Placeholder text"
-          value="Default">
+          value="Enabled">
 
           <br><br>
 
@@ -41,25 +42,31 @@ variation_groups:
                  id="textinput-example-disabled"
                  placeholder="Disabled"
                  disabled>
-          <br><br>
+          <br>
+
+          <br>
+
+          <br>
+
 
           <h4>
 
-          Status
+          Validation status
 
           </h4>
 
           <input class="a-text-input a-text-input__success" type="text" placeholder="Success" id="form-input-success" aria-describedby="form-input-success_message">
 
           <br><br>
-           <input class="a-text-input a-text-input__warning" type="text" placeholder="Warning" id="form-input-warning" aria-describedby="form-input-warning_message">
+
+          <input class="a-text-input a-text-input__warning" type="text" placeholder="Warning" id="form-input-success" aria-describedby="form-input-warning_message">
+
           <br><br>
 
-          <input class="a-text-input a-text-input__error" type="text" placeholder="Error" id="form-input-error" aria-describedby="form-input-error_message">
-        variation_specs: ''
+          <input class="a-text-input a-text-input__error" type="text" placeholder="Error" id="form-input-success" aria-describedby="form-input-warning_message">
+        variation_specs: ""
         variation_name: Text input
-        variation_description:
-          Use when the expected user input is a single line of
+        variation_description: Use when the expected user input is a single line of
           text, for example email addresses, names, or search queries. The
           length of the input field should be proportional to the expected user
           input, so that the user can see what they've typed without having to
@@ -88,8 +95,7 @@ variation_groups:
           </div>
       - variation_is_deprecated: false
         variation_name: Button inside text input
-        variation_description:
-          Use to offer the user an action to take related to the
+        variation_description: Use to offer the user an action to take related to the
           input, typically to clear the input.
         variation_code_snippet: >-
           <div class="m-btn-inside-input">
@@ -104,8 +110,7 @@ variation_groups:
           </div>
       - variation_is_deprecated: false
         variation_name: Button inside text input with another button
-        variation_description:
-          This example combines both of the previous patterns,
+        variation_description: This example combines both of the previous patterns,
           creating a typical site search form.
         variation_code_snippet: >-
           <div class="o-form__input-w-btn">
@@ -125,13 +130,12 @@ variation_groups:
                   <button class="a-btn">Search</button>
               </div>
           </div>
-    variation_group_description: ''
-  - variation_group_name: Text area inputs
+    variation_group_description: ""
+  - variation_group_name: Multiple line text inputs
     variations:
       - variation_is_deprecated: false
         variation_name: Text area input
-        variation_description:
-          Use when the expected user input is more than a few words
+        variation_description: Use when the expected user input is more than a few words
           and could span multiple lines. Make sure the input size is big enough
           that the user can see what they've typed without having to scroll to
           reveal hidden content, and small enough that the user doesn't have  to
@@ -176,7 +180,7 @@ eyebrow: Components
 title: Text inputs
 description: Text inputs allow the user to enter any combination of letters,
   numbers, or symbols. Text input fields can span single or multiple lines.
-use_cases: ''
+use_cases: ""
 behavior: As the screen size gets smaller, break multi-column inputs into a
   single, stacked column. Fields that are next to each other on a large screen,
   should stack at smaller screen sizes. When possible, fields should span the
@@ -190,5 +194,5 @@ related_items: "* [Text input
   variables](https://cfpb.github.io/design-system/development/variables#forms-1\
   )"
 last_updated: 2020-01-28T15:55:47.394Z
-research: ''
+research: ""
 ---