Remove buttonReset styles from multiple components

3 files changed, 6 insertions, 33 deletions

diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/LoginStyles.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/LoginStyles.tsx
index 883260d474..68824f564c 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/LoginStyles.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/LoginStyles.tsx
@@ -2,8 +2,6 @@ import styled from 'styled-components';
 
 import { Icon } from '../lib/components';
 import { colors, spacings } from '../lib/foundations';
-import { buttonReset } from '../lib/styles';
-import * as Cell from './cell';
 import { hugeText, largeText, measurements, smallText, tinyText } from './common-styles';
 import FormattableTextInput from './FormattableTextInput';
 import { Footer } from './Layout';
@@ -23,7 +21,6 @@ export const StyledAccountDropdownItem = styled.li({
 });
 
 const baseButtonStyles = {
-  ...buttonReset,
   width: '100%',
   height: '100%',
   backgroundColor: colors.whiteAlpha60,
@@ -49,25 +46,6 @@ export const StyledAccountDropdownItemIconButton = styled.button({
   justifyContent: 'center',
 });
 
-export const StyledAccountDropdownTrailingButton = styled.button({
-  ...buttonReset,
-  backgroundColor: colors.transparent,
-  cursor: 'pointer',
-  '&:focus-visible': {
-    outline: `2px solid ${colors.white}`,
-    outlineOffset: '2px',
-  },
-});
-
-export const StyledAccountDropdownItemButtonLabel = styled(Cell.Label)(largeText, {
-  margin: '0',
-  color: colors.blue80,
-  borderWidth: 0,
-  textAlign: 'left',
-  marginLeft: 0,
-  cursor: 'default',
-});
-
 export const StyledTopInfo = styled.div({
   display: 'flex',
   justifyContent: 'center',
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/NotificationSubtitle.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/NotificationSubtitle.tsx
index 736c3d6ad3..204da6fabc 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/NotificationSubtitle.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/NotificationSubtitle.tsx
@@ -4,7 +4,6 @@ import styled from 'styled-components';
 import { InAppNotificationSubtitle } from '../../shared/notifications';
 import { LabelTiny, Link } from '../lib/components';
 import { formatHtml } from '../lib/html-formatter';
-import { buttonReset } from '../lib/styles';
 import { ExternalLink } from './ExternalLink';
 import { InternalLink } from './InternalLink';
 
@@ -12,12 +11,7 @@ export type NotificationSubtitleProps = {
   subtitle?: string | InAppNotificationSubtitle[];
 };
 
-const StyledLink = styled(Link)(() => {
-  const { color: _, ...reset } = buttonReset;
-  return {
-    ...reset,
-  };
-});
+const StyledLink = styled(Link)``;
 
 const formatSubtitle = (subtitle: InAppNotificationSubtitle) => {
   const content = formatHtml(subtitle.content);
@@ -38,7 +32,11 @@ const formatSubtitle = (subtitle: InAppNotificationSubtitle) => {
         );
       case 'run-function':
         return (
-          <StyledLink color="white" forwardedAs="button" {...subtitle.action.button}>
+          <StyledLink
+            forwardedAs="button"
+            color="white"
+            variant="labelTiny"
+            {...subtitle.action.button}>
             <StyledLink.Text>{content}</StyledLink.Text>
           </StyledLink>
         );
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/filter-chip/FilterChip.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/filter-chip/FilterChip.tsx
index e728abb986..edf0fb0cc8 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/filter-chip/FilterChip.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/filter-chip/FilterChip.tsx
@@ -2,7 +2,6 @@ import { forwardRef } from 'react';
 import styled, { WebTarget } from 'styled-components';
 
 import { colors, Radius } from '../../foundations';
-import { buttonReset } from '../../styles';
 import { Flex } from '../flex';
 import { FilterChipIcon, FilterChipText } from './components';
 import { FilterChipProvider } from './FilterChipContext';
@@ -18,8 +17,6 @@ const variables = {
 } as const;
 
 const StyledButton = styled.button({
-  ...buttonReset,
-
   display: 'flex',
   alignItems: 'center',