From 6df7590051bf32ce101ed5363239ed46b1bac3a2 Mon Sep 17 00:00:00 2001 From: Vladyslav Matsiiako Date: Sat, 7 Oct 2023 17:13:44 -0700 Subject: [PATCH] fix styling issues --- .../v2/ContentLoader/ContentLoader.tsx | 8 ++- frontend/src/layouts/AppLayout/AppLayout.tsx | 4 +- .../views/SecretMainPage/SecretMainPage.tsx | 6 +-- .../BillingCloudTab/PreviewSection.tsx | 50 ++++++++++++------- 4 files changed, 41 insertions(+), 27 deletions(-) diff --git a/frontend/src/components/v2/ContentLoader/ContentLoader.tsx b/frontend/src/components/v2/ContentLoader/ContentLoader.tsx index 343d8adeb..af83ac81c 100644 --- a/frontend/src/components/v2/ContentLoader/ContentLoader.tsx +++ b/frontend/src/components/v2/ContentLoader/ContentLoader.tsx @@ -23,10 +23,8 @@ export const ContentLoader = ({ text, frequency = 2000 }: Props) => { }, []); return ( -
-
- loading animation -
+
+ loading animation {text && isTextArray && ( { )} - {text && !isTextArray &&
{text}
} + {text && !isTextArray &&
{text}
}
); }; diff --git a/frontend/src/layouts/AppLayout/AppLayout.tsx b/frontend/src/layouts/AppLayout/AppLayout.tsx index 8c1391687..a3541471a 100644 --- a/frontend/src/layouts/AppLayout/AppLayout.tsx +++ b/frontend/src/layouts/AppLayout/AppLayout.tsx @@ -488,9 +488,9 @@ export const AppLayout = ({ children }: LayoutProps) => { } icon="system-outline-189-domain-verification" > - Secret approval + Secret approvals {Boolean(secretApprovalReqCount?.open) && ( - + {secretApprovalReqCount?.open} )} diff --git a/frontend/src/views/SecretMainPage/SecretMainPage.tsx b/frontend/src/views/SecretMainPage/SecretMainPage.tsx index 4ffa27c86..cf56bbc93 100644 --- a/frontend/src/views/SecretMainPage/SecretMainPage.tsx +++ b/frontend/src/views/SecretMainPage/SecretMainPage.tsx @@ -39,9 +39,9 @@ import { StoreProvider } from "./SecretMainPage.store"; import { Filter, GroupBy, SortDir } from "./SecretMainPage.types"; const LOADER_TEXT = [ - "Retriving your encrypted secrets", - "Fetching folders", - "Getting secret import links" + "Retrieving your encrypted secrets...", + "Fetching folders...", + "Getting secret import links..." ]; export const SecretMainPage = () => { diff --git a/frontend/src/views/Settings/BillingSettingsPage/components/BillingCloudTab/PreviewSection.tsx b/frontend/src/views/Settings/BillingSettingsPage/components/BillingCloudTab/PreviewSection.tsx index ee1ffe989..04d878b67 100644 --- a/frontend/src/views/Settings/BillingSettingsPage/components/BillingCloudTab/PreviewSection.tsx +++ b/frontend/src/views/Settings/BillingSettingsPage/components/BillingCloudTab/PreviewSection.tsx @@ -1,3 +1,7 @@ +import Link from "next/link"; +import { faArrowUpRightFromSquare } from "@fortawesome/free-solid-svg-icons"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; + import { OrgPermissionCan } from "@app/components/permissions"; import { Button } from "@app/components/v2"; import { @@ -74,24 +78,36 @@ export const PreviewSection = () => { subscription?.slug !== "enterprise" && subscription?.slug !== "pro" && subscription?.slug !== "pro-annual" && ( -
-
-

Become Infisical

-

- Unlimited members, projects, RBAC, smart alerts, and so much more -

+
+
+
+

Unleash the full power of Infisical

+

+ Get unlimited members, projects, RBAC, smart alerts, and so much more. +

+
+ + {(isAllowed) => ( + + )} + +
+
+
Want to learn more?
+
+ + + Book a demo + + +
- - {(isAllowed) => ( - - )} -
)} {!isLoading && subscription && data && (