From 78f3a3cf16c36538d4ce33ab61c81622a7c4a95f Mon Sep 17 00:00:00 2001 From: Philip Fulcher Date: Fri, 16 Dec 2022 16:32:29 -0700 Subject: [PATCH] chore(graph): remove global styles in favor of tailwind (#13882) Co-authored-by: Philip Fulcher --- graph/client/.storybook/preview.js | 2 +- graph/client/project.json | 2 +- graph/client/src/app/shell.tsx | 5 +++- graph/client/src/app/theme-resolver.tsx | 16 +++++++++--- graph/client/src/index.html | 8 +++--- graph/client/src/styles.css | 8 ++++++ graph/client/src/styles.scss | 26 ------------------- .../ui-graph/src/lib/nx-project-graph-viz.tsx | 2 +- graph/ui-graph/src/lib/nx-task-graph-viz.tsx | 2 +- 9 files changed, 34 insertions(+), 37 deletions(-) create mode 100644 graph/client/src/styles.css delete mode 100644 graph/client/src/styles.scss diff --git a/graph/client/.storybook/preview.js b/graph/client/.storybook/preview.js index 7ecdbaf4b9b62..d360dc71d7320 100644 --- a/graph/client/.storybook/preview.js +++ b/graph/client/.storybook/preview.js @@ -1,4 +1,4 @@ -import '../src/styles.scss'; +import '../src/styles.css'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; diff --git a/graph/client/project.json b/graph/client/project.json index ceddf5e0e717b..1ebfadac7f328 100644 --- a/graph/client/project.json +++ b/graph/client/project.json @@ -39,7 +39,7 @@ "main": "graph/client/src/main.tsx", "polyfills": "graph/client/src/polyfills.ts", "tsConfig": "graph/client/tsconfig.app.json", - "styles": ["graph/client/src/styles.scss"], + "styles": ["graph/client/src/styles.css"], "scripts": [], "assets": [], "webpackConfig": "graph/client/webpack.config.js", diff --git a/graph/client/src/app/shell.tsx b/graph/client/src/app/shell.tsx index c6ac4c818bf75..92fa2089edcd0 100644 --- a/graph/client/src/app/shell.tsx +++ b/graph/client/src/app/shell.tsx @@ -175,7 +175,10 @@ export function Shell(): JSX.Element { ) : null}
-
+
- + Nx Workspace Project Graph @@ -25,7 +25,9 @@ - -
+ +
diff --git a/graph/client/src/styles.css b/graph/client/src/styles.css new file mode 100644 index 0000000000000..e05ff27327062 --- /dev/null +++ b/graph/client/src/styles.css @@ -0,0 +1,8 @@ +@tailwind components; +@tailwind base; +@tailwind utilities; + +/** Scrollbars **/ +.dark { + color-scheme: dark; +} diff --git a/graph/client/src/styles.scss b/graph/client/src/styles.scss deleted file mode 100644 index 4674d2cf6df53..0000000000000 --- a/graph/client/src/styles.scss +++ /dev/null @@ -1,26 +0,0 @@ -@tailwind components; -@tailwind base; -@tailwind utilities; - -/** Scrollbars **/ -.dark { - color-scheme: dark; -} - -#app, -body, -html { - height: 100%; - margin: 0; - overflow: hidden; - padding: 0; - width: 100%; -} - -#app { - display: flex; -} - -canvas { - cursor: pointer; -} diff --git a/graph/ui-graph/src/lib/nx-project-graph-viz.tsx b/graph/ui-graph/src/lib/nx-project-graph-viz.tsx index 72da6ebda631e..f49698ea5020e 100644 --- a/graph/ui-graph/src/lib/nx-project-graph-viz.tsx +++ b/graph/ui-graph/src/lib/nx-project-graph-viz.tsx @@ -114,7 +114,7 @@ export function NxProjectGraphViz({
{tooltipToRender ? ( diff --git a/graph/ui-graph/src/lib/nx-task-graph-viz.tsx b/graph/ui-graph/src/lib/nx-task-graph-viz.tsx index 07d2c7e6075d9..5c02cb4310d55 100644 --- a/graph/ui-graph/src/lib/nx-task-graph-viz.tsx +++ b/graph/ui-graph/src/lib/nx-task-graph-viz.tsx @@ -99,7 +99,7 @@ export function NxTaskGraphViz({
{tooltipToRender ? (