summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMarkus Pettersson <markus.pettersson@mullvad.net>2025-02-03 08:47:53 +0100
committerMarkus Pettersson <markus.pettersson@mullvad.net>2025-02-03 08:47:53 +0100
commit419dbf41161b081cf97f3d9a25ea97120ba0797e (patch)
tree96f37e5a2a4a3d0bb683ddce2ea721b331c208cf
parent5eda68fd1545ddeb68739a6249d088cc9a81201a (diff)
parent3ca1e18460d091e40e8d8906147a93bd61069b77 (diff)
downloadmullvadvpn-419dbf41161b081cf97f3d9a25ea97120ba0797e.tar.xz
mullvadvpn-419dbf41161b081cf97f3d9a25ea97120ba0797e.zip
Merge branch 'header-text-overflow'
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/NavigationHeader.tsx1
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/components/NavigationHeaderTitle.tsx3
2 files changed, 4 insertions, 0 deletions
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/NavigationHeader.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/NavigationHeader.tsx
index 9b73e18f85..c3025c1459 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/NavigationHeader.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/NavigationHeader.tsx
@@ -24,6 +24,7 @@ export const StyledContent = styled.div({
placeContent: 'center',
minHeight: '32px',
height: '32px',
+ gap: Spacings.spacing1,
});
const NavigationHeader = ({ titleVisible, children, ...props }: NavigationHeaderProps) => {
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/components/NavigationHeaderTitle.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/components/NavigationHeaderTitle.tsx
index 31164ffdea..be4b31b9d0 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/components/NavigationHeaderTitle.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/navigation-header/components/NavigationHeaderTitle.tsx
@@ -10,6 +10,9 @@ export interface NavigationHeaderTitleProps {
export const StyledText = styled(TitleMedium)<{ $visible?: boolean }>(({ $visible = true }) => ({
opacity: $visible ? 1 : 0,
transition: 'opacity 250ms ease-in-out',
+ whiteSpace: 'nowrap',
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
}));
export const NavigationHeaderTitle = ({ children }: NavigationHeaderTitleProps) => {