diff --git a/package-lock.json b/package-lock.json index 1bd2036..5471457 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,6 +19,7 @@ "@mdx-js/react": "^1.6.22", "ahooks": "^3.7.0", "clsx": "^1.1.1", + "dev-website-tailwind-config": "github:merico-dev/dev-website-tailwind-config", "framer-motion": "^6.5.1", "postcss-gap-properties": "^3.0.5", "prism-react-renderer": "^1.3.1", @@ -5883,6 +5884,11 @@ "node": ">=0.8.0" } }, + "node_modules/dev-website-tailwind-config": { + "version": "1.0.0", + "resolved": "git+ssh://git@github.com/merico-dev/dev-website-tailwind-config.git#62017898d43897acc108183cf8313e96e8083b25", + "license": "ISC" + }, "node_modules/didyoumean": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", @@ -18362,6 +18368,10 @@ "minimist": "^1.2.6" } }, + "dev-website-tailwind-config": { + "version": "git+ssh://git@github.com/merico-dev/dev-website-tailwind-config.git#62017898d43897acc108183cf8313e96e8083b25", + "from": "dev-website-tailwind-config@https://github.com/merico-dev/dev-website-tailwind-config" + }, "didyoumean": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", diff --git a/package.json b/package.json index ee90c5d..891810e 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "@mdx-js/react": "^1.6.22", "ahooks": "^3.7.0", "clsx": "^1.1.1", + "dev-website-tailwind-config": "github:merico-dev/dev-website-tailwind-config", "framer-motion": "^6.5.1", "postcss-gap-properties": "^3.0.5", "prism-react-renderer": "^1.3.1", diff --git a/src/components/ContributorPage/contributors-new.tsx b/src/components/ContributorPage/contributors-new.tsx index d5855fc..c6ca1eb 100644 --- a/src/components/ContributorPage/contributors-new.tsx +++ b/src/components/ContributorPage/contributors-new.tsx @@ -28,7 +28,7 @@ export const DocPageSection = styled.div` export const Skills = ({ skills }: { skills: string[] }) => { return (
- + Skills
@@ -48,10 +48,10 @@ export const Skills = ({ skills }: { skills: string[] }) => { function BadgeInfo({ badgeInfo }: { badgeInfo: IBadgeInfo }) { return ( <> - + {badgeInfo.badge.type} - + {badgeInfo.badge.achievement}
{badgeInfo.description}
@@ -88,9 +88,9 @@ const ContributorList = ({ contributors: IContributorInfo[]; }) => { return ( - + -
+
{contributors.map((it) => ( ))} diff --git a/src/components/ContributorPage/contributors-old.tsx b/src/components/ContributorPage/contributors-old.tsx index 72c9cb2..a794a6f 100644 --- a/src/components/ContributorPage/contributors-old.tsx +++ b/src/components/ContributorPage/contributors-old.tsx @@ -34,7 +34,7 @@ const ContributorTable = ({ const rows = chain(contributors).chunk(colCount).value(); return (
- {title} + {title}
{
- + Old Certification
{title}

{description} diff --git a/src/components/discover-devops.js b/src/components/discover-devops.js index 208b079..0221e40 100644 --- a/src/components/discover-devops.js +++ b/src/components/discover-devops.js @@ -10,15 +10,15 @@ export const DiscoverDevops = () => { " > Discover DevOps Workflow with DevStream Quick Start diff --git a/src/components/how-dev-stream-works.js b/src/components/how-dev-stream-works.js index ddf4140..eef9e88 100644 --- a/src/components/how-dev-stream-works.js +++ b/src/components/how-dev-stream-works.js @@ -31,7 +31,7 @@ export const HowDevStreamWorks = () => {

How DevStream Works

@@ -48,13 +48,13 @@ export const HowDevStreamWorks = () => { lg:items-start lg:text-start" > {title} -
+
{desc}
@@ -64,7 +64,7 @@ export const HowDevStreamWorks = () => { className="text-[14px] leading-[1.2] text-primary mt-5 w-fit self-center lg:self-start hover:no-underline - lg:text-heading2 + lg:text-heading2stream hover:text-primary-light floating-link " diff --git a/src/components/why-dev-stream.js b/src/components/why-dev-stream.js index 3bc57a6..5fecf45 100644 --- a/src/components/why-dev-stream.js +++ b/src/components/why-dev-stream.js @@ -76,7 +76,7 @@ export const WhyDevStream = () => {
@@ -87,15 +87,15 @@ export const WhyDevStream = () => {
Worry no more. DevStream will get you covered. @@ -120,7 +120,7 @@ const MsgBox = ({ children, className }) => { className={clsx( className, 'bg-white max-w-full rounded-[20px] px-3 py-4 relative mb-3', - 'sm:px-6', + 'sm2:px-6', 'lg:px-8 lg:py-[40px]', 'drop-shadow-xl shadow-lg shadow-primary-light/10' )} @@ -145,8 +145,8 @@ const Reason = ({ children, className }) => {
diff --git a/src/css/custom.css b/src/css/custom.css index 5555e25..1dc3f14 100644 --- a/src/css/custom.css +++ b/src/css/custom.css @@ -40,14 +40,14 @@ html[data-theme='dark'] .docusaurus-highlight-code-line { @apply bg-primary hover:bg-primary-light; @apply flex items-center justify-center w-fit; @apply hover:no-underline hover:text-neutral-invert; - @apply text-neutral-invert text-[14px] leading-[1.21] font-bold lg:text-heading2; + @apply text-neutral-invert text-[14px] leading-[1.21] font-bold lg:text-heading2stream; @apply px-4 h-5 lg:px-5 lg:h-7; @apply rounded-[4.9px] lg:rounded-[10px]; @apply shadow-sm shadow-primary/20 lg:shadow-lg lg:shadow-primary/20; } .section-title { - @apply text-heading2 mb-5; + @apply text-heading2stream mb-5; @apply text-neutral-600 font-semibold; @apply lg:text-[40px] lg:leading-[1.2] lg:mb-6; } diff --git a/src/pages/index.js b/src/pages/index.js index 746a32a..71f5041 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -14,10 +14,10 @@ function HomepageHeader() {
DevStream:
@@ -42,9 +42,9 @@ function HomepageHeader() {
Choose the best DevOps tools that you love. @@ -60,7 +60,7 @@ function HomepageHeader() {
diff --git a/tailwind.config.js b/tailwind.config.js index ca1f38e..ea32e4e 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,60 +1,66 @@ /** @type {import('tailwindcss').Config} */ -module.exports = { - content: ['./src/**/*.{js,jsx,ts,tsx}'], - corePlugins: { - preflight: false, - }, - darkMode: ['class', '[data-theme="dark"]'], - theme: { - spacing: { - 1: '8px', - 2: '12px', - 3: '16px', - 4: '24px', - 5: '32px', - 6: '48px', - 7: '64px', - 8: '80px', - 9: '96px', - 10: '112px', - 11: '128px', - }, - extend: { - colors: { - primary: '#7497F7', - 'primary-light': '#99B3F9', - 'primary-100': '#F0F4FE', - 'primary-300': '#BDCEFB', - 'primary-500': '#7497F7', - 'primary-dark-light': '#2b3137', - 'primary-dark': '#20232a', - neutral: { - invert: '#FFFFFF', - 300: '#d4d4d8', - 400: '#70727F', - 600: '#292B3F', - }, - }, - fontSize: { - heading1: ['32px', { lineHeight: 1.25 }], - heading2: ['24px', { lineHeight: 1.25 }], - heading3: ['20px', { lineHeight: 1.25 }], - heading4: ['16px', { lineHeight: 1.25 }], - label14: ['14px', { lineHeight: 1.43 }], - label18: ['18px', { lineHeight: 1.56 }], - body: ['14px', { lineHeight: 1.214 }], - "body-sm": ['12px', { lineHeight: 1.25 }] - }, - dropShadow: { - xl: ['0px 3.2px 16px rgba(153, 179, 249, 0.1)'], - }, - boxShadow: { - sm: '0px 2.4px 4.8px -0.8px rgba(0, 0, 0, 0.2), 0px 1.6px 8px rgba(0, 0, 0, 0.2)', - lg: '0px 4.8px 9.6px -0.8px rgba(0, 0, 0, 0.2), 0px 3.2px 16px rgba(0, 0, 0, 0.2)', - lower: '0px 1.2px 2.4px -0.8px rgba(0, 0, 0, 0.1), 0px 0.8px 4px rgba(0, 0, 0, 0.07)', - high: '0px 9.6px 19.2px -0.8px rgba(0, 0, 0, 0.1), 0px 6.4px 32px rgba(0, 0, 0, 0.07)' - }, - }, - }, - plugins: [], -}; + +const {tailwindConfig} = require('dev-website-tailwind-config'); +module.exports = tailwindConfig; + + +// pre config +// module.exports = { +// content: ['./src/**/*.{js,jsx,ts,tsx}'], +// corePlugins: { +// preflight: false, +// }, +// darkMode: ['class', '[data-theme="dark"]'], +// theme: { +// spacing: { +// 1: '8px', +// 2: '12px', +// 3: '16px', +// 4: '24px', +// 5: '32px', +// 6: '48px', +// 7: '64px', +// 8: '80px', +// 9: '96px', +// 10: '112px', +// 11: '128px', +// }, +// extend: { +// colors: { +// primary: '#7497F7', +// 'primary-light': '#99B3F9', +// 'primary-100': '#F0F4FE', +// 'primary-300': '#BDCEFB', +// 'primary-500': '#7497F7', +// 'primary-dark-light': '#2b3137', +// 'primary-dark': '#20232a', +// neutral: { +// invert: '#FFFFFF', +// 300: '#d4d4d8', +// 400: '#70727F', +// 600: '#292B3F', +// }, +// }, +// fontSize: { +// heading1: ['32px', { lineHeight: 1.25 }], +// heading2: ['24px', { lineHeight: 1.25 }], +// heading3: ['20px', { lineHeight: 1.25 }], +// heading4: ['16px', { lineHeight: 1.25 }], +// label14: ['14px', { lineHeight: 1.43 }], +// label18: ['18px', { lineHeight: 1.56 }], +// body: ['14px', { lineHeight: 1.214 }], +// "body-sm": ['12px', { lineHeight: 1.25 }] +// }, +// dropShadow: { +// xl: ['0px 3.2px 16px rgba(153, 179, 249, 0.1)'], +// }, +// boxShadow: { +// sm: '0px 2.4px 4.8px -0.8px rgba(0, 0, 0, 0.2), 0px 1.6px 8px rgba(0, 0, 0, 0.2)', +// lg: '0px 4.8px 9.6px -0.8px rgba(0, 0, 0, 0.2), 0px 3.2px 16px rgba(0, 0, 0, 0.2)', +// lower: '0px 1.2px 2.4px -0.8px rgba(0, 0, 0, 0.1), 0px 0.8px 4px rgba(0, 0, 0, 0.07)', +// high: '0px 9.6px 19.2px -0.8px rgba(0, 0, 0, 0.1), 0px 6.4px 32px rgba(0, 0, 0, 0.07)' +// }, +// }, +// }, +// plugins: [], +// };