chore: Change "small" to "micro"

mozilla · Jan 26, 2018 · e94f299 · e94f299
1 parent 840bad3
commit e94f299
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 10 deletions.
diff --git a/src/amo/components/DownloadFirefoxButton/index.js b/src/amo/components/DownloadFirefoxButton/index.js
@@ -33,7 +33,7 @@ export const DownloadFirefoxButtonBase = ({
     <Button
       className={makeClassName('DownloadFirefoxButton', className)}
       href={`https://www.mozilla.org/firefox/new/${queryString}`}
-      small
+      micro
       type="confirm"
     >
       {i18n.gettext('Download Firefox')}

diff --git a/src/amo/components/ReportAbuseButton/index.js b/src/amo/components/ReportAbuseButton/index.js
@@ -201,7 +201,7 @@ export class ReportAbuseButtonBase extends React.Component<Props> {
               className="ReportAbuseButton-send-report"
               disabled={sendButtonIsDisabled}
               onClick={this.sendReport}
-              small
+              micro
               type="alert"
             >
               {loading ?

diff --git a/src/core/components/AuthenticateButton/index.js b/src/core/components/AuthenticateButton/index.js
@@ -86,7 +86,7 @@ export class AuthenticateButtonBase extends React.Component<Props> {
         href={`#${siteUser ? 'logout' : 'login'}`}
         className={className}
         onClick={this.onClick}
-        small
+        micro
         type={type}
       >
         {noIcon ? null : <Icon name="user-dark" />}

diff --git a/src/core/components/PaginatorLink/index.js b/src/core/components/PaginatorLink/index.js
@@ -43,7 +43,8 @@ export default class PaginatorLink extends React.Component {
       return (
         <Button
           key={page}
-          className={makeClassName('Paginate-item', 'disabled', className)}
+          className={makeClassName('Paginate-item', className)}
+          disabled
           type="light"
         >
           {text || page}

diff --git a/src/ui/components/Button/index.js b/src/ui/components/Button/index.js
@@ -27,8 +27,6 @@ export default class Button extends React.Component {
     href: PropTypes.string,
     micro: PropTypes.boolean,
     puffy: PropTypes.boolean,
-    // Small is an alias for micro.
-    small: PropTypes.boolean,
     to: PropTypes.string,
     type: PropTypes.string,
   }
@@ -37,7 +35,6 @@ export default class Button extends React.Component {
     disabled: false,
     micro: false,
     puffy: false,
-    small: false,
   }
 
   render() {
@@ -47,7 +44,6 @@ export default class Button extends React.Component {
       href,
       micro,
       puffy,
-      small,
       to,
       type,
       ...rest
@@ -62,7 +58,7 @@ export default class Button extends React.Component {
       return makeClassName(
         'Button', `Button--${type}`, className, ...classConfig, {
           'Button--disabled': props.disabled,
-          'Button--micro': micro || small,
+          'Button--micro': micro,
           'Button--puffy': puffy,
         },
       );

diff --git a/tests/unit/core/components/TestPaginatorLink.js b/tests/unit/core/components/TestPaginatorLink.js
@@ -54,7 +54,7 @@ describe('<PaginatorLink />', () => {
     it('does not contain a link and is disabled', () => {
       const item = renderLink({ currentPage: 3, page: 3 });
 
-      expect(item).toHaveClassName('disabled');
+      expect(item).toHaveProp('disabled', true);
       expect(item.prop('to')).toEqual(undefined);
       expect(item.prop('children')).toEqual(3);
     });