diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2018-07-10 15:27:20 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2018-07-16 16:44:05 +0200 |
| commit | db7b3f8971206e50d4e3117b5ea23be7196d2194 (patch) | |
| tree | 32d2d87dba3631ae883dce0ecbc8b5a46c02cf04 /app | |
| parent | 8c6a7a80109d699b8a919f3460525f1fcdad592c (diff) | |
| download | mullvadvpn-db7b3f8971206e50d4e3117b5ea23be7196d2194.tar.xz mullvadvpn-db7b3f8971206e50d4e3117b5ea23be7196d2194.zip | |
Use spread instead of Object.assign
Diffstat (limited to 'app')
| -rw-r--r-- | app/components/SettingsStyles.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/components/SettingsStyles.js b/app/components/SettingsStyles.js index 8fa319588a..5e4eee192e 100644 --- a/app/components/SettingsStyles.js +++ b/app/components/SettingsStyles.js @@ -1,8 +1,8 @@ import { createViewStyles, createTextStyles } from '../lib/styles'; import { colors } from '../config'; -export default Object.assign( - createViewStyles({ +export default { + ...createViewStyles({ settings: { backgroundColor: colors.darkBlue, flex: 1, @@ -51,7 +51,7 @@ export default Object.assign( paddingBottom: 16, }, }), - createTextStyles({ + ...createTextStyles({ settings__title: { fontFamily: 'DINPro', fontSize: 32, @@ -63,4 +63,4 @@ export default Object.assign( color: colors.red, }, }), -); +}; |