Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change daita info button spacing and modal button width #7480

Open
wants to merge 2 commits into
base: prepare-2025.3
Choose a base branch
from
Open

Change daita info button spacing and modal button width #7480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e705ad9
Update button styles
olmoh Jan 17, 2025
520a533
Change daita info button spacing
olmoh Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions desktop/packages/mullvad-vpn/src/renderer/components/DaitaSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ import PageSlider from './PageSlider';
import SettingsHeader, { HeaderSubTitle, HeaderTitle } from './SettingsHeader';
import { SmallButton, SmallButtonColor } from './SmallButton';

const StyledInfoButton = styled(InfoButton)({
marginRight: Spacings.spacing5,
});

const StyledHeaderSubTitle = styled(HeaderSubTitle)({
display: 'inline-block',
});
Expand Down Expand Up @@ -185,9 +189,9 @@ function DaitaToggle() {
<AriaLabel>
<Cell.InputLabel>{directOnlyString}</Cell.InputLabel>
</AriaLabel>
<InfoButton>
<StyledInfoButton>
<DirectOnlyModalMessage />
</InfoButton>
</StyledInfoButton>
<AriaInput>
<Cell.Switch isOn={directOnly && !unavailable} onChange={setDirectOnly} />
</AriaInput>
Expand Down
6 changes: 3 additions & 3 deletions desktop/packages/mullvad-vpn/src/renderer/components/InfoButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import styled from 'styled-components';

import { colors } from '../../config.json';
import { messages } from '../../shared/gettext';
import { Button } from '../lib/components';
import { useBoolean } from '../lib/utility-hooks';
import * as AppButton from './AppButton';
import ImageView from './ImageView';
import { ModalAlert, ModalAlertType } from './Modal';

Expand Down Expand Up @@ -61,9 +61,9 @@ export default function InfoButton(props: IInfoButtonProps) {
message={props.message}
type={ModalAlertType.info}
buttons={[
<AppButton.BlueButton key="back" onClick={hide}>
<Button size="full" key="back" onClick={hide}>
{messages.gettext('Got it!')}
</AppButton.BlueButton>,
</Button>,
]}
close={hide}>
{props.children}
Expand Down
2 changes: 1 addition & 1 deletion desktop/packages/mullvad-vpn/src/renderer/components/Settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ function QuitButton() {
const tunnelState = useSelector((state) => state.connection.status);

return (
<Button variant="destructive" onClick={quit}>
<Button size="full" variant="destructive" onClick={quit}>
{tunnelState.state === 'disconnected'
? messages.gettext('Quit')
: messages.gettext('Disconnect & quit')}
Expand Down
Loading