Merge branch 'master' into WNMGDS-281/move-hint-error-outside-legend

CMSgov · Nov 4, 2019 · 4496062 · 4496062
2 parents fb7300f + 680304e
commit 4496062
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 185 deletions.
diff --git a/packages/core/src/components/Autocomplete/_Autocomplete.docs.scss b/packages/core/src/components/Autocomplete/_Autocomplete.docs.scss
@@ -20,11 +20,11 @@ Style guide: components.autocomplete.react
 ### When to use
 
 - If you are returning results from a known domain like a database of zip codes or a taxonomy of keywords
-- If you have a list of options that would cause a [select menu](/components/select) to be unusually long
+- If you have a list of options that would cause a [dropdown](/components/dropdown) to be unusually long
 
 ### When to consider alternatives
 
-- When users are choosing from a specific set of options. Consider [checkboxes, radio buttons](/components/choice), or a [select menu](/components/select) in these cases.
+- When users are choosing from a specific set of options. Consider [checkboxes, radio buttons](/components/choice), or a [dropdown](/components/dropdown) in these cases.
 
 ### Usage
 

diff --git a/packages/core/src/components/ChoiceList/Select.e2e.test.js b/packages/core/src/components/ChoiceList/Select.e2e.test.js
diff --git a/packages/core/src/components/ChoiceList/Select.example.jsx b/packages/core/src/components/ChoiceList/Select.example.jsx
diff --git a/packages/core/src/components/ChoiceList/_ChoiceList.docs.scss b/packages/core/src/components/ChoiceList/_ChoiceList.docs.scss
@@ -10,16 +10,6 @@ Markup: checkbox-radio.example.html
 Style guide: components.choice
 */
 
-/*
-Right-to-Left
-
-<span class="ds-c-badge ds-u-margin-right--1 ds-u-text-transform--capitalize">Deprecated</span>
-
-Markup: checkbox-radio-right-to-left.example.html
-
-Style guide: components.choice.rtl
-*/
-
 /*
 `<ChoiceList>`
 
@@ -62,7 +52,7 @@ Style guide: components.choice.react
 
 ### When to consider alternatives
 
-- If there are too many options to display on a mobile screen. Consider a `select` menu if you don’t have enough space to list out all available options, and if the user can only select one of the options.
+- If there are too many options to display on a mobile screen. Consider a `dropdown` menu if you don’t have enough space to list out all available options, and if the user can only select one of the options.
 - Never use radio buttons for optional questions, since once a radio button is selected from a list, it or another choice will remain selected.
 
 ### Usage
@@ -108,7 +98,7 @@ The following Sass variables can be overridden to theme choice fields:
 
 ### Related patterns
 
-- [Select menu](/components/select)
+- [Dropdown](/components/dropdown)
 
 ### Learn more
 

diff --git a/packages/core/src/components/ChoiceList/_Select.docs.scss b/packages/core/src/components/ChoiceList/_Select.docs.scss
diff --git a/packages/core/src/components/ChoiceList/select.example.html b/packages/core/src/components/ChoiceList/select.example.html
diff --git a/packages/core/src/components/TextField/_TextField.docs.scss b/packages/core/src/components/TextField/_TextField.docs.scss
@@ -31,7 +31,7 @@ Style guide: components.text-field.react
 
 ### When to consider alternatives
 
-- When users are choosing from a specific set of options. Consider [checkboxes, radio buttons](/components/choice), or a [select menu](/components/select) in these cases.
+- When users are choosing from a specific set of options. Consider [checkboxes, radio buttons](/components/choice), or a [dropdown](/components/dropdown) in these cases.
 
 ### Usage
 

diff --git a/packages/core/src/components/_index.scss b/packages/core/src/components/_index.scss
@@ -4,7 +4,6 @@
 @import 'Badge/Badge';
 @import 'Button/Button';
 @import 'ChoiceList/Choice'; // This should eventually be renamed to `ChoiceList`
-@import 'ChoiceList/Select';
 @import 'Dialog/Dialog';
 @import 'Dropdown/Dropdown';
 @import 'FormLabel/FormLabel';

diff --git a/packages/docs/src/pages/guidelines/forms.md b/packages/docs/src/pages/guidelines/forms.md
@@ -2,7 +2,7 @@
 title: Forms
 ---
 
-The design system includes components for the standard HTML form elements: [checkboxes and radio buttons]({{root}}/components/choice), [text fields]({{root}}/components/text-field), [select menus]({{root}}/components/select), fieldsets, labels, and so on.
+The design system includes components for the standard HTML form elements: [checkboxes and radio buttons]({{root}}/components/choice), [text fields]({{root}}/components/text-field), [dropdowns ]({{root}}/components/dropdown), fieldsets, labels, and so on.
 
 Below are some best practices your project should aim to follow in order to provide the most accessible and usable experience for your users. Additional guidance, specific to each form field, is provided in each component's guidance tab.