Skip to content

Commit be2b8b8

Browse files
fix(console): styling conflicts with antd and tailwind (#186)
1 parent 3589d96 commit be2b8b8

File tree

9 files changed

+299
-294
lines changed

9 files changed

+299
-294
lines changed

apps/console/postcss.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ const { join } = require("path");
22

33
module.exports = {
44
plugins: {
5+
"postcss-nested": {},
56
tailwindcss: {
67
config: join(__dirname, "tailwind.config.js"),
78
},

apps/console/src/app/antd-overrides.css

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import "~antd/dist/reset.css";
2+
13
h1.ant-typography,
24
h2.ant-typography,
35
h3.ant-typography,
@@ -13,10 +15,6 @@ h5.ant-typography {
1315
font-weight: 400;
1416
}
1517

16-
.ant-btn-primary {
17-
background: #13A071 !important;
18-
}
19-
2018
.ant-tabs-tab {
2119
font-family: "Brockmann", serif;
2220
font-weight: 300;

apps/console/src/app/app.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { Route, Routes, Navigate, Outlet } from "react-router-dom";
22
import { hotjar } from "react-hotjar";
33
import "./styles.css";
44
import "./antd-overrides.css";
5+
import "./tailwind-overrides.css";
56

67
import { ThemeProvider } from "./lib/providers/ThemeProvider";
78
import { QueryClientProvider } from "@tanstack/react-query";

apps/console/src/app/pages/auth/AuthCallbackPage.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,12 @@ export const AuthCallbackPage = () => {
2121
}, []);
2222

2323
return (
24-
<div className="flex h-full w-full items-center justify-center">
25-
<Loader />
24+
<div className="tailwind">
25+
<div className="dark h-[100vh] w-[100vw] font-sans">
26+
<div className="flex h-full w-full items-center justify-center bg-neutral-900 text-slate-300">
27+
<Loader />
28+
</div>
29+
</div>
2630
</div>
2731
);
2832
};

0 commit comments

Comments
 (0)