diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2020-07-15 12:24:40 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2020-07-15 12:24:40 +0200 |
| commit | 8b7b7175ea5c93374daf60abfda8b560be374048 (patch) | |
| tree | 3956d7d158c13563650f06a2c5a098810f57866d /gui/src/renderer/components/SelectLanguage.tsx | |
| parent | bd4f591f5fc56f383c8dbd437c748e36559cbed8 (diff) | |
| parent | a788fb532289bb2cbd47669a3d85497c70f74379 (diff) | |
| download | mullvadvpn-8b7b7175ea5c93374daf60abfda8b560be374048.tar.xz mullvadvpn-8b7b7175ea5c93374daf60abfda8b560be374048.zip | |
Merge branch 'convert-navigation-bar-from-reactxp'
Diffstat (limited to 'gui/src/renderer/components/SelectLanguage.tsx')
| -rw-r--r-- | gui/src/renderer/components/SelectLanguage.tsx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gui/src/renderer/components/SelectLanguage.tsx b/gui/src/renderer/components/SelectLanguage.tsx index 1a294a05ba..58f4a7b922 100644 --- a/gui/src/renderer/components/SelectLanguage.tsx +++ b/gui/src/renderer/components/SelectLanguage.tsx @@ -36,12 +36,12 @@ const styles = { container: Styles.createViewStyle({ flex: 1, }), - // plain CSS style - scrollview: { - flex: 1, - }, }; +const StyledNavigationScrollbars = styled(NavigationScrollbars)({ + flex: 1, +}); + const StyledSelector = (styled(Selector)({ marginBottom: 0, }) as unknown) as new <T>() => Selector<T>; @@ -88,7 +88,7 @@ export default class SelectLanguage extends Component<IProps, IState> { </NavigationBar> <View style={styles.container}> - <NavigationScrollbars style={styles.scrollview}> + <StyledNavigationScrollbars> <SettingsHeader> <HeaderTitle> {messages.pgettext('select-language-nav', 'Select language')} @@ -101,7 +101,7 @@ export default class SelectLanguage extends Component<IProps, IState> { onSelect={this.props.setPreferredLocale} selectedCellRef={this.selectedCellRef} /> - </NavigationScrollbars> + </StyledNavigationScrollbars> </View> </NavigationContainer> </View> |