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.

Sign up for GitHub

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

build(deps-dev): bump tailwindcss from 3.4.17 to 4.0.4 #748

Merged
merged 3 commits into from
Feb 9, 2025
Merged

build(deps-dev): bump tailwindcss from 3.4.17 to 4.0.4 #748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
393a5d0
bump tailwind
gdams Feb 7, 2025
dd52717
remove duplicate code
gdams Feb 8, 2025
321a447
remove duplicate code
gdams Feb 9, 2025
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
941 changes: 508 additions & 433 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
"swiper": "^11.2.2"
},
"devDependencies": {
"@tailwindcss/postcss": "^4.0.4",
"@tailwindcss/typography": "^0.5.16",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.2.0",
Expand All @@ -97,7 +98,7 @@
"jsdom": "^26.0.0",
"postcss": "^8.5.1",
"prettier": "3.4.2",
"tailwindcss": "^3.4.17",
"tailwindcss": "^4.0.4",
"vitest": "^2.0.2",
"vitest-axe": "^1.0.0-pre.5",
"vitest-canvas-mock": "^0.3.3"
Expand Down
2 changes: 1 addition & 1 deletion postcss.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = () => ({
plugins: [require("tailwindcss")],
plugins: [require('@tailwindcss/postcss')]
})
2 changes: 1 addition & 1 deletion src/components/Announcements/TabContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const TabContent = ({ posts }) => {
})()}
</p>

