diff options
| author | Oliver <oliver@mohlin.dev> | 2025-04-29 16:24:29 +0200 |
|---|---|---|
| committer | Tobias Järvelöv <tobias.jarvelov@mullvad.net> | 2025-05-19 14:28:48 +0200 |
| commit | a4b54bc7722a910a475919f873fdb1fdc34fedc0 (patch) | |
| tree | d5c18fd37a79390f5d07c08bd062b9118f4b37d8 | |
| parent | fc7fca98846950dbe33771f8fb98ad5aa3c772d0 (diff) | |
| download | mullvadvpn-a4b54bc7722a910a475919f873fdb1fdc34fedc0.tar.xz mullvadvpn-a4b54bc7722a910a475919f873fdb1fdc34fedc0.zip | |
Use new colors in settings import view
| -rw-r--r-- | desktop/packages/mullvad-vpn/src/renderer/components/SettingsImport.tsx | 16 | ||||
| -rw-r--r-- | desktop/packages/mullvad-vpn/src/renderer/components/SettingsTextImport.tsx | 4 |
2 files changed, 9 insertions, 11 deletions
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/SettingsImport.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/SettingsImport.tsx index c94c86cafb..bbf8f0f74c 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/SettingsImport.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/SettingsImport.tsx @@ -6,8 +6,8 @@ import { messages } from '../../shared/gettext'; import { useScheduler } from '../../shared/scheduler'; import { useAppContext } from '../context'; import useActions from '../lib/actionsHook'; -import { Button, Flex, Icon, IconProps } from '../lib/components'; -import { DeprecatedColors, spacings } from '../lib/foundations'; +import { Button, Flex, Icon, IconProps, LabelTiny } from '../lib/components'; +import { colors, spacings } from '../lib/foundations'; import { TransitionType, useHistory } from '../lib/history'; import { RoutePath } from '../lib/routes'; import { useBoolean, useEffectEvent } from '../lib/utility-hooks'; @@ -15,7 +15,7 @@ import settingsImportActions from '../redux/settings-import/actions'; import { useSelector } from '../redux/store'; import { AppNavigationHeader } from './'; import { ButtonGroup } from './ButtonGroup'; -import { measurements, normalText, tinyText } from './common-styles'; +import { measurements, normalText } from './common-styles'; import { BackAction } from './KeyboardNavigation'; import { Footer, Layout, SettingsContainer } from './Layout'; import { ModalAlert, ModalAlertType } from './Modal'; @@ -203,14 +203,10 @@ const StyledStatusTitle = styled.div(normalText, { alignItems: 'center', fontWeight: 'bold', lineHeight: '20px', - color: DeprecatedColors.white, + color: colors.white100, gap: spacings.tiny, }); -const StyledStatusSubTitle = styled.div(tinyText, { - color: DeprecatedColors.white60, -}); - interface ImportStatusProps { status?: ImportStatus; } @@ -277,7 +273,9 @@ function SettingsImportStatus(props: ImportStatusProps) { {iconProps !== undefined && <Icon {...iconProps} size="medium" />} </StyledStatusTitle> {subtitle !== undefined && ( - <StyledStatusSubTitle data-testid="status-subtitle">{subtitle}</StyledStatusSubTitle> + <LabelTiny data-testid="status-subtitle" color="white60"> + {subtitle} + </LabelTiny> )} </StyledStatusContainer> ); diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/SettingsTextImport.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/SettingsTextImport.tsx index 85213109df..222471c5e5 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/SettingsTextImport.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/SettingsTextImport.tsx @@ -4,7 +4,7 @@ import styled from 'styled-components'; import { messages } from '../../shared/gettext'; import useActions from '../lib/actionsHook'; import { IconButton } from '../lib/components'; -import { DeprecatedColors } from '../lib/foundations'; +import { colors } from '../lib/foundations'; import { useHistory } from '../lib/history'; import { useCombinedRefs, useRefCallback, useStyledRef } from '../lib/utility-hooks'; import settingsImportActions from '../redux/settings-import/actions'; @@ -17,7 +17,7 @@ const StyledTextArea = styled.textarea({ width: '100%', flex: 1, padding: '13px', - color: DeprecatedColors.blue, + color: colors.brandBlue, }); export default function SettingsTextImport() { |
