From 7d61b827e8fccd2d26ff02dd3fa9c2dc64465ee6 Mon Sep 17 00:00:00 2001 From: Sonia Appasamy Date: Fri, 1 Dec 2023 15:12:34 -0500 Subject: [PATCH] client/web: adjust colors and some UI margins Updates #10261 Signed-off-by: Sonia Appasamy --- client/web/src/components/app.tsx | 11 +- .../web/src/components/exit-node-selector.tsx | 12 +- client/web/src/components/login-toggle.tsx | 8 +- .../components/views/device-details-view.tsx | 10 +- client/web/src/components/views/home-view.tsx | 17 +- client/web/src/components/views/ssh-view.tsx | 4 +- .../components/views/subnet-router-view.tsx | 12 +- client/web/src/index.css | 165 ++++++++++++++++-- client/web/src/ui/button.tsx | 6 +- client/web/styles.json | 85 +++++++++ client/web/tailwind.config.js | 75 +++++++- 11 files changed, 349 insertions(+), 56 deletions(-) create mode 100644 client/web/styles.json diff --git a/client/web/src/components/app.tsx b/client/web/src/components/app.tsx index 8fcdaf6f6..f15a8c19e 100644 --- a/client/web/src/components/app.tsx +++ b/client/web/src/components/app.tsx @@ -102,14 +102,17 @@ function Header({ auth: AuthResponse newSession: () => Promise }) { - const [loc] = useLocation() + const [loc, setLocation] = useLocation() return ( <>
- -
+ setLocation("/")} + /> +
{node.DomainName}
@@ -118,7 +121,7 @@ function Header({ {loc !== "/" && loc !== "/update" && ( ← Back to {node.DeviceName} diff --git a/client/web/src/components/exit-node-selector.tsx b/client/web/src/components/exit-node-selector.tsx index 973e624fe..9440869d1 100644 --- a/client/web/src/components/exit-node-selector.tsx +++ b/client/web/src/components/exit-node-selector.tsx @@ -78,7 +78,7 @@ export default function ExitNodeSelector({ { "border-gray-200": none, "bg-amber-600 border-amber-600": advertising, - "bg-indigo-500 border-indigo-500": using, + "bg-blue-500 border-blue-500": using, }, className )} @@ -87,7 +87,7 @@ export default function ExitNodeSelector({ className={cx("flex-1 px-2 py-1.5 rounded-[1px]", { "bg-white hover:bg-stone-100": none, "bg-amber-600 hover:bg-orange-400": advertising, - "bg-indigo-500 hover:bg-indigo-400": using, + "bg-blue-500 hover:bg-blue-400": using, "cursor-not-allowed": disabled, })} onClick={() => setOpen(!open)} @@ -95,7 +95,7 @@ export default function ExitNodeSelector({ >

@@ -103,7 +103,7 @@ export default function ExitNodeSelector({

@@ -128,7 +128,7 @@ export default function ExitNodeSelector({

@@ -105,19 +100,19 @@ function SettingsCard({ >
-

+

{title}

{badge && (
{badge.icon} -
+
{badge.text}
)}
-

{body}

+

{body}

diff --git a/client/web/src/components/views/ssh-view.tsx b/client/web/src/components/views/ssh-view.tsx index 1a80edf99..ad756a79b 100644 --- a/client/web/src/components/views/ssh-view.tsx +++ b/client/web/src/components/views/ssh-view.tsx @@ -23,7 +23,7 @@ export default function SSHView({ your tailnet to SSH into it.{" "} @@ -46,7 +46,7 @@ export default function SSHView({
Remember to make sure that the{" "} diff --git a/client/web/src/components/views/subnet-router-view.tsx b/client/web/src/components/views/subnet-router-view.tsx index 6f72c1875..c4ac3beb7 100644 --- a/client/web/src/components/views/subnet-router-view.tsx +++ b/client/web/src/components/views/subnet-router-view.tsx @@ -35,7 +35,7 @@ export default function SubnetRouterView({ Add devices to your tailnet without installing Tailscale.{" "} @@ -52,7 +52,7 @@ export default function SubnetRouterView({ value={inputText} onChange={(e) => setInputText(e.target.value)} /> -

+

Add multiple routes by providing a comma-separated list.