Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update tailwindcss to v4 #100

Merged
merged 4 commits into from
Feb 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions client-ui/app/routes/contacts.$contactId.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,15 @@ export default function ContactDetailPage() {
<Section title="Pass Info">
<SectionCard padded={false}>
<CardList bordered={false}>
<Card className="!grid grid-cols-6">
<Card className="grid! grid-cols-6">
<div className="font-semibold">AOS</div>
<div className="col-span-5">{contact.pass.aos}</div>
</Card>
<Card className="!grid grid-cols-6">
<Card className="grid! grid-cols-6">
<div className="font-semibold">LOS</div>
<div className="col-span-5">{contact.pass.los}</div>
</Card>
<Card className="!grid grid-cols-6">
<Card className="grid! grid-cols-6">
<div className="font-semibold">Max Elevation</div>
<div className="col-span-5">
{typeof contact.pass.maxElevation === "number"
Expand Down
2 changes: 1 addition & 1 deletion client-ui/app/routes/satellites.$satelliteId._index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ function PassesSection() {
className={
pass.isAvailable
? undefined
: "*:!cursor-not-allowed *:!text-muted"
: "*:text-muted! *:cursor-not-allowed!"
}
>
<td>{pass.groundStation!.name}</td>
Expand Down
8 changes: 5 additions & 3 deletions client-ui/app/tailwind.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@import "tailwindcss";

@theme {
--color-muted: #5f6b7c;
}
7 changes: 3 additions & 4 deletions client-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,21 @@
"@bufbuild/buf": "^1.46.0",
"@bufbuild/protoc-gen-es": "^2.2.2",
"@remix-run/dev": "^2.13.1",
"@tailwindcss/vite": "^4.0.6",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"@typescript-eslint/eslint-plugin": "^8.0.0",
"@typescript-eslint/parser": "^8.0.0",
"autoprefixer": "^10.4.19",
"eslint": "^8.38.0",
"eslint-config-prettier": "^10.0.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^5.0.0",
"postcss": "^8.4.38",
"prettier": "^3.3.3",
"prettier-plugin-tailwindcss": "^0.6.8",
"tailwindcss": "^3.4.4",
"prettier-plugin-tailwindcss": "^0.6.11",
"tailwindcss": "^4.0.6",
"typescript": "^5.1.6",
"vite": "^6.0.0",
"vite-tsconfig-paths": "^5.0.0"
Expand Down
Loading