summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2024-01-24 12:20:58 +0100
committerOskar Nyberg <oskar@mullvad.net>2024-01-29 09:33:49 +0100
commitbe5c4892cbc6242140ebefddc8445cc76e57899e (patch)
tree890d5be74bd59c2f962468fba3e7be94e6a33356
parent2341eb63fce0f0b25e2ebdaf0dffcc5db097d75c (diff)
downloadmullvadvpn-be5c4892cbc6242140ebefddc8445cc76e57899e.tar.xz
mullvadvpn-be5c4892cbc6242140ebefddc8445cc76e57899e.zip
Add support for titles in modals
-rw-r--r--gui/src/renderer/components/Modal.tsx14
1 files changed, 13 insertions, 1 deletions
diff --git a/gui/src/renderer/components/Modal.tsx b/gui/src/renderer/components/Modal.tsx
index c5a23bc4eb..2fd676a4ae 100644
--- a/gui/src/renderer/components/Modal.tsx
+++ b/gui/src/renderer/components/Modal.tsx
@@ -6,7 +6,7 @@ import { colors } from '../../config.json';
import log from '../../shared/logging';
import { useWillExit } from '../lib/will-exit';
import * as AppButton from './AppButton';
-import { measurements, tinyText } from './common-styles';
+import { measurements, normalText, tinyText } from './common-styles';
import CustomScrollbars from './CustomScrollbars';
import ImageView from './ImageView';
import { BackAction } from './KeyboardNavigation';
@@ -165,6 +165,7 @@ const ModalAlertButtonContainer = styled.div({
interface IModalAlertProps {
type?: ModalAlertType;
iconColor?: string;
+ title?: string;
message?: string | Array<string>;
buttons?: React.ReactNode[];
gridButtons?: React.ReactNode[];
@@ -281,6 +282,7 @@ class ModalAlertImpl extends React.Component<IModalAlertImplProps, IModalAlertSt
{this.props.type && (
<ModalAlertIcon>{this.renderTypeIcon(this.props.type)}</ModalAlertIcon>
)}
+ {this.props.title && <ModalTitle>{this.props.title}</ModalTitle>}
{messages &&
messages.map((message) => <ModalMessage key={message}>{message}</ModalMessage>)}
{this.props.children}
@@ -349,7 +351,17 @@ class ModalAlertImpl extends React.Component<IModalAlertImplProps, IModalAlertSt
};
}
+const ModalTitle = styled.h1(normalText, {
+ color: colors.white,
+ fontWeight: 600,
+ margin: '18px 0 0 0',
+});
+
export const ModalMessage = styled.span(tinyText, {
color: colors.white80,
marginTop: '16px',
+
+ [`${ModalTitle} ~ &&`]: {
+ marginTop: '6px',
+ },
});