summaryrefslogtreecommitdiffhomepage
path: root/gui/src
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2021-08-25 14:47:48 +0200
committerOskar Nyberg <oskar@mullvad.net>2021-08-25 14:47:48 +0200
commit7505444a2b34e76231a37f1278695860e033a3ef (patch)
tree82d56970d8957cfa47da0856fd5c4a84ee314aa9 /gui/src
parentef901c6bf5ce1bddc688caa02667fb52cf5a43ca (diff)
downloadmullvadvpn-7505444a2b34e76231a37f1278695860e033a3ef.tar.xz
mullvadvpn-7505444a2b34e76231a37f1278695860e033a3ef.zip
Remove beta label for split tunneling on Windows
Diffstat (limited to 'gui/src')
-rw-r--r--gui/src/renderer/components/AdvancedSettings.tsx2
-rw-r--r--gui/src/renderer/components/AdvancedSettingsStyles.tsx6
-rw-r--r--gui/src/renderer/components/SplitTunnelingSettings.tsx6
-rw-r--r--gui/src/renderer/components/SplitTunnelingSettingsStyles.tsx6
4 files changed, 1 insertions, 19 deletions
diff --git a/gui/src/renderer/components/AdvancedSettings.tsx b/gui/src/renderer/components/AdvancedSettings.tsx
index 4cd2a567d0..dce018d02a 100644
--- a/gui/src/renderer/components/AdvancedSettings.tsx
+++ b/gui/src/renderer/components/AdvancedSettings.tsx
@@ -15,7 +15,6 @@ import {
StyledCustomDnsFooter,
StyledAddCustomDnsLabel,
StyledAddCustomDnsButton,
- StyledBetaLabel,
} from './AdvancedSettingsStyles';
import * as AppButton from './AppButton';
import { AriaDescription, AriaInput, AriaInputGroup, AriaLabel } from './AriaGroup';
@@ -160,7 +159,6 @@ export default class AdvancedSettings extends React.Component<IProps, IState> {
<Cell.CellButtonGroup>
<Cell.CellButton onClick={this.props.onViewSplitTunneling}>
<Cell.Label>
- {window.env.platform === 'win32' && <StyledBetaLabel />}
{messages.pgettext('advanced-settings-view', 'Split tunneling')}
</Cell.Label>
<Cell.Icon height={12} width={7} source="icon-chevron" />
diff --git a/gui/src/renderer/components/AdvancedSettingsStyles.tsx b/gui/src/renderer/components/AdvancedSettingsStyles.tsx
index 4fc08160c2..cb4ffe3425 100644
--- a/gui/src/renderer/components/AdvancedSettingsStyles.tsx
+++ b/gui/src/renderer/components/AdvancedSettingsStyles.tsx
@@ -1,6 +1,5 @@
import styled from 'styled-components';
import { colors } from '../../config.json';
-import BetaLabel from './BetaLabel';
import * as Cell from './cell';
import { NavigationScrollbars } from './NavigationBar';
import Selector from './cell/Selector';
@@ -59,8 +58,3 @@ export const StyledAddCustomDnsLabel = styled(Cell.Label)(
marginRight: '25px',
}),
);
-
-export const StyledBetaLabel = styled(BetaLabel)({
- marginRight: '8px',
- verticalAlign: 'bottom',
-});
diff --git a/gui/src/renderer/components/SplitTunnelingSettings.tsx b/gui/src/renderer/components/SplitTunnelingSettings.tsx
index 1b41a6683d..e60cfb243e 100644
--- a/gui/src/renderer/components/SplitTunnelingSettings.tsx
+++ b/gui/src/renderer/components/SplitTunnelingSettings.tsx
@@ -45,7 +45,6 @@ import {
StyledNoResult,
StyledNoResultSearchTerm,
StyledDisabledWarning,
- StyledBetaLabel,
} from './SplitTunnelingSettingsStyles';
export default function SplitTunneling() {
@@ -398,10 +397,7 @@ export function WindowsSplitTunnelingSettings(props: IPlatformSplitTunnelingSett
return (
<>
<SettingsHeader>
- <HeaderTitle>
- {messages.pgettext('split-tunneling-view', 'Split tunneling')}
- <StyledBetaLabel />
- </HeaderTitle>
+ <HeaderTitle>{messages.pgettext('split-tunneling-view', 'Split tunneling')}</HeaderTitle>
<HeaderSubTitle>
{messages.pgettext(
'split-tunneling-view',
diff --git a/gui/src/renderer/components/SplitTunnelingSettingsStyles.tsx b/gui/src/renderer/components/SplitTunnelingSettingsStyles.tsx
index 45079090f9..ca7b7954ec 100644
--- a/gui/src/renderer/components/SplitTunnelingSettingsStyles.tsx
+++ b/gui/src/renderer/components/SplitTunnelingSettingsStyles.tsx
@@ -1,7 +1,6 @@
import styled from 'styled-components';
import { colors } from '../../config.json';
import * as AppButton from './AppButton';
-import BetaLabel from './BetaLabel';
import * as Cell from './cell';
import { mediumText, smallText } from './common-styles';
import ImageView from './ImageView';
@@ -163,8 +162,3 @@ export const StyledDisabledWarning = styled.span(smallText, {
margin: '0 22px 18px',
color: colors.red,
});
-
-export const StyledBetaLabel = styled(BetaLabel)({
- marginLeft: '8px',
- verticalAlign: 'middle',
-});