From 8c577c53cca0afc6e2948fafe1b541567954d361 Mon Sep 17 00:00:00 2001 From: TJ Egan Date: Thu, 23 Jan 2020 19:41:05 -0800 Subject: [PATCH 1/2] fix(text-input): rename sizing props (#5167) --- .../components/src/components/text-input/_text-input.scss | 4 ++-- packages/react/src/components/TextInput/TextInput-story.js | 6 +++--- packages/react/src/components/TextInput/TextInput.js | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/components/src/components/text-input/_text-input.scss b/packages/components/src/components/text-input/_text-input.scss index c52f019894b7..26a544d3f06f 100644 --- 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 index e8de9266088c..2da5d32abcf9 100644 --- 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 index 1e20126ef1c2..51b72c793f1d 100644 --- 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 From ef94af7b97218572088d0e0337b8d1ac859474d2 Mon Sep 17 00:00:00 2001 From: carbon-bot Date: Fri, 24 Jan 2020 03:52:22 +0000 Subject: [PATCH 2/2] chore(project): sync generated files --- packages/components/docs/sass.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md index 61450e60c91d..c23d2ecaee6f 100644 --- a/packages/components/docs/sass.md +++ b/packages/components/docs/sass.md @@ -22430,11 +22430,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); }