Skip to content

chore(deps): upgrade Tailwind v4 #1770

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

Merged
merged 3 commits into from
Jan 24, 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
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@
"@primer/octicons-react": "19.14.0",
"@primer/primitives": "10.3.4",
"@primer/react": "36.27.0",
"@tailwindcss/postcss": "4.0.0",
"@testing-library/react": "16.2.0",
"@types/jest": "29.5.14",
"@types/node": "22.10.9",
Expand All @@ -150,7 +151,6 @@
"@types/react-dom": "19.0.3",
"@types/react-router-dom": "5.3.3",
"@types/semver": "7.5.8",
"autoprefixer": "10.4.20",
"axios": "1.7.9",
"clsx": "2.1.1",
"concurrently": "9.1.2",
Expand All @@ -176,7 +176,7 @@
"semver": "7.6.3",
"styled-components": "6.1.14",
"tailwind-merge": "2.6.0",
"tailwindcss": "3.4.17",
"tailwindcss": "4.0.0",
"terser-webpack-plugin": "5.3.11",
"ts-jest": "29.2.5",
"ts-loader": "9.5.2",
Expand Down
576 changes: 275 additions & 301 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
module.exports = {
plugins: {
tailwindcss: {},
autoprefixer: {},
'@tailwindcss/postcss': {},
},
};
6 changes: 6 additions & 0 deletions src/renderer/App.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/** Tailwind CSS */
@import "tailwindcss";

/** GitHub Primer Design System */
/* Size & Typography */
@import "@primer/primitives/dist/css/base/size/size.css";
Expand All @@ -19,6 +22,9 @@
@import "@primer/primitives/dist/css/functional/themes/dark-high-contrast.css";
@import "@primer/primitives/dist/css/functional/themes/dark-tritanopia.css";

/** Tailwind CSS Configuration */
@config '../../tailwind.config.ts';

html,
body,
#root {
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/fields/Checkbox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const Checkbox: FC<ICheckbox> = (props: ICheckbox) => {
<input
type="checkbox"
id={props.name}
className="size-4 rounded cursor-pointer"
className="size-4 rounded-sm cursor-pointer"
checked={props.checked}
onChange={props.onChange}
disabled={props.disabled}
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/fields/FieldInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const FieldInput: FC<IFieldInput> = ({
type={type}
className={cn(
'text-sm mb-2 px-4 py-1.5 block w-full appearance-none',
'rounded border bg-gitify-input-rest focus:bg-gitify-input-focus focus:outline-none',
'rounded-sm border bg-gitify-input-rest focus:bg-gitify-input-focus focus:outline-hidden',
error ? 'border-red-500' : 'border-gray-500',
)}
id={input.name}
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/fields/Tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export const Tooltip: FC<ITooltip> = (props: ITooltip) => {
>
<QuestionIcon className="ml-1 text-gitify-tooltip-icon" />
{showTooltip && (
<div className="absolute left-[-80px] z-10 w-60 rounded border border-gray-300 p-2 shadow bg-gitify-tooltip-popout">
<div className="absolute left-[-80px] z-10 w-60 rounded-sm border border-gray-300 p-2 shadow-sm bg-gitify-tooltip-popout">
<div className="text-left text-xs text-gitify-font">
{props.tooltip}
</div>
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions src/renderer/components/layout/Contents.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@ interface IContents {
}

export const Contents: FC<IContents> = (props: IContents) => {
return (
<div className="flex-grow overflow-x-auto px-8 pb-4">{props.children}</div>
);
return <div className="grow overflow-x-auto px-8 pb-4">{props.children}</div>;
};

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/renderer/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { createRoot } from 'react-dom/client';

import 'nprogress/nprogress.css';
import 'tailwindcss/tailwind.css';
import { App } from './App';

const container = document.getElementById('root');
Expand Down
6 changes: 3 additions & 3 deletions src/renderer/routes/__snapshots__/Accounts.test.tsx.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 21 additions & 21 deletions src/renderer/routes/__snapshots__/Filters.test.tsx.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading