Merge branch 'move-types-and-styles'

11 files changed, 7 insertions, 12 deletions

diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/ImageView.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/ImageView.tsx
index f40a93fbbc..20ec42236d 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/ImageView.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/ImageView.tsx
@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react';
 import styled from 'styled-components';
 
-import { NonTransientProps } from '../lib/styles';
+import { NonTransientProps } from '../lib/types';
 
 export interface IImageViewProps
   extends NonTransientProps<IImageMaskProps, 'tintColor' | 'tintHoverColor'> {
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/layout/Theme.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/layout/Theme.tsx
index 5d0e86f30e..63c762c4c1 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/layout/Theme.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/layout/Theme.tsx
@@ -13,12 +13,6 @@ import {
 
 type VariablesProps = React.PropsWithChildren<object>;
 
-const Reset = createGlobalStyle`
-  button {
-    all: unset;
-  }
-`;
-
 const VariablesGlobalStyle = createGlobalStyle`
   :root {
     ${Object.entries({
@@ -36,7 +30,6 @@ const VariablesGlobalStyle = createGlobalStyle`
 export const Theme = ({ children }: VariablesProps) => {
   return (
     <>
-      <Reset />
       <VariablesGlobalStyle />
       {children}
     </>
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/molecules/Button.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/molecules/Button.tsx
index bc1979dcf6..0721fbf54a 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/molecules/Button.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/molecules/Button.tsx
@@ -2,8 +2,8 @@ import React, { forwardRef } from 'react';
 import styled from 'styled-components';
 
 import { Colors, Radius, Spacings } from '../../foundations';
+import { buttonReset } from '../../styles';
 import { Flex } from '../layout';
-import { buttonReset } from '../mixins';
 import { BodySmallSemiBold } from '../typography';
 
 export interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/molecules/IconButton.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/molecules/IconButton.tsx
index 1e59dd6790..d6f1dcc242 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/molecules/IconButton.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/molecules/IconButton.tsx
@@ -3,7 +3,7 @@ import styled from 'styled-components';
 
 import ImageView from '../../../components/ImageView';
 import { Colors } from '../../foundations';
-import { buttonReset } from '../mixins';
+import { buttonReset } from '../../styles';
 
 export interface IconButtonProps
   extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'children'> {
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/typography/Link.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/typography/Link.tsx
index 32d18b4861..e3c8673a54 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/typography/Link.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/typography/Link.tsx
@@ -4,7 +4,7 @@ import styled from 'styled-components';
 import { Colors, Radius } from '../../foundations';
 import { useHistory } from '../../history';
 import { RoutePath } from '../../routes';
-import { buttonReset } from '../mixins';
+import { buttonReset } from '../../styles';
 import { Text, TextProps } from './Text';
 
 export interface LinkProps extends TextProps, Omit<React.HtmlHTMLAttributes<'button'>, 'color'> {
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/typography/Text.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/typography/Text.tsx
index a590fbe119..93834cb4a8 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/typography/Text.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/typography/Text.tsx
@@ -2,7 +2,7 @@ import { forwardRef } from 'react';
 import styled from 'styled-components';
 
 import { Colors, Typography, typography, TypographyProperties } from '../../foundations';
-import { TransientProps } from '../../styles';
+import { TransientProps } from '../../types';
 
 export type TextProps = React.PropsWithChildren<{
   variant?: Typography;
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/styles/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/styles/index.ts
new file mode 100644
index 0000000000..2b3d8cffd6
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/styles/index.ts
@@ -0,0 +1 @@
+export * from './mixins';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/mixins/button-reset.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/styles/mixins/button-reset.ts
index 4ef5844150..4ef5844150 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/mixins/button-reset.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/styles/mixins/button-reset.ts
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/mixins/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/styles/mixins/index.ts
index c546f737b6..c546f737b6 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/mixins/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/styles/mixins/index.ts
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/types/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/types/index.ts
new file mode 100644
index 0000000000..dd810c8061
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/types/index.ts
@@ -0,0 +1 @@
+export * from './transient-props';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/styles.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/types/transient-props.ts
index ea527ab791..ea527ab791 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/styles.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/types/transient-props.ts