Skip to content

Commit ec3243a

Browse files
authored
Merge branch 'web-release-3' into web-r-3-rem
2 parents 26461f9 + d8ef58c commit ec3243a

File tree

19 files changed

+627
-541
lines changed

19 files changed

+627
-541
lines changed
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Greet on User First PR Merge
2+
3+
on:
4+
pull_request:
5+
types: [closed]
6+
7+
jobs:
8+
greet:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/github-script@v4
12+
with:
13+
github-token: ${{ secrets.GITHUB_TOKEN }}
14+
script: |
15+
const prNumber = context.payload.pull_request.number;
16+
const authorLogin = context.payload.pull_request.user.login;
17+
18+
const firstPR = await github.issues.listForRepo({
19+
owner: context.repo.owner,
20+
repo: context.repo.repo,
21+
pull_requests: {
22+
state: 'closed',
23+
author: authorLogin,
24+
},
25+
});
26+
27+
console.log(firstPR.data.length);
28+
29+
if (firstPR.data.length === 1) {
30+
const greetingMessage = ` Congratulations, @${authorLogin} for your first pull request merge in this repository! 🎉🎉. Thanks for your contribution to JSON Schema! `;
31+
32+
await github.issues.createComment({
33+
owner: context.repo.owner,
34+
repo: context.repo.repo,
35+
issue_number: prNumber,
36+
body: greetingMessage
37+
});
38+
}

CODEOWNERS

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
##############################################################
2+
#
3+
# List of approvers/reviewers for JSON Schema website
4+
#
5+
##############################################################
6+
#
7+
# Get in touch with us via the JSON Schema Community
8+
# https://json-schema.org/#community
9+
#
10+
#
11+
# Learn about CODEOWNERS file format:
12+
# https://help.github.com/en/articles/about-code-owners
13+
#
14+
15+
# This group will be the default group approving/reviewing PRs
16+
* @json-schema-org/web-team

components/Accordion.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const Accordion: React.FC<AccordionProps> = ({ items }) => {
5656
activeIndex === index ? 'max-h-96' : 'max-h-20'
5757
} ${index === items.length - 1 ? 'border-b-2' : ''}`}
5858
>
59-
<div className='flex justify-between items-center p-4 cursor-pointer'>
59+
<div className='flex justify-between p-4 pl-2 cursor-pointer'>
6060
<div className='text-[20px]'>
6161
<a
6262
href={`#${item.id}`}
@@ -69,7 +69,7 @@ const Accordion: React.FC<AccordionProps> = ({ items }) => {
6969
</a>
7070
</div>
7171
<div
72-
className={`transform transition-transform text-[20px] ${
72+
className={`transform transition-transform duration-200 max-h-7 text-[20px] ${
7373
activeIndex === index ? 'rotate-45' : ''
7474
}`}
7575
onClick={() => handleToggle(index)}
@@ -80,7 +80,7 @@ const Accordion: React.FC<AccordionProps> = ({ items }) => {
8080
{activeIndex === index && (
8181
<div
8282
id={`${item.id}`}
83-
className='p-2 text-gray-500 dark:text-slate-200'
83+
className='p-2 text-gray-500 dark:text-slate-200 pb-4'
8484
>
8585
{item.answer}
8686
</div>

components/Card.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,30 +31,30 @@ const CardBody = ({
3131
large: 'text-[1.5rem]',
3232
};
3333
return (
34-
<div className='group relative h-full w-full max-w-lg rounded-lg border border-gray-200 bg-white p-6 px-12 shadow-3xl transition-colors delay-[150ms] ease-in-out hover:bg-slate-100'>
34+
<div className='group relative h-full w-full max-w-md rounded-lg border border-gray-200 bg-white p-6 px-12 shadow-3xl dark:shadow-2xl dark:shadow-slate-900 transition-colors ease-in-out hover:bg-slate-100 dark:bg-slate-800 hover:dark:bg-slate-900/30'>
3535
<div className='flex justify-center '>
3636
{image && <img src={image} className='h-32 p-2' />}
3737
</div>
3838
<div className='flex flex-row items-start mb-6'>
3939
{icon && (
40-
<span className='mr-6 flex h-14 w-14 flex-shrink-0 items-center justify-center rounded-lg border bg-blue-200 px-3 text-gray-900'>
40+
<span className='mr-6 flex h-14 w-14 flex-shrink-0 items-center justify-center rounded-lg border bg-blue-200 px-3 text-gray-900 dark:text-white'>
4141
<img src={icon} alt={title} className='h-full w-full' />
4242
</span>
4343
)}
4444
<p
45-
className={`mb-1 mt-1 items-center font-bold text-gray-900 ${headerSizeClasses[headerSize || 'medium']}`}
45+
className={`mb-1 mt-1 items-center font-bold text-gray-900 dark:text-white ${headerSizeClasses[headerSize || 'medium']}`}
4646
>
4747
{title}
4848
</p>
4949
</div>
5050
<hr className='mb-4 mt-3.5 h-px border-0 bg-gray-400' />
5151
<p
52-
className={`mb-8 dark:text-black mt-5 ${bodyTextSizeClasses[bodyTextSize || 'medium']} `}
52+
className={`mb-8 text-black mt-5 dark:text-white ${bodyTextSizeClasses[bodyTextSize || 'medium']} `}
5353
>
5454
<TextTruncate element='span' line={3} text={body} />
5555
</p>
5656
{link && (
57-
<p className='absolute bottom-3 right-5 font-medium opacity-0 transition-opacity delay-150 ease-in-out group-hover:opacity-100 dark:text-black'>
57+
<p className='absolute bottom-3 right-5 font-medium opacity-0 transition-opacity delay-150 ease-in-out group-hover:opacity-100 text-black dark:text-white '>
5858
Read More
5959
</p>
6060
)}

components/Faq.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default function Faq({ category }: { category: string }) {
77

88
return (
99
<section>
10-
<div className='max-w-screen-md mx-auto p-8'>
10+
<div className='max-w-screen-md mx-auto p-8 px-0 ml-0'>
1111
<h2 className='text-2xl font-bold text-[24px] mb-4'>
1212
{category.toUpperCase()}
1313
</h2>

components/Layout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ export const SegmentHeadline = ({ label }: { label: string }) => {
312312
const Footer = () => (
313313
<footer
314314
className={classnames(
315-
'z-10 h-[350px] md:h-[300px] bg-gradient-to-r from-startBlue from-1.95% to-endBlue dark:from-[#002C34] dark:to-[#023e8a] clip-top grid items-center',
315+
'z-10 h-[350px] md:h-[300px] bg-gradient-to-r from-startBlue from-1.95% to-endBlue dark:from-[#002C34] dark:to-[#023e8a] clip-top grid items-center mt-16',
316316
)}
317317
>
318318
<div className='max-w-[1400px] mx-auto mt-8 md:mt-4 grid grid-cols-1 md:grid-cols-2 md:w-1/2 lg:w-1/3 justify-center '>

components/Sidebar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ const getDocsPath = [
9696
'/overview/similar-technologies',
9797
'/overview/use-cases',
9898
'/overview/code-of-conduct',
99-
'/overview/FAQ',
99+
'/overview/faq',
100100
];
101101
const getStartedPath = [
102102
'/learn/json-schema-examples',

0 commit comments

Comments
 (0)