diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2018-02-20 17:48:06 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2018-02-20 17:48:06 +0100 |
| commit | ae9c255b3ecdec341090c932db6cb261147a7382 (patch) | |
| tree | e45f0799b1999dd2fe25c04257136d3cd8891d58 | |
| parent | 108f12d0f7434d4acddcc2f88ba4793a81b38e2c (diff) | |
| parent | 39cc3f0cd07fca46b6cf671145ffb088736d474d (diff) | |
| download | mullvadvpn-ae9c255b3ecdec341090c932db6cb261147a7382.tar.xz mullvadvpn-ae9c255b3ecdec341090c932db6cb261147a7382.zip | |
Merge branch 'minor-button-refactoring'
| -rw-r--r-- | app/components/styled/AppButton.js | 12 | ||||
| -rw-r--r-- | app/components/styled/CellButton.js | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/app/components/styled/AppButton.js b/app/components/styled/AppButton.js index 60da8edb3c..f868d33ce0 100644 --- a/app/components/styled/AppButton.js +++ b/app/components/styled/AppButton.js @@ -74,7 +74,7 @@ const styles = { export class Label extends Text {} -export default class BaseButton extends Component { +class BaseButton extends Component { props: { children: Array<React.Element<*>> | React.Element<*>, disabled: boolean, @@ -97,7 +97,7 @@ export default class BaseButton extends Component { {...otherProps}> { React.Children.map(children, (node) => { - if (React.isValidElement(node)){ + if (React.isValidElement(node)) { let updatedProps = {}; if(node.type.name === 'Label') { @@ -119,18 +119,18 @@ export default class BaseButton extends Component { } } -export class RedButton extends BaseButton{ +export class RedButton extends BaseButton { backgroundStyle = () => this.state.hovered ? styles.redHover : styles.red; } -export class GreenButton extends BaseButton{ +export class GreenButton extends BaseButton { backgroundStyle = () => this.state.hovered ? styles.greenHover : styles.green; } -export class BlueButton extends BaseButton{ +export class BlueButton extends BaseButton { backgroundStyle = () => this.state.hovered ? styles.blueHover : styles.blue; } -export class TransparentButton extends BaseButton{ +export class TransparentButton extends BaseButton { backgroundStyle = () => this.state.hovered ? styles.transparentHover : styles.transparent; }
\ No newline at end of file diff --git a/app/components/styled/CellButton.js b/app/components/styled/CellButton.js index 7309180241..fe3042709a 100644 --- a/app/components/styled/CellButton.js +++ b/app/components/styled/CellButton.js @@ -89,7 +89,7 @@ export default class CellButton extends Component { {...otherProps}> { React.Children.map(children, (node) => { - if (React.isValidElement(node)){ + if (React.isValidElement(node)) { let updatedProps = {}; if(node.type.name === 'Label') { |