Merge branch 'master' into progress-indicator-VO

carbon-design-system · Jan 24, 2020 · b0fd7f4 · b0fd7f4
2 parents c4c7859 + ef94af7
commit b0fd7f4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md
@@ -22432,11 +22432,11 @@ Text input styles
     }
   }
 
-  .#{$prefix}--text-input--large {
+  .#{$prefix}--text-input--xl {
     height: rem(48px);
   }
 
-  .#{$prefix}--text-input--small {
+  .#{$prefix}--text-input--sm {
     height: rem(32px);
   }
 

diff --git a/packages/components/src/components/text-input/_text-input.scss b/packages/components/src/components/text-input/_text-input.scss
@@ -44,11 +44,11 @@
     }
   }
 
-  .#{$prefix}--text-input--large {
+  .#{$prefix}--text-input--xl {
     height: rem(48px);
   }
 
-  .#{$prefix}--text-input--small {
+  .#{$prefix}--text-input--sm {
     height: rem(32px);
   }
 

diff --git a/packages/react/src/components/TextInput/TextInput-story.js b/packages/react/src/components/TextInput/TextInput-story.js
@@ -20,9 +20,9 @@ const types = {
 };
 
 const sizes = {
-  Large: 'large',
-  Default: '',
-  Small: 'small',
+  'Extra large size (xl)': 'xl',
+  'Regular size (lg)': '',
+  'Small size (sm)': 'sm',
 };
 
 function ControlledPasswordInputApp(props) {

diff --git a/packages/react/src/components/TextInput/TextInput.js b/packages/react/src/components/TextInput/TextInput.js
@@ -146,9 +146,9 @@ TextInput.propTypes = {
   placeholder: PropTypes.string,
 
   /**
-   * Specify the size of the Text Input. Currently supports either `small` or `large` as an option. If omitted, defaults to standard size
+   * Specify the size of the Text Input. Currently supports either `sm` or `xl` as an option.
    */
-  size: PropTypes.string,
+  size: PropTypes.oneOf(['sm', 'xl']),
 
   /**
    * Specify the type of the <input>