diff options
| author | anderklander <anderklander@gmail.com> | 2018-02-05 07:59:01 +0100 |
|---|---|---|
| committer | anderklander <anderklander@gmail.com> | 2018-02-05 07:59:01 +0100 |
| commit | 5aca24edfffaf2272253ffc91894c773ccfe9603 (patch) | |
| tree | b927b1088954fcb13ffdbdbedb2ced5008ca5076 | |
| parent | 4caa3c4ac2d1148680c5da10f15c59941a2be518 (diff) | |
| download | mullvadvpn-5aca24edfffaf2272253ffc91894c773ccfe9603.tar.xz mullvadvpn-5aca24edfffaf2272253ffc91894c773ccfe9603.zip | |
Style fixes for scrolling and background
| -rw-r--r-- | app/components/AdvancedSettings.js | 6 | ||||
| -rw-r--r-- | app/components/AdvancedSettingsStyles.js | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/app/components/AdvancedSettings.js b/app/components/AdvancedSettings.js index 927a462aa4..a6c46ab49c 100644 --- a/app/components/AdvancedSettings.js +++ b/app/components/AdvancedSettings.js @@ -138,11 +138,9 @@ function BaseLayout(props) { <View style={ styles.advanced_settings__header }> <Text style={ styles.advanced_settings__title }>Advanced</Text> </View> - <CustomScrollbars autoHide={ true }> + <CustomScrollbars style={styles.advanced_settings__scrollview} autoHide={ true }> <View style={ styles.advanced_settings__content }> - <View style={ styles.advanced_settings__main }> - { props.children } - </View> + { props.children } </View> </CustomScrollbars> </View> diff --git a/app/components/AdvancedSettingsStyles.js b/app/components/AdvancedSettingsStyles.js index 8e2898c2f2..333128d813 100644 --- a/app/components/AdvancedSettingsStyles.js +++ b/app/components/AdvancedSettingsStyles.js @@ -6,14 +6,12 @@ export default { ...createViewStyles({ advanced_settings: { backgroundColor: '#192E45', - overflow: 'visible', + height: '100%', }, advanced_settings__container: { - display: 'flex', flexDirection: 'column', - }, - advanced_settings__main: { - marginBottom: 24, + height: '100%', + paddingBottom: 48, }, advanced_settings__header: { flexGrow: 0, @@ -39,10 +37,15 @@ export default { opacity: 0.6, marginRight: 8, }, + advanced_settings__scrollview: { + flexGrow: 1, + flexShrink: 1, + flexBasis: '100%', + }, advanced_settings__content: { flexDirection: 'column', flexGrow: 1, - flexShrink: 1, + flexShrink: 0, flexBasis: 'auto', }, advanced_settings__cell: { @@ -69,7 +72,6 @@ export default { height: 24, marginRight: 8, flex: 0, - overflow: 'visible', color: 'rgba(255, 255, 255, 0.8)', }, advanced_settings__cell_dimmed: { |