diff --git a/src/components/Layout/layout.scss b/src/components/Layout/layout.scss index 6e5f321e..3ec20fc8 100644 --- a/src/components/Layout/layout.scss +++ b/src/components/Layout/layout.scss @@ -1,4 +1,4 @@ -@import "../../styles/variables.scss"; +@use "../../styles/variables.scss" as *; :root { --border-radius: 4px; @@ -6,9 +6,9 @@ --color-primary: #7026b9; --color-code-bg: grey; --color-code: white; - --font-sans: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, + --font-sans: -apple-system, blinkmacsystemfont, "Segoe UI", helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; - --font-mono: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", + --font-mono: sfmono-regular, menlo, monaco, consolas, "Liberation Mono", "Courier New", monospace; --font-lg: 18px; --font-md: 16px; @@ -27,6 +27,7 @@ --size-gutter: var(--space-5); --size-gap: var(--space-6); } + html { -webkit-text-size-adjust: 100%; box-sizing: border-box; @@ -35,6 +36,7 @@ html { line-height: var(--line-height-normal); overflow-y: scroll; } + body { -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; @@ -45,16 +47,19 @@ body { margin: 0; word-wrap: break-word; } + abbr[title] { border-bottom: 1px dotted hsla(0, 0%, 0%, 0.5); cursor: help; text-decoration: none; } + b, strong { font-weight: inherit; font-weight: bolder; } + dfn { font-style: italic; } @@ -63,6 +68,7 @@ img { border-style: none; max-width: 100%; } + code, kbd, pre, @@ -71,6 +77,7 @@ samp { font-size: 1em; line-height: inherit; } + hr { box-sizing: content-box; overflow: visible; @@ -83,15 +90,19 @@ hr { border: none; height: 1px; } + * { box-sizing: inherit; } + *:before { box-sizing: inherit; } + *:after { box-sizing: inherit; } + hgroup, img, figure, @@ -105,6 +116,7 @@ p { padding: 0; margin-bottom: var(--space-4); } + pre { margin-left: 0; margin-right: 0; @@ -118,15 +130,18 @@ pre { word-wrap: normal; padding: var(--space-4); } + b, strong, dt, th { font-weight: bold; } + blockquote *:last-child { margin-bottom: 0; } + p *:last-child { margin-bottom: 0; } @@ -134,20 +149,25 @@ p *:last-child { code { font-size: 0.875rem; } + kbd { font-size: 0.875rem; } + samp { font-size: 0.875rem; } + abbr { border-bottom: 1px dotted hsla(0, 0%, 0%, 0.5); cursor: help; } + acronym { border-bottom: 1px dotted hsla(0, 0%, 0%, 0.5); cursor: help; } + tt, code { background-color: var(--color-code-bg); @@ -158,9 +178,11 @@ code { padding-top: 0.25em; word-break: normal; } + pre code { background: none; } + code:before, code:after, tt:before, @@ -168,9 +190,10 @@ tt:after { content: "\00a0"; letter-spacing: -0.2em; } + pre code:before, pre code:after, pre tt:before, pre tt:after { content: none; -} +} \ No newline at end of file diff --git a/src/components/Marketplace/AllReleaseCard/index.tsx b/src/components/Marketplace/AllReleaseCard/index.tsx index 69dd8538..564d77a1 100644 --- a/src/components/Marketplace/AllReleaseCard/index.tsx +++ b/src/components/Marketplace/AllReleaseCard/index.tsx @@ -54,7 +54,16 @@ const AllReleaseCard = ({ results }) => {
Download ({fetchExtension(release.binary.package.name)}) diff --git a/src/components/PageHeader/index.tsx b/src/components/PageHeader/index.tsx index 703a0833..3ed7a2fb 100644 --- a/src/components/PageHeader/index.tsx +++ b/src/components/PageHeader/index.tsx @@ -4,7 +4,7 @@ import { RedIcon } from "../Common/Icon" interface Props { title: string subtitle: string - description?: string + description?: string | React.ReactNode className?: string } diff --git a/src/components/Temurin/Features/Features.scss b/src/components/Temurin/Features/Features.scss index 25eeb2b5..0668e2ee 100644 --- a/src/components/Temurin/Features/Features.scss +++ b/src/components/Temurin/Features/Features.scss @@ -1,4 +1,4 @@ -@import "../../../styles/variables.scss"; +@use "../../../styles/variables.scss" as *; .temurin-features { position: relative; diff --git a/src/components/Testimonials/Testimonials.scss b/src/components/Testimonials/Testimonials.scss index 10a3f393..c5007178 100644 --- a/src/components/Testimonials/Testimonials.scss +++ b/src/components/Testimonials/Testimonials.scss @@ -1,4 +1,4 @@ -@import "../../styles/variables.scss"; +@use "../../styles/variables.scss" as *; .arrow-button { border-radius: 50%; diff --git a/src/components/UiVirtualScroll/UiVirtualScroll.scss b/src/components/UiVirtualScroll/UiVirtualScroll.scss index 39f8c72f..5d8c422c 100644 --- a/src/components/UiVirtualScroll/UiVirtualScroll.scss +++ b/src/components/UiVirtualScroll/UiVirtualScroll.scss @@ -1,4 +1,4 @@ -@import "../../styles/variables.scss"; +@use "../../styles/variables.scss" as *; .scroll-container { position: relative; diff --git a/src/components/WorkingGroup/Support/__tests__/Support.test.tsx b/src/components/WorkingGroup/Support/__tests__/Support.test.tsx new file mode 100644 index 00000000..f501824c --- /dev/null +++ b/src/components/WorkingGroup/Support/__tests__/Support.test.tsx @@ -0,0 +1,12 @@ +import React from "react" +import { render } from "@testing-library/react" +import { describe, expect, it } from "vitest" +import Support from "../index" + +describe("Working Group Support component", () => { + it("should render correctly", () => { + const { container } = render() + + expect(container).toMatchSnapshot() + }) +}) diff --git a/src/components/WorkingGroup/Support/__tests__/__snapshots__/Support.test.tsx.snap b/src/components/WorkingGroup/Support/__tests__/__snapshots__/Support.test.tsx.snap new file mode 100644 index 00000000..f744fda2 --- /dev/null +++ b/src/components/WorkingGroup/Support/__tests__/__snapshots__/Support.test.tsx.snap @@ -0,0 +1,67 @@ +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html + +exports[`Working Group Support component > should render correctly 1`] = ` +
+
+
+
+
+

+ Support the Elcipse Adoptium Working Group +

+

+ Lorem ipsum dolor sit amet consectetur. Ante cursus adipiscing feugiat aliquam. Adipiscing nulla arcu turpis tortor leo integer justo. Ut turpis adipiscing aliquam phasellus aliquam. Lectus etiam dictum nunc magna gravida bibendum nibh aliquam. Eget arcu neque cursus mattis sollicitudin malesuada urna ridiculus metus. Pharetra volutpat neque fames gravida tellus. +

+
+
+

+ Nibh arcu consequat aliquet in eget non. Turpis id posuere quam sit magnis. Aliquam imperdiet odio odio vulputate. Vel molestie porttitor tellus accumsan. Dui ipsum fringilla sit sit elementum. +

+
+ +
+
+
+
+

+ Media & Promotion +

+

+ Eclipse Temurin offers high-performance, cross-platform, open-source Java runtime +

+
+ +
+
+
+
+
+`; diff --git a/src/components/WorkingGroup/Support/index.tsx b/src/components/WorkingGroup/Support/index.tsx new file mode 100644 index 00000000..8eba78ae --- /dev/null +++ b/src/components/WorkingGroup/Support/index.tsx @@ -0,0 +1,49 @@ +import React from "react" +import "./support.scss" +import CommonHeading from "../../Common/CommonHeading" + +const Support = () => { + return ( +
+
+
+ + + +
+
+
+
+

+ Media & Promotion +

+

+ Eclipse Temurin offers high-performance, cross-platform, + open-source Java runtime +

+
+ +
+
+
+
+ ) +} + +export default Support \ No newline at end of file diff --git a/src/components/WorkingGroup/Support/support.scss b/src/components/WorkingGroup/Support/support.scss new file mode 100644 index 00000000..e6fd2933 --- /dev/null +++ b/src/components/WorkingGroup/Support/support.scss @@ -0,0 +1,15 @@ +.gradient-supportus { + border-radius: 80px; + border: solid 2px transparent; + background-image: linear-gradient(#200d46, #200d46), + linear-gradient(90deg, #ff1464, #ff14620b); + background-origin: border-box; + background-clip: content-box, border-box; + cursor: pointer; + transition: ease-in-out; + transition-duration: 300ms; + + &:hover { + transform: scale(110%); + } + } diff --git a/src/pages/__tests__/__snapshots__/download.test.tsx.snap b/src/pages/__tests__/__snapshots__/download.test.tsx.snap index 331779e7..cc55852d 100644 --- a/src/pages/__tests__/__snapshots__/download.test.tsx.snap +++ b/src/pages/__tests__/__snapshots__/download.test.tsx.snap @@ -4,188 +4,204 @@ exports[`Download page > renders correctly - no link 1`] = `null`; exports[`Download page > renders correctly - vendor 1`] = `
-
+
+
+
+
+
-

- Thank you for your download! -

-

+ + + + +

+ Download Success +
+
+
+ Thank you for your download! +
+
+
+ You are downloading a build from Azul - , a member of the Eclipse Adoptium Working Group. -

-

- For support and next steps please visit theĀ  - - Azul - - Website - - . -

-

- - - - - - - - Text - - -

- -

- If the download doesn't start in a few seconds, please + , a member of the Eclipse Adoptium Working Group. If the download doesn't start in a few seconds, please - - click here - - to start the download. -

-

- Donate to the Eclipse Adoptium Working Group -

-

- You can help power the Adoptium Community with a donation -

- + click here + + + + to start the download. +
+
+
+
+
+ +
+

+ What to do now? +

+

+ Feugiat ullamcorper justo dolor arcu ut porttitor ultrices rutrum. Eget molestie sit tellus viverra. Bibendum at ut eu feugiat tellus diam turpis. Massa posuere ornare dignissim orci consequat. +

+ +
+
+
+
+
+
+

- - - - Become a GitHub Sponsor! - -

- Get involved -

-

- Whether you choose to - - +

- report bugs - - , request features, or - - +

+
+

- become a committer - - , you can help improve the technology for yourself and the rest of the community. -

-

+

+
+
+
- View our Members - +
+

+ Media & Promotion +

+

+ Eclipse Temurin offers high-performance, cross-platform, open-source Java runtime +

+
+ +
@@ -194,172 +210,200 @@ exports[`Download page > renders correctly - vendor 1`] = ` exports[`Download page > renders correctly 1`] = `
-
+
+
+
+
+
-

- Thank you for your download! -

-

- You are downloading an Eclipse Temurin build, the open-source community build from the Eclipse Adoptium Working Group. -

-

- - - - - - - - Text - - -

- -

+ + + +

+ Download Success +
+
+
+ Thank you for your download! +
+
+
- If the download doesn't start in a few seconds, please + + You are downloading an Eclipse Temurin build, the open-source community build from the Eclipse Adoptium Working Group. If the download doesn't start in a few seconds, please - - click here - - to start the download. -

-

- Eclipse Temurin binaries are 100% free and open source and used by millions of developers every day. Here are three easy ways you can contribute toward the future development of Eclipse Adoptium projects and technologies. -

-

- Donate to the Eclipse Adoptium Working Group -

-

- You can help power the Adoptium Community with a donation -

- + click here + + + + to start the download. +
+
+
+
+
+ +
+

+ What to do now? +

+

+ Feugiat ullamcorper justo dolor arcu ut porttitor ultrices rutrum. Eget molestie sit tellus viverra. Bibendum at ut eu feugiat tellus diam turpis. Massa posuere ornare dignissim orci consequat. +

+ +
+
+
+
+
+
+

- - - - Become a GitHub Sponsor! - -

- Get involved -

-

- Whether you choose to - - +

- report bugs - - , request features, or - - +

+
+

- become a committer - - , you can help improve the technology for yourself and the rest of the community. -

-

- Join the Working Group -

- +
+
+
+
- View our Members - +
+

+ Media & Promotion +

+

+ Eclipse Temurin offers high-performance, cross-platform, open-source Java runtime +

+
+ +
diff --git a/src/pages/download.tsx b/src/pages/download.tsx index 35d2d5d8..7d1209af 100644 --- a/src/pages/download.tsx +++ b/src/pages/download.tsx @@ -1,13 +1,20 @@ import React, { useEffect } from "react" -import { Link, graphql, navigate } from "gatsby" -import { BiDonateHeart } from "react-icons/bi" -import { SiGithubsponsors } from "react-icons/si" + +// Extend the Window interface to include gtag +declare global { + interface Window { + gtag?: (...args: any[]) => void; + } +} + +import { graphql } from "gatsby" import vendors from "../json/marketplace.json" import Layout from "../components/Layout" +import PageHeader from "../components/PageHeader" +import ImageText from "../components/ImageText" import Seo from "../components/Seo" -import { BsShieldCheck } from "react-icons/bs" -import { Trans } from "gatsby-plugin-react-i18next" -import ChecksumModal from "../components/ChecksumModal" +import { capitalize } from "../util/capitalize"; +import Support from "../components/WorkingGroup/Support"; const DownloadPage = ({ location }) => { let link, checksum, os, arch, type, version, vendor, postDownload @@ -41,9 +48,9 @@ const DownloadPage = ({ location }) => { const shouldRedirect = !link useEffect(() => { - if (shouldRedirect) { - navigate("/temurin/releases") - } + // if (shouldRedirect) { + // navigate("/temurin/releases") + // } }, []) if (shouldRedirect) { @@ -52,125 +59,44 @@ const DownloadPage = ({ location }) => { return ( -
-
-
-

Thank you for your download!

+ + {link && (vendor === "Adoptium" ? ( -

+ <> You are downloading an Eclipse Temurin build, the open-source - community build from the Eclipse Adoptium Working Group. -

+ community build from the Eclipse Adoptium Working Group. If the + download doesn't start in a few seconds, please{" "} + + click here + {" "} + to start the download. + ) : ( <> -

- You are downloading a build from {vendor}, - a member of the Eclipse Adoptium Working Group. -

- {postDownload && ( -

- For support and next steps please visit the  - - {vendor === "IBM" ? "IBM Semeru Runtimes" : vendor}{" "} - Website - - . -

- )} + You are downloading a build from {capitalize(vendor)}, + a member of the Eclipse Adoptium Working Group. If the download + doesn't start in a few seconds, please{" "} + + click here + {" "} + to start the download. ))} - - {checksum && ( - <> -

- - - View checksum file - - -

- - )} - - {link && ( - <> - -

- If the download doesn't start in a few seconds, please{" "} - click here to start the download. -

- - )} - - {vendor === "Adoptium" && ( -

- Eclipse Temurin binaries are 100% free and open source and used - by millions of developers every day. Here are three easy ways - you can contribute toward the future development of Eclipse - Adoptium projects and technologies. -

- )} -

- Donate to the Eclipse Adoptium Working Group -

-

You can help power the Adoptium Community with a donation

- - Donate - - - {" "} - Become a GitHub Sponsor! - -

Get involved

-

- Whether you choose to{" "} - - report bugs - - , request features, or{" "} - become a committer, - you can help improve the technology for yourself and the rest of - the community. -

-

Join the Working Group

- - Join the Working group - - - View our Members - -
-
- {/* */} -
+ + } + /> + +
) } diff --git a/src/styles/global.scss b/src/styles/global.scss index eba5bfb7..badcc24f 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -1,8 +1,8 @@ +@use "variables" as *; +@use "tailwindcss/base" as base; +@use "tailwindcss/components" as components; +@use "tailwindcss/utilities" as utilities; @import "https://fonts.googleapis.com/css2?family=Hanken+Grotesk:wght@100;200;300;400;500;600;700;800;900&display=swap"; -@import "variables"; -@tailwind base; -@tailwind components; -@tailwind utilities; body { font-family: "Hanken Grotesk", sans-serif !important; diff --git a/static/images/icons/edit.svg b/static/images/icons/edit.svg index 61a4814d..ba4d1246 100644 --- a/static/images/icons/edit.svg +++ b/static/images/icons/edit.svg @@ -10,7 +10,7 @@ - + diff --git a/static/images/icons/lock.svg b/static/images/icons/lock.svg index 0e28bdd1..ba581cad 100644 --- a/static/images/icons/lock.svg +++ b/static/images/icons/lock.svg @@ -2,11 +2,11 @@ - + - + diff --git a/static/images/icons/message.svg b/static/images/icons/message.svg index 36e8e77b..0e578191 100644 --- a/static/images/icons/message.svg +++ b/static/images/icons/message.svg @@ -18,7 +18,7 @@ @@ -40,7 +40,7 @@ rx="2.47329" transform="rotate(90 87.3719 54.2448)" stroke="url(#paint3_linear_401_658)" - stroke-width="0.489516" + strokeWidth="0.489516" /> @@ -62,7 +62,7 @@ rx="2.75524" transform="rotate(90 79.7552 70.2448)" stroke="url(#paint5_linear_401_658)" - stroke-width="0.489516" + strokeWidth="0.489516" /> diff --git a/static/images/netlify-light.svg b/static/images/netlify-light.svg index 45b545d5..42b14887 100644 --- a/static/images/netlify-light.svg +++ b/static/images/netlify-light.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/static/images/projects/aqavit-project.svg b/static/images/projects/aqavit-project.svg index 25a7a067..00d56ceb 100644 --- a/static/images/projects/aqavit-project.svg +++ b/static/images/projects/aqavit-project.svg @@ -11,7 +11,7 @@ } .cls-2, .cls-3 { - stroke-width: 0px; + strokeWidth: 0px; } .cls-4 {