diff --git a/src/core/client/admin/components/UserStatus/PremodModal.css b/src/core/client/admin/components/ModalBodyText.css similarity index 68% rename from src/core/client/admin/components/UserStatus/PremodModal.css rename to src/core/client/admin/components/ModalBodyText.css index 9617ee7a5..62ae84c8d 100644 --- a/src/core/client/admin/components/UserStatus/PremodModal.css +++ b/src/core/client/admin/components/ModalBodyText.css @@ -1,9 +1,9 @@ -$premod-modal-text: var(--v2-colors-mono-500); +$modal-body-text: var(--v2-colors-mono-500); -.bodyText { +.root { font-size: var(--v2-font-size-3); font-family: var(--v2-font-family-primary); font-weight: var(--v2-font-weight-primary-regular); line-height: var(--v2-line-height-body-short); - color: $premod-modal-text; + color: $modal-body-text; } diff --git a/src/core/client/admin/components/ModalBodyText.tsx b/src/core/client/admin/components/ModalBodyText.tsx new file mode 100644 index 000000000..69e069139 --- /dev/null +++ b/src/core/client/admin/components/ModalBodyText.tsx @@ -0,0 +1,9 @@ +import React, { FunctionComponent } from "react"; + +import styles from "./ModalBodyText.css"; + +const ModalBodyText: FunctionComponent = ({ children }) => ( +
{children}
+); + +export default ModalBodyText; diff --git a/src/core/client/admin/components/UserStatus/ChangeStatusModalHeader.css b/src/core/client/admin/components/ModalHeader.css similarity index 73% rename from src/core/client/admin/components/UserStatus/ChangeStatusModalHeader.css rename to src/core/client/admin/components/ModalHeader.css index 8222b9bb7..b5e9408ca 100644 --- a/src/core/client/admin/components/UserStatus/ChangeStatusModalHeader.css +++ b/src/core/client/admin/components/ModalHeader.css @@ -1,10 +1,10 @@ -$status-modal-text: var(--v2-colors-mono-500); +$modal-text: var(--v2-colors-mono-500); .root { font-size: var(--v2-font-size-5); font-family: var(--v2-font-family-primary); font-weight: var(--v2-font-weight-primary-semi-bold); line-height: var(--v2-line-height-title); - color: $status-modal-text; + color: $modal-text; margin: 0; } diff --git a/src/core/client/admin/components/ModalHeader.tsx b/src/core/client/admin/components/ModalHeader.tsx new file mode 100644 index 000000000..b94ca0266 --- /dev/null +++ b/src/core/client/admin/components/ModalHeader.tsx @@ -0,0 +1,16 @@ +import React, { FunctionComponent, HTMLAttributes } from "react"; + +import styles from "./ModalHeader.css"; + +const ModalHeader: FunctionComponentBanned on {" "} - {formatter.format(new Date(activeBan.createdAt))} + {formatter(activeBan.createdAt)}
{activeBan.createdBy && ( @@ -94,25 +92,21 @@ const UserStatusDetailsContainer: FunctionComponentStart: - {formatter.format(new Date(activeSuspension.from.start))} + {formatter(activeSuspension.from.start)}
End: - {formatter.format(new Date(activeSuspension.from.finish))} + {formatter(activeSuspension.from.finish)}
diff --git a/src/core/client/admin/components/UserStatus/ChangeStatusModalHeader.tsx b/src/core/client/admin/components/UserStatus/ChangeStatusModalHeader.tsx
deleted file mode 100644
index e94b65aa1..000000000
--- a/src/core/client/admin/components/UserStatus/ChangeStatusModalHeader.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import React, { FunctionComponent, HTMLAttributes } from "react";
-
-import styles from "./ChangeStatusModalHeader.css";
-
-const ChangeStatusModalHeader: FunctionComponent
- {children}
-
- );
-};
-
-export default ChangeStatusModalHeader;
diff --git a/src/core/client/admin/components/UserStatus/PremodModal.tsx b/src/core/client/admin/components/UserStatus/PremodModal.tsx
index b9f6272f9..0ba9938cd 100644
--- a/src/core/client/admin/components/UserStatus/PremodModal.tsx
+++ b/src/core/client/admin/components/UserStatus/PremodModal.tsx
@@ -4,11 +4,10 @@ import React, { FunctionComponent } from "react";
import NotAvailable from "coral-admin/components/NotAvailable";
import { Button, Flex, HorizontalGutter } from "coral-ui/components/v2";
+import ModalBodyText from "../ModalBodyText";
+import ModalHeader from "../ModalHeader";
+import ModalHeaderUsername from "../ModalHeaderUsername";
import ChangeStatusModal from "./ChangeStatusModal";
-import ChangeStatusModalHeader from "./ChangeStatusModalHeader";
-import ModalHeaderUsername from "./ModalHeaderUsername";
-
-import styles from "./PremodModal.css";
interface Props {
username: string | null;
@@ -36,19 +35,19 @@ const PremodModal: FunctionComponent
Select suspension length
+