diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2018-07-16 16:58:55 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2018-07-16 16:58:55 +0200 |
| commit | 3483bea5716b608cb04dc2d006595c8dbf0dfd6d (patch) | |
| tree | 8499c2a2487d601d2e53cf623b5b7f5d9839a15f /app/components/SettingsStyles.js | |
| parent | 7aa861495ffe90e0b5a9b9c67b8ccf0ad62c2882 (diff) | |
| parent | 28425ce96bef4f9cef54673910aeae51237c6714 (diff) | |
| download | mullvadvpn-3483bea5716b608cb04dc2d006595c8dbf0dfd6d.tar.xz mullvadvpn-3483bea5716b608cb04dc2d006595c8dbf0dfd6d.zip | |
Merge branch 'visual-adjustments'
Diffstat (limited to 'app/components/SettingsStyles.js')
| -rw-r--r-- | app/components/SettingsStyles.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/components/SettingsStyles.js b/app/components/SettingsStyles.js index 6063a5a567..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, @@ -18,7 +18,7 @@ export default Object.assign( paddingTop: 16, paddingRight: 24, paddingLeft: 24, - paddingBottom: 16, + paddingBottom: 24, }, settings__content: { flexDirection: 'column', @@ -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, }, }), -); +}; |