diff options
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | app/components/styled/Button.js | 6 |
2 files changed, 1 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index c62e82f632..2246706168 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,13 +35,6 @@ matrix: before_script: *node_before_script script: *node_script - - language: node_js - node_js: '6' - cache: yarn - install: *node_install - before_script: *node_before_script - script: *node_script - # Backend macOS - language: rust diff --git a/app/components/styled/Button.js b/app/components/styled/Button.js index df880701cd..59d2371480 100644 --- a/app/components/styled/Button.js +++ b/app/components/styled/Button.js @@ -10,11 +10,7 @@ const defaultStyle = ReactXP.Styles.createViewStyle({ export function Button(props: *) { const { style, cursor, ...rest } = props; - const stylePropArray = Array.isArray(props.style) - ? props.style - : [props.style]; - - const concreteStyle = ReactXP.Styles.combine([defaultStyle, ...stylePropArray]); + const concreteStyle = ReactXP.Styles.combine([defaultStyle, style]); // Can be removed when we upgrade to ReactXP 0.51 const concreteCursor = cursor || concreteStyle.cursor || 'default'; |