diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2021-07-06 10:44:50 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2021-07-06 10:44:50 +0200 |
| commit | f03255e144ece66003850f70cb9df91ecc127814 (patch) | |
| tree | 69aa16f7604a35d87c1587eec8a4836c3df83416 /gui | |
| parent | 3c48b1c8da17d30199544c4fd221c4ea65d922d8 (diff) | |
| parent | 8e64abbdae430209898a00d349d71c6a21360e58 (diff) | |
| download | mullvadvpn-f03255e144ece66003850f70cb9df91ecc127814.tar.xz mullvadvpn-f03255e144ece66003850f70cb9df91ecc127814.zip | |
Merge branch 'fix-advanced-settings-spacing'
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/src/renderer/components/AdvancedSettings.tsx | 14 | ||||
| -rw-r--r-- | gui/src/renderer/components/AdvancedSettingsStyles.tsx | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/gui/src/renderer/components/AdvancedSettings.tsx b/gui/src/renderer/components/AdvancedSettings.tsx index 2614379781..77c815fe61 100644 --- a/gui/src/renderer/components/AdvancedSettings.tsx +++ b/gui/src/renderer/components/AdvancedSettings.tsx @@ -22,7 +22,7 @@ import { StyledSelectorForFooter, StyledTunnelProtocolContainer, StyledCustomDnsSwitchContainer, - StyledCustomDnsFotter, + StyledCustomDnsFooter, StyledAddCustomDnsLabel, StyledAddCustomDnsButton, StyledBetaLabel, @@ -441,8 +441,8 @@ export default class AdvancedSettings extends React.Component<IProps, IState> { </Cell.CellButton> </StyledButtonCellGroup> - <StyledButtonCellGroup> - {(window.platform === 'linux' || window.platform === 'win32') && ( + {(window.platform === 'linux' || window.platform === 'win32') && ( + <StyledButtonCellGroup> <Cell.CellButton onClick={this.props.onViewSplitTunneling}> <Cell.Label> {window.platform === 'win32' && <StyledBetaLabel />} @@ -450,8 +450,8 @@ export default class AdvancedSettings extends React.Component<IProps, IState> { </Cell.Label> <Cell.Icon height={12} width={7} source="icon-chevron" /> </Cell.CellButton> - )} - </StyledButtonCellGroup> + </StyledButtonCellGroup> + )} <StyledCustomDnsSwitchContainer disabled={!this.customDnsAvailable()}> <AriaInputGroup> @@ -509,7 +509,7 @@ export default class AdvancedSettings extends React.Component<IProps, IState> { </StyledAddCustomDnsButton> </Accordion> - <StyledCustomDnsFotter> + <StyledCustomDnsFooter> <Cell.FooterText> {this.customDnsAvailable() ? ( messages.pgettext( @@ -520,7 +520,7 @@ export default class AdvancedSettings extends React.Component<IProps, IState> { <CustomDnsDisabledMessage /> )} </Cell.FooterText> - </StyledCustomDnsFotter> + </StyledCustomDnsFooter> </StyledNavigationScrollbars> </NavigationContainer> </StyledContainer> diff --git a/gui/src/renderer/components/AdvancedSettingsStyles.tsx b/gui/src/renderer/components/AdvancedSettingsStyles.tsx index 56c8b99a9c..7190a166b7 100644 --- a/gui/src/renderer/components/AdvancedSettingsStyles.tsx +++ b/gui/src/renderer/components/AdvancedSettingsStyles.tsx @@ -50,7 +50,7 @@ export const StyledCustomDnsSwitchContainer = styled(Cell.Container)({ marginBottom: '1px', }); -export const StyledCustomDnsFotter = styled(Cell.Footer)({ +export const StyledCustomDnsFooter = styled(Cell.Footer)({ marginBottom: '2px', }); |