summaryrefslogtreecommitdiffhomepage
path: root/gui/src/renderer
diff options
context:
space:
mode:
Diffstat (limited to 'gui/src/renderer')
-rw-r--r--gui/src/renderer/components/Account.tsx7
-rw-r--r--gui/src/renderer/components/AdvancedSettings.tsx7
-rw-r--r--gui/src/renderer/components/FilterByProvider.tsx7
-rw-r--r--gui/src/renderer/components/NavigationBar.tsx3
-rw-r--r--gui/src/renderer/components/NavigationBarStyles.tsx11
-rw-r--r--gui/src/renderer/components/OpenVPNSettings.tsx7
-rw-r--r--gui/src/renderer/components/Preferences.tsx7
-rw-r--r--gui/src/renderer/components/SelectLanguage.tsx7
-rw-r--r--gui/src/renderer/components/SplitTunnelingSettings.tsx7
-rw-r--r--gui/src/renderer/components/Support.tsx7
-rw-r--r--gui/src/renderer/components/WireguardKeys.tsx7
-rw-r--r--gui/src/renderer/components/WireguardSettings.tsx7
12 files changed, 11 insertions, 73 deletions
diff --git a/gui/src/renderer/components/Account.tsx b/gui/src/renderer/components/Account.tsx
index 86a70db271..69dd014caf 100644
--- a/gui/src/renderer/components/Account.tsx
+++ b/gui/src/renderer/components/Account.tsx
@@ -44,12 +44,7 @@ export default class Account extends React.Component<IProps> {
<StyledContainer>
<NavigationBar>
<NavigationItems>
- <BackBarItem action={this.props.onClose}>
- {
- // TRANSLATORS: Back button in navigation bar
- messages.pgettext('navigation-bar', 'Settings')
- }
- </BackBarItem>
+ <BackBarItem action={this.props.onClose} />
<TitleBarItem>
{
// TRANSLATORS: Title label in navigation bar
diff --git a/gui/src/renderer/components/AdvancedSettings.tsx b/gui/src/renderer/components/AdvancedSettings.tsx
index 084459b79c..7d873ffca5 100644
--- a/gui/src/renderer/components/AdvancedSettings.tsx
+++ b/gui/src/renderer/components/AdvancedSettings.tsx
@@ -63,12 +63,7 @@ export default class AdvancedSettings extends React.Component<IProps, IState> {
<NavigationContainer>
<NavigationBar>
<NavigationItems>
- <BackBarItem action={this.props.onClose}>
- {
- // TRANSLATORS: Back button in navigation bar
- messages.pgettext('navigation-bar', 'Settings')
- }
- </BackBarItem>
+ <BackBarItem action={this.props.onClose} />
<TitleBarItem>
{
// TRANSLATORS: Title label in navigation bar
diff --git a/gui/src/renderer/components/FilterByProvider.tsx b/gui/src/renderer/components/FilterByProvider.tsx
index 53f7d77bea..cf5789ab65 100644
--- a/gui/src/renderer/components/FilterByProvider.tsx
+++ b/gui/src/renderer/components/FilterByProvider.tsx
@@ -111,12 +111,7 @@ export default function FilterByProvider() {
<NavigationContainer>
<NavigationBar alwaysDisplayBarTitle={true}>
<NavigationItems>
- <BackBarItem action={history.pop}>
- {
- // TRANSLATORS: Back button in navigation bar
- messages.pgettext('filter-by-provider-nav', 'Select location')
- }
- </BackBarItem>
+ <BackBarItem action={history.pop} />
<TitleBarItem>
{
// TRANSLATORS: Title label in navigation bar
diff --git a/gui/src/renderer/components/NavigationBar.tsx b/gui/src/renderer/components/NavigationBar.tsx
index e02ae99387..1e7c1da8e3 100644
--- a/gui/src/renderer/components/NavigationBar.tsx
+++ b/gui/src/renderer/components/NavigationBar.tsx
@@ -10,7 +10,6 @@ import CustomScrollbars, { CustomScrollbarsRef, IScrollEvent } from './CustomScr
import {
StyledBackBarItemButton,
StyledBackBarItemIcon,
- StyledBackBarItemLabel,
StyledCloseBarItemButton,
StyledCloseBarItemIcon,
StyledNavigationBar,
@@ -208,7 +207,6 @@ export function CloseBarItem(props: ICloseBarItemProps) {
}
interface IBackBarItemProps {
- children?: React.ReactText;
action: () => void;
}
@@ -216,7 +214,6 @@ export function BackBarItem(props: IBackBarItemProps) {
return (
<StyledBackBarItemButton onClick={props.action}>
<StyledBackBarItemIcon source="icon-back" tintColor={colors.white40} />
- <StyledBackBarItemLabel>{props.children}</StyledBackBarItemLabel>
</StyledBackBarItemButton>
);
}
diff --git a/gui/src/renderer/components/NavigationBarStyles.tsx b/gui/src/renderer/components/NavigationBarStyles.tsx
index db042405c3..2edf4c25ca 100644
--- a/gui/src/renderer/components/NavigationBarStyles.tsx
+++ b/gui/src/renderer/components/NavigationBarStyles.tsx
@@ -1,6 +1,6 @@
import styled from 'styled-components';
import { colors } from '../../config.json';
-import { normalText, tinyText } from './common-styles';
+import { normalText } from './common-styles';
import ImageView from './ImageView';
export const StyledNavigationBarSeparator = styled.div({
@@ -68,12 +68,3 @@ export const StyledBackBarItemIcon = styled(ImageView)({
backgroundColor: colors.white60,
},
});
-
-export const StyledBackBarItemLabel = styled.span(tinyText, {
- fontWeight: 400,
- color: colors.white60,
- whiteSpace: 'nowrap',
- [StyledBackBarItemButton + ':hover &']: {
- color: colors.white80,
- },
-});
diff --git a/gui/src/renderer/components/OpenVPNSettings.tsx b/gui/src/renderer/components/OpenVPNSettings.tsx
index 480180eb67..b554eb2372 100644
--- a/gui/src/renderer/components/OpenVPNSettings.tsx
+++ b/gui/src/renderer/components/OpenVPNSettings.tsx
@@ -91,12 +91,7 @@ export default class OpenVpnSettings extends React.Component<IProps, IState> {
<NavigationContainer>
<NavigationBar>
<NavigationItems>
- <BackBarItem action={this.props.onClose}>
- {
- // TRANSLATORS: Back button in navigation bar
- messages.pgettext('navigation-bar', 'Advanced')
- }
- </BackBarItem>
+ <BackBarItem action={this.props.onClose} />
<TitleBarItem>
{
// TRANSLATORS: Title label in navigation bar
diff --git a/gui/src/renderer/components/Preferences.tsx b/gui/src/renderer/components/Preferences.tsx
index db3813a005..f1c349c664 100644
--- a/gui/src/renderer/components/Preferences.tsx
+++ b/gui/src/renderer/components/Preferences.tsx
@@ -58,12 +58,7 @@ export default class Preferences extends React.Component<IProps, IState> {
<NavigationContainer>
<NavigationBar>
<NavigationItems>
- <BackBarItem action={this.props.onClose}>
- {
- // TRANSLATORS: Back button in navigation bar
- messages.pgettext('navigation-bar', 'Settings')
- }
- </BackBarItem>
+ <BackBarItem action={this.props.onClose} />
<TitleBarItem>
{
// TRANSLATORS: Title label in navigation bar
diff --git a/gui/src/renderer/components/SelectLanguage.tsx b/gui/src/renderer/components/SelectLanguage.tsx
index 38d20b09e3..d6ef71ef61 100644
--- a/gui/src/renderer/components/SelectLanguage.tsx
+++ b/gui/src/renderer/components/SelectLanguage.tsx
@@ -64,12 +64,7 @@ export default class SelectLanguage extends React.Component<IProps, IState> {
<NavigationContainer>
<NavigationBar>
<NavigationItems>
- <BackBarItem action={this.props.onClose}>
- {
- // TRANSLATORS: Back button in navigation bar
- messages.pgettext('navigation-bar', 'Settings')
- }
- </BackBarItem>
+ <BackBarItem action={this.props.onClose} />
<TitleBarItem>
{
// TRANSLATORS: Title label in navigation bar
diff --git a/gui/src/renderer/components/SplitTunnelingSettings.tsx b/gui/src/renderer/components/SplitTunnelingSettings.tsx
index aff86a3f79..8f173cab2f 100644
--- a/gui/src/renderer/components/SplitTunnelingSettings.tsx
+++ b/gui/src/renderer/components/SplitTunnelingSettings.tsx
@@ -64,12 +64,7 @@ export default function SplitTunneling() {
<NavigationContainer>
<NavigationBar>
<NavigationItems>
- <BackBarItem action={pop}>
- {
- // TRANSLATORS: Back button in navigation bar
- messages.pgettext('navigation-bar', 'Advanced')
- }
- </BackBarItem>
+ <BackBarItem action={pop} />
<TitleBarItem>
{
// TRANSLATORS: Title label in navigation bar
diff --git a/gui/src/renderer/components/Support.tsx b/gui/src/renderer/components/Support.tsx
index eaea64d789..16070a1531 100644
--- a/gui/src/renderer/components/Support.tsx
+++ b/gui/src/renderer/components/Support.tsx
@@ -154,12 +154,7 @@ export default class Support extends React.Component<ISupportProps, ISupportStat
<StyledContainer>
<NavigationBar>
<NavigationItems>
- <BackBarItem action={this.props.onClose}>
- {
- // TRANSLATORS: Back button in navigation bar
- messages.pgettext('navigation-bar', 'Settings')
- }
- </BackBarItem>
+ <BackBarItem action={this.props.onClose} />
<TitleBarItem>
{
// TRANSLATORS: Title label in navigation bar
diff --git a/gui/src/renderer/components/WireguardKeys.tsx b/gui/src/renderer/components/WireguardKeys.tsx
index be8c043458..f1defec20a 100644
--- a/gui/src/renderer/components/WireguardKeys.tsx
+++ b/gui/src/renderer/components/WireguardKeys.tsx
@@ -100,12 +100,7 @@ export default class WireguardKeys extends React.Component<IProps, IState> {
<NavigationContainer>
<NavigationBar>
<NavigationItems>
- <BackBarItem action={this.props.onClose}>
- {
- // TRANSLATORS: Back button in navigation bar
- messages.pgettext('wireguard-keys-nav', 'WireGuard settings')
- }
- </BackBarItem>
+ <BackBarItem action={this.props.onClose} />
<TitleBarItem>
{
// TRANSLATORS: Title label in navigation bar
diff --git a/gui/src/renderer/components/WireguardSettings.tsx b/gui/src/renderer/components/WireguardSettings.tsx
index 2159194a74..123f4b3b42 100644
--- a/gui/src/renderer/components/WireguardSettings.tsx
+++ b/gui/src/renderer/components/WireguardSettings.tsx
@@ -102,12 +102,7 @@ export default class WireguardSettings extends React.Component<IProps, IState> {
<NavigationContainer>
<NavigationBar>
<NavigationItems>
- <BackBarItem action={this.props.onClose}>
- {
- // TRANSLATORS: Back button in navigation bar
- messages.pgettext('navigation-bar', 'Advanced')
- }
- </BackBarItem>
+ <BackBarItem action={this.props.onClose} />
<TitleBarItem>
{
// TRANSLATORS: Title label in navigation bar
Copyright © 2025 - 2026 Wayne Cole. WTFPL. Attribution appreciated. No warranty. Not liable for bodily damages.