Merge branch 'main' of https://github.com/sinamics/next_ztnet

sinamics · Jan 7, 2024 · 672d7d7 · 672d7d7
2 parents b36a6c6 + 737c9d6
commit 672d7d7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/src/components/networkByIdPage/organization/listOrganizations.tsx b/src/components/networkByIdPage/organization/listOrganizations.tsx
@@ -28,7 +28,10 @@ const ListOrganizations = () => {
 	return (
 		<div className="space-y-10">
 			{userOrgs?.map((org) => (
-				<div key={org.id} className="border border-primary p-4 my-4 rounded">
+				<div
+					key={org.id}
+					className="border border-primary/20 p-4 my-4 rounded bg-base-200 shadow-lg"
+				>
 					<div>
 						<p>
 							<strong>{t("organization.listOrganization.organizationName")}</strong>{" "}
@@ -125,7 +128,7 @@ const ListOrganizations = () => {
 											content: <OrganizationInviteModal organizationId={org.id} />,
 										})
 									}
-									className="btn btn-sm"
+									className="btn btn-sm bg-base-300"
 								>
 									{b("inviteUser")}
 								</button>
@@ -141,7 +144,7 @@ const ListOrganizations = () => {
 											content: <EditOrganizationModal organizationId={org.id} />,
 										});
 									}}
-									className="btn btn-sm"
+									className="btn btn-sm bg-base-300"
 								>
 									{b("meta")}
 								</button>
@@ -167,11 +170,14 @@ const ListOrganizations = () => {
 											content: <OrganizationWebhook organizationId={org.id} />,
 										});
 									}}
-									className="btn btn-sm"
+									className="btn btn-sm bg-base-300"
 								>
 									{b("addWebhooks")}
 								</button>
-								<button onClick={() => toggleUsersTable(org.id)} className="btn btn-sm">
+								<button
+									onClick={() => toggleUsersTable(org.id)}
+									className="btn btn-sm bg-base-300"
+								>
 									{b("users")}
 								</button>
 							</div>

diff --git a/src/pages/central/[id].tsx b/src/pages/central/[id].tsx
@@ -95,7 +95,7 @@ const CentralNetworkById = ({ orgIds }) => {
 					<div className="flex flex-col space-y-3 sm:space-y-0">
 						<div className="flex flex-col justify-between sm:flex-row">
 							<span className="font-semibold">{t("networkId")}</span>
-							<span className="relative left-7 flex items-center gap-2">
+							<span className="relative flex items-center gap-2">
 								<CopyToClipboard
 									text={network?.nwid}
 									onCopy={() =>

diff --git a/src/pages/network/[id].tsx b/src/pages/network/[id].tsx
@@ -128,7 +128,7 @@ const NetworkById = ({ orgIds }: IProps) => {
 					<div className="flex flex-col space-y-3 sm:space-y-0">
 						<div className="flex flex-col justify-between sm:flex-row">
 							<span className="font-semibold">{t("networkId")}</span>
-							<span className="relative left-7 flex items-center gap-2">
+							<span className="relative flex items-center gap-2">
 								<CopyToClipboard
 									text={network?.nwid}
 									onCopy={() =>