<h3 className="text-[20px] leading-[140%] text-white">
<h3 className="text-[20px] leading-[140%] text-white mb-4">
{post.node.frontmatter.title}
</h3>
<p className="tab-button-text text-sm text-lightgrey pt-2">
Expand Down
12 changes: 6 additions & 6 deletions src/components/Announcements/__tests__/__snapshots__/Annnouncements.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ exports[`Announcements component > Announcements renders correctly 1`] = `
<button>
<span
class="py-3 w-full tab-button-text
outline-none cursor-pointer transition-all duration-200 ease-in-out border-primary border-b-2 text-white"
outline-hidden cursor-pointer transition-all duration-200 ease-in-out border-primary border-b-2 text-white"
>
Updates
</span>
</button>
<button>
<span
class="py-3 w-full tab-button-text
outline-none cursor-pointer transition-all duration-200 ease-in-out text-[#8a809e] border-transparent border-b"
outline-hidden cursor-pointer transition-all duration-200 ease-in-out text-[#8a809e] border-transparent border-b"
>
Releases
</span>
Expand All @@ -89,7 +89,7 @@ exports[`Announcements component > Announcements renders correctly 1`] = `
1 day ago
</p>
<h3
class="text-[20px] leading-[140%] text-white"
class="text-[20px] leading-[140%] text-white mb-4"
>
Test Announcement 1
</h3>
Expand Down Expand Up @@ -117,7 +117,7 @@ exports[`Announcements component > Announcements renders correctly 1`] = `
3 weeks ago
</p>
<h3
class="text-[20px] leading-[140%] text-white"
class="text-[20px] leading-[140%] text-white mb-4"
>
Test Announcement 2
</h3>
Expand Down Expand Up @@ -145,7 +145,7 @@ exports[`Announcements component > Announcements renders correctly 1`] = `
1 week ago
</p>
<h3
class="text-[20px] leading-[140%] text-white"
class="text-[20px] leading-[140%] text-white mb-4"
>
Test Announcement 3
</h3>
Expand Down Expand Up @@ -173,7 +173,7 @@ exports[`Announcements component > Announcements renders correctly 1`] = `
8 weeks ago
</p>
<h3
class="text-[20px] leading-[140%] text-white"
class="text-[20px] leading-[140%] text-white mb-4"
>
Test Announcement 4
</h3>
Expand Down
6 changes: 3 additions & 3 deletions src/components/Announcements/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,23 @@ const Announcements = ({ handleClose }) => {
<button onClick={() => setActive("Updates")}>
<span
className={`py-3 w-full tab-button-text
outline-none cursor-pointer transition-all duration-200 ease-in-out ${active === "Updates" ? "border-primary border-b-2 text-white" : "text-[#8a809e] border-transparent border-b"}`}
outline-hidden cursor-pointer transition-all duration-200 ease-in-out ${active === "Updates" ? "border-primary border-b-2 text-white" : "text-[#8a809e] border-transparent border-b"}`}
>
Updates
</span>
</button>
{/* <button onClick={() => setActive("Events")}>
<span
className={`py-3 w-full tab-button-text
outline-none cursor-pointer transition-all duration-200 ease-in-out ${active === "Events" ? "border-primary border-b-2 text-white" : "text-[#8a809e] border-transparent border-b"}`}
outline-hidden cursor-pointer transition-all duration-200 ease-in-out ${active === "Events" ? "border-primary border-b-2 text-white" : "text-[#8a809e] border-transparent border-b"}`}
>
Events
</span>
</button> */}
<button onClick={() => setActive("Releases")}>
<span
className={`py-3 w-full tab-button-text
outline-none cursor-pointer transition-all duration-200 ease-in-out ${active === "Releases" ? "border-primary border-b-2 text-white" : "text-[#8a809e] border-transparent border-b"}`}
outline-hidden cursor-pointer transition-all duration-200 ease-in-out ${active === "Releases" ? "border-primary border-b-2 text-white" : "text-[#8a809e] border-transparent border-b"}`}
>
Releases
</span>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Asciidoc/AuthorList/Author/__tests__/__snapshots__/author.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ exports[`Author component > renders correctly 1`] = `
>
<img
alt="test-author"
class="rounded-full border-solid border-4 border-purple"
class="rounded-full border-solid border-4 border-purple mb-6"
src="https://github.com/test-author.png?size=60"
style="max-width: 60px;"
/>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Asciidoc/AuthorList/Author/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const Author = ({ username, size }: Props): null | JSX.Element => {
rel="noopener noreferrer"
>
<img
className="rounded-full border-solid border-4 border-purple"
className="rounded-full border-solid border-4 border-purple mb-6"
style={{ maxWidth: `${size}px` }}
src={githubImgLink}
alt={username}
Expand Down
4 changes: 2 additions & 2 deletions src/components/Asciidoc/AuthorList/__tests__/__snapshots__/author-list.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ exports[`AuthorsList component > renders correctly 1`] = `
>
<img
alt="test-author"
class="rounded-full border-solid border-4 border-purple"
class="rounded-full border-solid border-4 border-purple mb-6"
src="https://github.com/test-author.png?size=48"
style="max-width: 48px;"
/>
Expand All @@ -34,7 +34,7 @@ exports[`AuthorsList component > renders correctly 1`] = `
>
<img
alt="another-test-author"
class="rounded-full border-solid border-4 border-purple"
class="rounded-full border-solid border-4 border-purple mb-6"
src="https://github.com/another-test-author.png?size=48"
style="max-width: 48px;"
/>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Asciidoc/EditLink/__tests__/__snapshots__/EditLink.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exports[`EditLink component > does not render without a path 1`] = `<div />`;
exports[`EditLink component > renders correctly 1`] = `
<div>
<div
class="w-full px-6 py-8 rounded-2xl border-2 border-white border-opacity-50 flex-col justify-center items-start gap-2 inline-flex"
class="w-full px-6 py-8 rounded-2xl border-2 border-white/50 flex-col justify-center items-start gap-2 inline-flex"
>
<div
class="self-stretch justify-start items-center gap-4 inline-flex"
Expand Down
2 changes: 1 addition & 1 deletion src/components/Asciidoc/EditLink/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const EditLink = ({ relativePath }: Props) => {
const href = `https://github.com/adoptium/adoptium.net/edit/main/content/asciidoc-pages/${relativePath}`

return (
<div className="w-full px-6 py-8 rounded-2xl border-2 border-white border-opacity-50 flex-col justify-center items-start gap-2 inline-flex">
<div className="w-full px-6 py-8 rounded-2xl border-2 border-white/50 flex-col justify-center items-start gap-2 inline-flex">
<div className="self-stretch justify-start items-center gap-4 inline-flex">
<div className="w-20 h-20 relative">
<img
Expand Down
10 changes: 5 additions & 5 deletions src/components/ChecksumModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const ChecksumModal = ({ open, setOpen, checksum }) => {
leaveFrom="opacity-100"
leaveTo="opacity-0"
>
<div className="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity" />
<div className="fixed inset-0 bg-gray-500/75 transition-opacity" />
</Transition.Child>

<div className="fixed inset-0 z-10 overflow-y-auto">
Expand All @@ -51,7 +51,7 @@ const ChecksumModal = ({ open, setOpen, checksum }) => {
<Dialog.Panel className="relative transform overflow-hidden rounded-lg bg-white text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-2xl">
<div className="bg-[#200E46] px-4 pb-4 pt-5 sm:p-6 sm:pb-4">
<div className="sm:flex sm:items-start">
<div className="mx-auto flex h-12 w-12 flex-shrink-0 items-center justify-center rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10">
<div className="mx-auto flex h-12 w-12 shrink-0 items-center justify-center rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10">
<FaClipboard
className="h-6 w-6 text-blue-600"
aria-hidden="true"
Expand Down Expand Up @@ -80,7 +80,7 @@ const ChecksumModal = ({ open, setOpen, checksum }) => {
</p>
<input
readOnly
className="mt-2 w-full text-gray-900 rounded-md border-gray-300 shadow-sm"
className="mt-2 w-full text-gray-900 rounded-md border-gray-300 shadow-xs"
value={checksum}
/>
</div>
Expand All @@ -90,7 +90,7 @@ const ChecksumModal = ({ open, setOpen, checksum }) => {
<div className="bg-purple px-4 py-3 sm:flex sm:flex-row-reverse sm:px-6">
<button
type="button"
className={`mt-3 w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 text-base font-medium text-white sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm ${
className={`mt-3 w-full inline-flex justify-center rounded-md border border-transparent shadow-xs px-4 py-2 text-base font-medium text-white sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm ${
copied ? "bg-[#2B1A4F]" : "bg-pink hover:bg-pink-700"
}`}
onClick={() => {
Expand All @@ -102,7 +102,7 @@ const ChecksumModal = ({ open, setOpen, checksum }) => {
</button>
<button
type="button"
className="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 sm:mt-0 sm:w-auto sm:text-sm"
className="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-xs px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 sm:mt-0 sm:w-auto sm:text-sm"
onClick={() => setOpen(false)}
ref={cancelButtonRef}
>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/OSSelector/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<button key={index} onClick={() => onActiveChange(button.label)}>
<span
className={`py-3 w-full text-base font-normal leading-6
outline-none cursor-pointer transition-all duration-200 ease-in-out ${activeIndex === button.label ? "border-primary border-b-[2px] text-white" : "text-[#8a809e] border-transparent border-b"}`}
outline-hidden cursor-pointer transition-all duration-200 ease-in-out ${activeIndex === button.label ? "border-primary border-b-[2px] text-white" : "text-[#8a809e] border-transparent border-b"}`}

Check warning on line 43 in src/components/Common/OSSelector/index.tsx

View check run for this annotation

Codecov / codecov/patch

src/components/Common/OSSelector/index.tsx#L43 

Added line #L43 was not covered by tests
>
{button.label}
</span>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ContactUs/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const ContactUs: React.FC<ContactUsProps> = ({
src="/images/icons/message.svg"
aria-label="message icon"
/>
<p className="text-white text-4xl md:text-5xl leading-[122.222%] md:leading-[116.667%] font-normal mt-8">
<p className="text-white text-4xl md:text-5xl leading-[122.222%] md:leading-[116.667%] font-normal mt-8 mb-6">
{title}
</p>
<span className=" text-lightgrey tab-button-text">
Expand Down
12 changes: 6 additions & 6 deletions src/components/Contributors/__tests__/__snapshots__/Contributors.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ exports[`ContributorsHome component > Contributors renders correctly 1`] = `
class="flex w-fit space-x-4 sm:space-x-[210px] md:mx-auto justify-between items-end mt-[81px] xl:ml-[461px] overflow-hidden"
>
<div
class="flex items-center justify-center p-4 space-x-4 w-[325px] rounded-3xl border border-white border-opacity-50"
class="flex items-center justify-center p-4 space-x-4 w-[325px] rounded-3xl border border-white/50"
style="margin-bottom: 100px; width: 305px;"
/>
<div
class="flex items-center justify-center p-4 space-x-4 w-[325px] rounded-3xl border border-white border-opacity-50"
class="flex items-center justify-center p-4 space-x-4 w-[325px] rounded-3xl border border-white/50"
style="width: 305px;"
/>
</div>
Expand Down Expand Up @@ -59,11 +59,11 @@ exports[`ContributorsHome component > Contributors renders correctly 1`] = `
class="absolute flex justify-between h-full w-full"
>
<div
class="flex items-center justify-center p-4 space-x-4 w-[325px] rounded-3xl border border-white border-opacity-50"
class="flex items-center justify-center p-4 space-x-4 w-[325px] rounded-3xl border border-white/50"
style="left: -80px; top: 0px; position: absolute;"
/>
<div
class="flex items-center justify-center p-4 space-x-4 w-[325px] rounded-3xl border border-white border-opacity-50"
class="flex items-center justify-center p-4 space-x-4 w-[325px] rounded-3xl border border-white/50"
style="right: -80px; bottom: 0px; position: absolute;"
/>
</div>
Expand All @@ -72,10 +72,10 @@ exports[`ContributorsHome component > Contributors renders correctly 1`] = `
class="flex w-fit xl:ml-[244px] justify-between mt-10 mb-[87px] sm:space-x-[233px] space-x-10 md:mx-auto overflow-hidden sm:ml-0"
>
<div
class="flex items-center justify-center p-4 space-x-4 w-[325px] rounded-3xl border border-white border-opacity-50"
class="flex items-center justify-center p-4 space-x-4 w-[325px] rounded-3xl border border-white/50"
/>
<div
class="flex items-center justify-center p-4 space-x-4 w-[325px] rounded-3xl border border-white border-opacity-50"
class="flex items-center justify-center p-4 space-x-4 w-[325px] rounded-3xl border border-white/50"
style="margin-top: 40px;"
/>
</div>
Expand Down
6 changes: 3 additions & 3 deletions src/components/Documentation/Card/__tests__/__snapshots__/DocumentationCard.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ exports[`DocumentationCard component > renders correctly 1`] = `
class="w-full lg:w-1/3 p-3"
>
<div
class="bg-white bg-opacity-5 rounded-3xl border-2 border-white border-opacity-50 shadow-sm overflow-hidden"
class="bg-white/5 rounded-3xl border-2 border-white/50 shadow-xs overflow-hidden"
>
<div
class="p-4"
Expand Down Expand Up @@ -46,13 +46,13 @@ exports[`DocumentationCard component > renders correctly 1`] = `
class="divide-y divide-gray-200"
>
<a
class="block px-4 py-2 hover:bg-white hover:bg-opacity-10"
class="block px-4 py-2 hover:bg-white/10"
href="/en/link1"
>
Link1
</a>
<a
class="px-4 py-2 hover:bg-white hover:bg-opacity-10 flex justify-between items-center"
class="px-4 py-2 hover:bg-white/10 flex justify-between items-center"
href="https://external-link"
rel="noopener noreferrer"
target="_blank"
Expand Down
6 changes: 3 additions & 3 deletions src/components/Documentation/Card/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const DocumentationCard = ({ links, title, Icon }: Props): JSX.Element | null =>

return (
<div className="w-full lg:w-1/3 p-3">
<div className="bg-white bg-opacity-5 rounded-3xl border-2 border-white border-opacity-50 shadow-sm overflow-hidden">
<div className="bg-white/5 rounded-3xl border-2 border-white/50 shadow-xs overflow-hidden">
<div className="p-4">
<p className="mb-3 text-xl font-semibold flex items-center">
<span className="inline-block mr-2">
Expand All @@ -37,15 +37,15 @@ const DocumentationCard = ({ links, title, Icon }: Props): JSX.Element | null =>
key={link.link}
target="_blank"
rel="noopener noreferrer"
className="px-4 py-2 hover:bg-white hover:bg-opacity-10 flex justify-between items-center"
className="px-4 py-2 hover:bg-white/10 flex justify-between items-center"
>
{link.name} <FaExternalLinkAlt size={13} />
</a>
) : (
<Link
to={link.link}
key={link.link}
className="block px-4 py-2 hover:bg-white hover:bg-opacity-10"
className="block px-4 py-2 hover:bg-white/10"
>
{link.name}
</Link>
Expand Down
4 changes: 2 additions & 2 deletions src/components/FAQ/__tests__/__snapshots__/FAQ.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ exports[`FAQ component > renders correctly 1`] = `
class="mx-auto max-w-[1264px] py-8 lg:py-12 px-4 xl:px-0 flex flex-col gap-[64px] lg:gap-3 items-center lg:items-start lg:flex-row justify-between undefined "
>
<div
class=" md:max-w-[420px] bg-white bg-opacity-5 rounded-3xl border border-white border-opacity-50 backdrop-blur-xl w-full md:h-[552px] p-[24px] flex flex-col justify-between"
class=" md:max-w-[420px] bg-white/5 rounded-3xl border border-white/50 backdrop-blur-xl w-full md:h-[552px] p-[24px] flex flex-col justify-between"
>
<div>
<h3
Expand All @@ -22,7 +22,7 @@ exports[`FAQ component > renders correctly 1`] = `
</div>
<div>
<p
class="text-[20px] font-semibold"
class="text-[20px] font-semibold pb-4"
>
Have a question that hasn’t been answered? Get in touch
</p>
Expand Down
4 changes: 2 additions & 2 deletions src/components/FAQ/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const FAQ: React.FC<FAQProps> = ({ className }) => {
<div
className={`mx-auto max-w-[1264px] py-8 lg:py-12 px-4 xl:px-0 flex flex-col gap-[64px] lg:gap-3 items-center lg:items-start lg:flex-row justify-between ${className} `}
>
<div className=" md:max-w-[420px] bg-white bg-opacity-5 rounded-3xl border border-white border-opacity-50 backdrop-blur-xl w-full md:h-[552px] p-[24px] flex flex-col justify-between">
<div className=" md:max-w-[420px] bg-white/5 rounded-3xl border border-white/50 backdrop-blur-xl w-full md:h-[552px] p-[24px] flex flex-col justify-between">
<div>
<h3 className="text-[30px] sm:text-[40px] font-semibold leading-9 sm:leading-[48px]">
Frequently asked questions
Expand All @@ -25,7 +25,7 @@ const FAQ: React.FC<FAQProps> = ({ className }) => {
</p>
</div>
<div>
<p className="text-[20px] font-semibold">
<p className="text-[20px] font-semibold pb-4">
Have a question that hasn’t been answered? Get in touch
</p>
<button className="rounded-2xl bg-transparent gradient-border border-2 border-pink-500/0 text-white text-base leading-6 font-bold w-[154px] h-[48px] block ">
Expand Down
4 changes: 2 additions & 2 deletions src/components/Footer/__tests__/__snapshots__/Footer.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ exports[`Footer component > renders correctly 1`] = `
class="hidden md:block"
>
<div
class="grid grid-cols-1 gap-8 border-b border-gray-800 mb-3 pt-8 sm:grid-cols-2 lg:grid-cols-4 lg:pt-16"
class="grid grid-cols-1 gap-8 border-b border-gray-800 mb-3 pt-8 sm:grid-cols-2 lg:grid-cols-4 lg:pt-16 pb-6"
>
<div>
<p
Expand Down Expand Up @@ -313,7 +313,7 @@ exports[`Footer component > renders correctly 1`] = `
</div>
</div>
<div
class="sm:flex sm:items-center sm:justify-between"
class="sm:flex sm:items-center sm:justify-between pt-4"
>
<div
class="text-teal-600 flex dark:text-teal-300"
Expand Down
Loading