From 7baf30526ac6431f05a1aabdf5efc19c081baa25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Banno-Cloutier?=
<leo.banno-cloutier@savoirfairelinux.com>
Date: Fri, 7 Jul 2023 14:53:29 -0400
Subject: [PATCH] CustomUiPreview: description and jami id side by side when no
logo
Change-Id: I487d7185a69ee96e345183c540f8d81886e28b9d
---
.../CustomUiPreview/CustomUiPreview.js | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/jams-react-client/src/components/CustomUiPreview/CustomUiPreview.js b/jams-react-client/src/components/CustomUiPreview/CustomUiPreview.js
index 2d8be051..af0912af 100644
--- a/jams-react-client/src/components/CustomUiPreview/CustomUiPreview.js
+++ b/jams-react-client/src/components/CustomUiPreview/CustomUiPreview.js
@@ -71,10 +71,13 @@ const styles = {
marginRight: "1rem",
},
welcomeCard: {
+ display: "flex",
+ flexDirection: (props) => (props.hasLogo ? "column" : "row"),
borderRadius: "9px",
- backgroundColor: (props) => (props.isCompactDisplay ? "white" : "#f4f4f4"),
+ backgroundColor: (props) =>
+ props.isCompactDisplay ? "transparent" : "#f4f4f4",
padding: "10px",
- width: "50%",
+ width: (props) => (props.hasLogo ? "50%" : "100%"),
},
title: {
margin: 0,
@@ -147,6 +150,7 @@ export default function CustomUiPreview({
isOldPreview,
opacity,
hasTitle,
+ hasLogo,
});
const tip1 = i18next.t(
@@ -166,10 +170,12 @@ export default function CustomUiPreview({
<img src={logoUrl} alt="logo" className={classes.logo}></img>
) : null}
<div className={classes.welcomeCard}>
- {hasTitle ? <h4 className={classes.title}>{title}</h4> : null}
- {hasDescription ? (
- <p className={classes.description}>{description}</p>
- ) : null}
+ <div>
+ {hasTitle ? <h4 className={classes.title}>{title}</h4> : null}
+ {hasDescription ? (
+ <p className={classes.description}>{description}</p>
+ ) : null}
+ </div>
<JamiIdCard isCompactDisplay={isCompactDisplay} />
</div>
</div>
--
GitLab