diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2022-09-29 10:34:24 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2022-10-03 17:20:55 +0200 |
| commit | 79bc3f97d268b0e291185b9049cce2549a1d4aa7 (patch) | |
| tree | cc46cc2dab182df14a3d5415fc8012555faca9cc /gui/src | |
| parent | 0de26f99d28145bb46b170e2099c7289645a4d24 (diff) | |
| download | mullvadvpn-79bc3f97d268b0e291185b9049cce2549a1d4aa7.tar.xz mullvadvpn-79bc3f97d268b0e291185b9049cce2549a1d4aa7.zip | |
Rename Footer to CellFooter
Diffstat (limited to 'gui/src')
| -rw-r--r-- | gui/src/renderer/components/CustomDnsSettings.tsx | 4 | ||||
| -rw-r--r-- | gui/src/renderer/components/CustomDnsSettingsStyles.tsx | 2 | ||||
| -rw-r--r-- | gui/src/renderer/components/OpenVpnSettings.tsx | 24 | ||||
| -rw-r--r-- | gui/src/renderer/components/Settings.tsx | 6 | ||||
| -rw-r--r-- | gui/src/renderer/components/SplitTunnelingSettingsStyles.tsx | 4 | ||||
| -rw-r--r-- | gui/src/renderer/components/Support.tsx | 8 | ||||
| -rw-r--r-- | gui/src/renderer/components/UserInterfaceSettings.tsx | 32 | ||||
| -rw-r--r-- | gui/src/renderer/components/VpnSettings.tsx | 32 | ||||
| -rw-r--r-- | gui/src/renderer/components/WireguardSettings.tsx | 32 | ||||
| -rw-r--r-- | gui/src/renderer/components/cell/Footer.tsx | 6 |
10 files changed, 75 insertions, 75 deletions
diff --git a/gui/src/renderer/components/CustomDnsSettings.tsx b/gui/src/renderer/components/CustomDnsSettings.tsx index 4fb785d686..97a3f10818 100644 --- a/gui/src/renderer/components/CustomDnsSettings.tsx +++ b/gui/src/renderer/components/CustomDnsSettings.tsx @@ -283,7 +283,7 @@ export default function CustomDnsSettings() { </Accordion> <StyledCustomDnsFooter> - <Cell.FooterText> + <Cell.CellFooterText> {featureAvailable ? messages.pgettext('vpn-settings-view', 'Enable to add at least one DNS server.') : // This line makes sure that the next one isn't prefixed by the color. @@ -296,7 +296,7 @@ export default function CustomDnsSettings() { 'vpn-settings-view', 'Disable all content blockers to activate this setting.', )} - </Cell.FooterText> + </Cell.CellFooterText> </StyledCustomDnsFooter> <ConfirmationDialog diff --git a/gui/src/renderer/components/CustomDnsSettingsStyles.tsx b/gui/src/renderer/components/CustomDnsSettingsStyles.tsx index 9d927ba52d..b660504a01 100644 --- a/gui/src/renderer/components/CustomDnsSettingsStyles.tsx +++ b/gui/src/renderer/components/CustomDnsSettingsStyles.tsx @@ -4,7 +4,7 @@ import { colors } from '../../config.json'; import * as Cell from './cell'; import ImageView from './ImageView'; -export const StyledCustomDnsFooter = styled(Cell.Footer)({ +export const StyledCustomDnsFooter = styled(Cell.CellFooter)({ marginBottom: '2px', }); diff --git a/gui/src/renderer/components/OpenVpnSettings.tsx b/gui/src/renderer/components/OpenVpnSettings.tsx index af4404fd1a..69a570c356 100644 --- a/gui/src/renderer/components/OpenVpnSettings.tsx +++ b/gui/src/renderer/components/OpenVpnSettings.tsx @@ -156,9 +156,9 @@ function TransportProtocolSelector() { automaticValue={null} /> {bridgeState === 'on' && ( - <Cell.Footer> + <Cell.CellFooter> <AriaDescription> - <Cell.FooterText> + <Cell.CellFooterText> {formatMarkdown( // TRANSLATORS: This is used to instruct users how to make UDP mode // TRANSLATORS: available. @@ -167,9 +167,9 @@ function TransportProtocolSelector() { 'To activate UDP, change **Bridge mode** to **Automatic** or **Off**.', ), )} - </Cell.FooterText> + </Cell.CellFooterText> </AriaDescription> - </Cell.Footer> + </Cell.CellFooter> )} </AriaInputGroup> </StyledSelectorContainer> @@ -340,13 +340,13 @@ function BridgeModeSelector() { automaticValue={'auto' as const} /> </StyledSelectorContainer> - <Cell.Footer> + <Cell.CellFooter> <AriaDescription> - <Cell.FooterText> + <Cell.CellFooterText> {bridgeModeFooterText(tunnelProtocol, transportProtocol)} - </Cell.FooterText> + </Cell.CellFooterText> </AriaDescription> - </Cell.Footer> + </Cell.CellFooter> </AriaInputGroup> <ModalAlert isOpen={confirmationDialogVisible} @@ -476,9 +476,9 @@ function MssFixSetting() { /> </AriaInput> </Cell.Container> - <Cell.Footer> + <Cell.CellFooter> <AriaDescription> - <Cell.FooterText> + <Cell.CellFooterText> {sprintf( // TRANSLATORS: The hint displayed below the Mssfix input field. // TRANSLATORS: Available placeholders: @@ -495,9 +495,9 @@ function MssFixSetting() { max: MAX_MSSFIX_VALUE, }, )} - </Cell.FooterText> + </Cell.CellFooterText> </AriaDescription> - </Cell.Footer> + </Cell.CellFooter> </AriaInputGroup> ); } diff --git a/gui/src/renderer/components/Settings.tsx b/gui/src/renderer/components/Settings.tsx index 985c013a48..69d4e2b80a 100644 --- a/gui/src/renderer/components/Settings.tsx +++ b/gui/src/renderer/components/Settings.tsx @@ -198,9 +198,9 @@ function AppVersionButton() { icon = <StyledCellIcon source="icon-alert" width={18} tintColor={colors.red} />; footer = ( - <Cell.Footer> - <Cell.FooterText>{message}</Cell.FooterText> - </Cell.Footer> + <Cell.CellFooter> + <Cell.CellFooterText>{message}</Cell.CellFooterText> + </Cell.CellFooter> ); } diff --git a/gui/src/renderer/components/SplitTunnelingSettingsStyles.tsx b/gui/src/renderer/components/SplitTunnelingSettingsStyles.tsx index dadb3404e5..6b135486db 100644 --- a/gui/src/renderer/components/SplitTunnelingSettingsStyles.tsx +++ b/gui/src/renderer/components/SplitTunnelingSettingsStyles.tsx @@ -145,14 +145,14 @@ export const StyledClearIcon = styled(ImageView)({ }, }); -export const StyledNoResult = styled(Cell.Footer)({ +export const StyledNoResult = styled(Cell.CellFooter)({ display: 'flex', flexDirection: 'column', paddingTop: 0, marginTop: 0, }); -export const StyledNoResultText = styled(Cell.FooterText)({ +export const StyledNoResultText = styled(Cell.CellFooterText)({ textAlign: 'center', }); diff --git a/gui/src/renderer/components/Support.tsx b/gui/src/renderer/components/Support.tsx index 0579b1d944..2785883ecf 100644 --- a/gui/src/renderer/components/Support.tsx +++ b/gui/src/renderer/components/Support.tsx @@ -135,9 +135,9 @@ function BetaProgramSetting() { <Cell.Switch isOn={showBetaReleases} onChange={setShowBetaReleases} /> </AriaInput> </Cell.Container> - <Cell.Footer> + <Cell.CellFooter> <AriaDescription> - <Cell.FooterText> + <Cell.CellFooterText> {isBeta ? messages.pgettext( 'support-view', @@ -147,9 +147,9 @@ function BetaProgramSetting() { 'support-view', 'Enable to get notified when new beta versions of the app are released.', )} - </Cell.FooterText> + </Cell.CellFooterText> </AriaDescription> - </Cell.Footer> + </Cell.CellFooter> </AriaInputGroup> ); } diff --git a/gui/src/renderer/components/UserInterfaceSettings.tsx b/gui/src/renderer/components/UserInterfaceSettings.tsx index 745ac715fb..315c3ad06c 100644 --- a/gui/src/renderer/components/UserInterfaceSettings.tsx +++ b/gui/src/renderer/components/UserInterfaceSettings.tsx @@ -108,16 +108,16 @@ function NotificationsSetting() { <Cell.Switch isOn={enableSystemNotifications} onChange={setEnableSystemNotifications} /> </AriaInput> </Cell.Container> - <Cell.Footer> + <Cell.CellFooter> <AriaDescription> - <Cell.FooterText> + <Cell.CellFooterText> {messages.pgettext( 'user-interface-settings-view', 'Enable or disable system notifications. The critical notifications will always be displayed.', )} - </Cell.FooterText> + </Cell.CellFooterText> </AriaDescription> - </Cell.Footer> + </Cell.CellFooter> </AriaInputGroup> ); } @@ -138,16 +138,16 @@ function MonochromaticTrayIconSetting() { <Cell.Switch isOn={monochromaticIcon} onChange={setMonochromaticIcon} /> </AriaInput> </Cell.Container> - <Cell.Footer> + <Cell.CellFooter> <AriaDescription> - <Cell.FooterText> + <Cell.CellFooterText> {messages.pgettext( 'user-interface-settings-view', 'Use a monochromatic tray icon instead of a colored one.', )} - </Cell.FooterText> + </Cell.CellFooterText> </AriaDescription> - </Cell.Footer> + </Cell.CellFooter> </AriaInputGroup> ); } @@ -168,16 +168,16 @@ function UnpinnedWindowSetting() { <Cell.Switch isOn={unpinnedWindow} onChange={setUnpinnedWindow} /> </AriaInput> </Cell.Container> - <Cell.Footer> + <Cell.CellFooter> <AriaDescription> - <Cell.FooterText> + <Cell.CellFooterText> {messages.pgettext( 'user-interface-settings-view', 'Enable to move the app around as a free-standing window.', )} - </Cell.FooterText> + </Cell.CellFooterText> </AriaDescription> - </Cell.Footer> + </Cell.CellFooter> </AriaInputGroup> ); } @@ -198,16 +198,16 @@ function StartMinimizedSetting() { <Cell.Switch isOn={startMinimized} onChange={setStartMinimized} /> </AriaInput> </Cell.Container> - <Cell.Footer> + <Cell.CellFooter> <AriaDescription> - <Cell.FooterText> + <Cell.CellFooterText> {messages.pgettext( 'user-interface-settings-view', 'Show only the tray icon when the app starts.', )} - </Cell.FooterText> + </Cell.CellFooterText> </AriaDescription> - </Cell.Footer> + </Cell.CellFooter> </AriaInputGroup> ); } diff --git a/gui/src/renderer/components/VpnSettings.tsx b/gui/src/renderer/components/VpnSettings.tsx index 76d8a782b6..f42c07e4d2 100644 --- a/gui/src/renderer/components/VpnSettings.tsx +++ b/gui/src/renderer/components/VpnSettings.tsx @@ -167,16 +167,16 @@ function AutoConnect() { <Cell.Switch isOn={autoConnect} onChange={setAutoConnect} /> </AriaInput> </Cell.Container> - <Cell.Footer> + <Cell.CellFooter> <AriaDescription> - <Cell.FooterText> + <Cell.CellFooterText> {messages.pgettext( 'vpn-settings-view', 'Automatically connect to a server when the app launches.', )} - </Cell.FooterText> + </Cell.CellFooterText> </AriaDescription> - </Cell.Footer> + </Cell.CellFooter> </AriaInputGroup> ); } @@ -197,16 +197,16 @@ function AllowLan() { <Cell.Switch isOn={allowLan} onChange={setAllowLan} /> </AriaInput> </Cell.Container> - <Cell.Footer> + <Cell.CellFooter> <AriaDescription> - <Cell.FooterText> + <Cell.CellFooterText> {messages.pgettext( 'vpn-settings-view', 'Allows access to other devices on the same network for sharing, printing etc.', )} - </Cell.FooterText> + </Cell.CellFooterText> </AriaDescription> - </Cell.Footer> + </Cell.CellFooter> </AriaInputGroup> ); } @@ -417,13 +417,13 @@ function CustomDnsEnabledFooter() { ); return ( - <Cell.Footer> + <Cell.CellFooter> <AriaDescription> - <Cell.FooterText> + <Cell.CellFooterText> {formatMarkdown(sprintf(blockingDisabledText, { customDnsFeatureName }))} - </Cell.FooterText> + </Cell.CellFooterText> </AriaDescription> - </Cell.Footer> + </Cell.CellFooter> ); } @@ -453,16 +453,16 @@ function EnableIpv6() { <Cell.Switch isOn={enableIpv6} onChange={setEnableIpv6} /> </AriaInput> </Cell.Container> - <Cell.Footer> + <Cell.CellFooter> <AriaDescription> - <Cell.FooterText> + <Cell.CellFooterText> {messages.pgettext( 'vpn-settings-view', 'Enable IPv6 communication through the tunnel.', )} - </Cell.FooterText> + </Cell.CellFooterText> </AriaDescription> - </Cell.Footer> + </Cell.CellFooter> </AriaInputGroup> ); } diff --git a/gui/src/renderer/components/WireguardSettings.tsx b/gui/src/renderer/components/WireguardSettings.tsx index 9a422cc18e..19afad9928 100644 --- a/gui/src/renderer/components/WireguardSettings.tsx +++ b/gui/src/renderer/components/WireguardSettings.tsx @@ -214,9 +214,9 @@ function PortSelector() { } /> </StyledSelectorContainer> - <Cell.Footer> + <Cell.CellFooter> <AriaDescription> - <Cell.FooterText> + <Cell.CellFooterText> { // TRANSLATORS: The hint displayed below the WireGuard port selector. messages.pgettext( @@ -224,9 +224,9 @@ function PortSelector() { 'The automatic setting will randomly choose from a wide range of ports.', ) } - </Cell.FooterText> + </Cell.CellFooterText> </AriaDescription> - </Cell.Footer> + </Cell.CellFooter> </AriaInputGroup> ); } @@ -389,9 +389,9 @@ function MultihopSetting() { <Cell.Switch isOn={multihop} onChange={setMultihop} /> </AriaInput> </Cell.Container> - <Cell.Footer> + <Cell.CellFooter> <AriaDescription> - <Cell.FooterText> + <Cell.CellFooterText> {sprintf( // TRANSLATORS: Description for multihop settings toggle. // TRANSLATORS: Available placeholders: @@ -402,9 +402,9 @@ function MultihopSetting() { ), { wireguard: strings.wireguard }, )} - </Cell.FooterText> + </Cell.CellFooterText> </AriaDescription> - </Cell.Footer> + </Cell.CellFooter> </AriaInputGroup> <ModalAlert isOpen={confirmationDialogVisible} @@ -482,9 +482,9 @@ function IpVersionSetting() { automaticValue={null} /> </StyledSelectorContainer> - <Cell.Footer> + <Cell.CellFooter> <AriaDescription> - <Cell.FooterText> + <Cell.CellFooterText> {sprintf( // TRANSLATORS: The hint displayed below the WireGuard IP version selector. // TRANSLATORS: Available placeholders: @@ -495,9 +495,9 @@ function IpVersionSetting() { ), { wireguard: strings.wireguard }, )} - </Cell.FooterText> + </Cell.CellFooterText> </AriaDescription> - </Cell.Footer> + </Cell.CellFooter> </AriaInputGroup> ); } @@ -555,9 +555,9 @@ function MtuSetting() { /> </AriaInput> </Cell.Container> - <Cell.Footer> + <Cell.CellFooter> <AriaDescription> - <Cell.FooterText> + <Cell.CellFooterText> {sprintf( // TRANSLATORS: The hint displayed below the WireGuard MTU input field. // TRANSLATORS: Available placeholders: @@ -574,9 +574,9 @@ function MtuSetting() { max: MAX_WIREGUARD_MTU_VALUE, }, )} - </Cell.FooterText> + </Cell.CellFooterText> </AriaDescription> - </Cell.Footer> + </Cell.CellFooter> </AriaInputGroup> ); } diff --git a/gui/src/renderer/components/cell/Footer.tsx b/gui/src/renderer/components/cell/Footer.tsx index abd0f24d9c..86487c676c 100644 --- a/gui/src/renderer/components/cell/Footer.tsx +++ b/gui/src/renderer/components/cell/Footer.tsx @@ -3,14 +3,14 @@ import styled from 'styled-components'; import { colors } from '../../../config.json'; import { measurements, tinyText } from '../common-styles'; -export const Footer = styled.div({ +export const CellFooter = styled.div({ padding: `6px ${measurements.viewMargin} 0px`, }); -export const FooterText = styled.span(tinyText, { +export const CellFooterText = styled.span(tinyText, { color: colors.white60, }); -export const FooterBoldText = styled(FooterText)({ +export const CellFooterBoldText = styled(CellFooterText)({ fontWeight: 900, }); |
