fix(Button): change size regular to medium

treebohotels · Mar 8, 2018 · bdb2d9e · bdb2d9e
1 parent dc925d3
commit bdb2d9e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/components/Button/Button.js b/src/components/Button/Button.js
@@ -56,7 +56,7 @@ const Button = styled.button`
     small: `
       padding: ${p.theme.px(1)};
     `,
-    regular: `
+    medium: `
       padding: ${p.theme.px(2)};
     `,
     large: `
@@ -74,15 +74,15 @@ Button.propTypes = {
   color: PropTypes.string,
   kind: PropTypes.oneOf(['solid', 'outlined', 'transparent']),
   shape: PropTypes.oneOf(['default', 'flat', 'rounded', 'circular']),
-  size: PropTypes.oneOf(['small', 'regular', 'large']),
+  size: PropTypes.oneOf(['small', 'medium', 'large']),
   block: PropTypes.bool,
   disabled: PropTypes.bool,
 };
 
 Button.defaultProps = {
   color: 'primary',
   kind: 'solid',
-  size: 'regular',
+  size: 'medium',
   shape: 'default',
   block: false,
   disabled: false,

diff --git a/src/components/Button/Button.story.js b/src/components/Button/Button.story.js
@@ -11,7 +11,7 @@ storiesOf('Button', module)
       color={select('color', Object.keys(theme.color), 'primary')}
       kind={select('kind', ['solid', 'outlined', 'transparent'], 'solid')}
       shape={select('shape', ['default', 'flat', 'rounded', 'circular'], 'default')}
-      size={select('size', ['small', 'regular', 'large'], 'regular')}
+      size={select('size', ['small', 'medium', 'large'], 'medium')}
       block={boolean('block', false)}
       disabled={boolean('disabled', false)}
       onClick={action('button clicked')}
@@ -59,7 +59,7 @@ storiesOf('Button', module)
         Small Button
       </Button>
       <br /><br />
-      <Button size="regular">
+      <Button size="medium">
         Default Button
       </Button>
       <br /><br />

diff --git a/src/components/Button/native/Button.js b/src/components/Button/native/Button.js
@@ -37,7 +37,7 @@ const ButtonView = styled.View`
     small: `
       padding: ${p.theme.px(1)};
     `,
-    regular: `
+    medium: `
       padding: ${p.theme.px(2)};
     `,
     large: `
@@ -92,15 +92,15 @@ Button.propTypes = {
   color: PropTypes.string,
   kind: PropTypes.oneOf(['solid', 'outlined', 'transparent']),
   shape: PropTypes.oneOf(['default', 'flat', 'rounded']),
-  size: PropTypes.oneOf(['small', 'regular', 'large']),
+  size: PropTypes.oneOf(['small', 'medium', 'large']),
   block: PropTypes.bool,
   disabled: PropTypes.bool,
 };
 
 Button.defaultProps = {
   color: 'green',
   kind: 'solid',
-  size: 'regular',
+  size: 'medium',
   shape: 'default',
   block: false,
   disabled: false,

diff --git a/storybook/native/stories.js b/storybook/native/stories.js
@@ -67,7 +67,7 @@ storiesOf('Button', module)
         </Button>
       </Spacer>
       <Spacer margin={4}>
-        <Button size="regular">
+        <Button size="medium">
           <Text>Default Button</Text>
         </Button>
       </Spacer>