summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOliver <oliver@mohlin.dev>2025-01-10 10:12:42 +0100
committerMarkus Pettersson <markus.pettersson@mullvad.net>2025-01-13 15:02:51 +0100
commitd392b799c50f07a0a8fc2733f12945d4248094f5 (patch)
tree8d8cca4d28c44643456ed681f068a3f557e6fe44
parent5dca33e9ed554b40d52f5e4d403399529e599de4 (diff)
downloadmullvadvpn-d392b799c50f07a0a8fc2733f12945d4248094f5.tar.xz
mullvadvpn-d392b799c50f07a0a8fc2733f12945d4248094f5.zip
Rename Header to MainHeader
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/components/HeaderMainRow.tsx11
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/components/HeaderSubRow.tsx12
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/components/index.ts2
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/index.ts1
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/index.ts2
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/MainHeader.tsx (renamed from desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/Header.tsx)11
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/components/MainHeaderIconButton.tsx5
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/components/index.ts1
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/index.ts1
9 files changed, 13 insertions, 33 deletions
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/components/HeaderMainRow.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/components/HeaderMainRow.tsx
deleted file mode 100644
index a764fdfd8e..0000000000
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/components/HeaderMainRow.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import styled from 'styled-components';
-
-import { Flex } from '../../../layout';
-
-export const HeaderMainRow = styled(Flex).attrs({
- $justifyContent: 'space-between',
- $alignItems: ' center',
-})({
- minHeight: '38px',
- height: '38px',
-});
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/components/HeaderSubRow.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/components/HeaderSubRow.tsx
deleted file mode 100644
index 4e5896a26a..0000000000
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/components/HeaderSubRow.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import styled from 'styled-components';
-
-import { Spacings } from '../../../../foundations';
-import { Flex } from '../../../layout';
-
-export const HeaderSubRow = styled(Flex).attrs({
- $flex: 1,
- $alignItems: 'flex-end',
- $gap: Spacings.spacing6,
-})({
- minHeight: '18px',
-});
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/components/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/components/index.ts
deleted file mode 100644
index 22215abc57..0000000000
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/components/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './HeaderMainRow';
-export * from './HeaderSubRow';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/index.ts
deleted file mode 100644
index 266dec8a1b..0000000000
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './Header';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/index.ts
index ff83ea947f..5b82330cdf 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/index.ts
@@ -1,2 +1,2 @@
-export * from './header';
+export * from './main-header';
export * from './navigation-header';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/Header.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/MainHeader.tsx
index 1dbfee5b82..b3cf54c9d2 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/Header.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/MainHeader.tsx
@@ -3,7 +3,7 @@ import styled from 'styled-components';
import { Colors, Spacings } from '../../../foundations';
import { TransientProps } from '../../../types';
import { Flex } from '../../layout';
-import { HeaderMainRow, HeaderSubRow } from './components';
+import { MainHeaderIconButton } from './components';
export type HeaderProps = React.PropsWithChildren<{
size?: '1' | '2';
@@ -31,7 +31,7 @@ const StyledHeader = styled.header<TransientProps<HeaderProps>>(
}),
);
-const Header = ({ size = '1', variant = 'default', children, ...props }: HeaderProps) => {
+const MainHeader = ({ size = '1', variant = 'default', children, ...props }: HeaderProps) => {
return (
<StyledHeader $size={size} $variant={variant} {...props}>
<Flex
@@ -48,9 +48,8 @@ const Header = ({ size = '1', variant = 'default', children, ...props }: HeaderP
);
};
-const HeaderNamespace = Object.assign(Header, {
- MainRow: HeaderMainRow,
- SubRow: HeaderSubRow,
+const MainHeaderNamespace = Object.assign(MainHeader, {
+ IconButton: MainHeaderIconButton,
});
-export { HeaderNamespace as Header };
+export { MainHeaderNamespace as MainHeader };
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/components/MainHeaderIconButton.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/components/MainHeaderIconButton.tsx
new file mode 100644
index 0000000000..907f48cb00
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/components/MainHeaderIconButton.tsx
@@ -0,0 +1,5 @@
+import { IconButton, IconButtonProps } from '../../../molecules';
+
+export const MainHeaderIconButton = (props: IconButtonProps) => {
+ return <IconButton variant="secondary" {...props} />;
+};
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/components/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/components/index.ts
new file mode 100644
index 0000000000..4d837fe571
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/components/index.ts
@@ -0,0 +1 @@
+export * from './MainHeaderIconButton';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/index.ts
new file mode 100644
index 0000000000..3d8a1927af
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/index.ts
@@ -0,0 +1 @@
+export * from './MainHeader';