diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2021-12-15 09:59:58 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2022-01-03 13:48:03 +0100 |
| commit | 9017e3e545fba79f9929708c04461d6e64e85bc9 (patch) | |
| tree | cc3df2d1bc19e6df8ed4e2ba0f503302b030aca4 /gui | |
| parent | 41185171995cc427c2a4021dbe4056bfd5c3939c (diff) | |
| download | mullvadvpn-9017e3e545fba79f9929708c04461d6e64e85bc9.tar.xz mullvadvpn-9017e3e545fba79f9929708c04461d6e64e85bc9.zip | |
Wrap hostname line in connection panel marquee
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/src/renderer/components/ConnectionPanel.tsx | 3 | ||||
| -rw-r--r-- | gui/src/renderer/components/ConnectionPanelDisclosure.tsx | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/gui/src/renderer/components/ConnectionPanel.tsx b/gui/src/renderer/components/ConnectionPanel.tsx index 57b5d1e02a..65a47ea1b3 100644 --- a/gui/src/renderer/components/ConnectionPanel.tsx +++ b/gui/src/renderer/components/ConnectionPanel.tsx @@ -11,6 +11,7 @@ import { } from '../../shared/daemon-rpc-types'; import { messages } from '../../shared/gettext'; import { default as ConnectionPanelDisclosure } from '../components/ConnectionPanelDisclosure'; +import Marquee from './Marquee'; export interface IEndpoint { ip: string; @@ -82,7 +83,7 @@ export default class ConnectionPanel extends React.Component<IProps> { {this.props.hostname && ( <Header> <ConnectionPanelDisclosure pointsUp={this.props.isOpen} onToggle={this.props.onToggle}> - {this.hostnameLine()} + <Marquee>{this.hostnameLine()}</Marquee> </ConnectionPanelDisclosure> </Header> )} diff --git a/gui/src/renderer/components/ConnectionPanelDisclosure.tsx b/gui/src/renderer/components/ConnectionPanelDisclosure.tsx index ad7c092f9c..d0727ddb6f 100644 --- a/gui/src/renderer/components/ConnectionPanelDisclosure.tsx +++ b/gui/src/renderer/components/ConnectionPanelDisclosure.tsx @@ -6,13 +6,15 @@ import ImageView from './ImageView'; const Container = styled.div({ display: 'flex', alignItems: 'center', + width: '100%', }); -const Caption = styled.span((props: { open: boolean }) => ({ +const Caption = styled.span({}, (props: { open: boolean }) => ({ fontFamily: 'Open Sans', fontSize: '15px', fontWeight: 600, lineHeight: '20px', + minWidth: '0px', color: props.open ? colors.white : colors.white40, [Container + ':hover &']: { color: colors.white, @@ -28,7 +30,7 @@ const Chevron = styled(ImageView)({ interface IProps { pointsUp: boolean; onToggle?: () => void; - children: React.ReactText; + children: React.ReactNode; className?: string; } |
