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

Jump to bottom

Feature/openjs foundation logo copyright #5

Merged
merged 7 commits into from
Apr 20, 2023
Merged

Feature/openjs foundation logo copyright #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d43b54a
Initial commit - added details and logo
PaulWaller Mar 30, 2023
a800ceb
Spans and columns
PaulWaller Mar 31, 2023
d537704
OpenJS responsive sizes
PaulWaller Mar 31, 2023
4c6760a
Replaced double quotes with single.
PaulWaller Apr 13, 2023
b3012f5
Replaced missed double quotes with singles
PaulWaller Apr 13, 2023
016f76a
OpenJS, revising responsive layout.
PaulWaller Apr 13, 2023
9009726
Adjusted footer padding padding and margin
PaulWaller Apr 13, 2023
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
24 changes: 20 additions & 4 deletions components/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ type Props = {

const responsiveClasses = 'w-full xl:w-[1200px] px-2 sm:px-4 lg:px-8'

export default function Layout ({ children, mainClassName, metaTitle, whiteBg, hideAds }: Props) {
export default function Layout({ children, mainClassName, metaTitle, whiteBg, hideAds }: Props) {
const showMobileNav = useStore(s => s.overlayNavigation === 'docs')
const router = useRouter()
React.useEffect(() => useStore.setState({ overlayNavigation: null }), [router.asPath])
Expand Down Expand Up @@ -65,6 +65,7 @@ export default function Layout ({ children, mainClassName, metaTitle, whiteBg, h
</div>

<Footer />
<OpenJS />
</div>
)
}
Expand Down Expand Up @@ -257,7 +258,7 @@ const DocLink = ({ uri, label }: { uri: string, label: string | React.ReactNode
}

const Footer = () => (
<footer className={classnames(responsiveClasses, 'mx-auto p-4 py-16 grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 ')}>
<footer className={classnames(responsiveClasses, 'mx-auto p-4 py-8 grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 ')}>
<div className='flex flex-col items-start'>
<div className='font-semibold text-sm text-slate-800 mb-1'>JSON Schema</div>
<Link href='/understanding-json-schema/reference/type'>
Expand All @@ -273,7 +274,7 @@ const Footer = () => (
<a className='text-sm text-slate-400 hover:text-slate-500 pt-3'>Blog</a>
</Link>
<Link href='/specification'>
<a className='text-sm text-slate-400 hover:text-slate-500 pt-3'>Specification</a>
<a className='text-sm text-slate-400 hover:text-slate-500 pt-3 sm:mb-4'>Specification</a>
</Link>
</div>
<div className='flex flex-col items-start mt-8 sm:mt-0'>
Expand All @@ -289,14 +290,29 @@ const Footer = () => (
<a href='https://github.com/json-schema-org/community/discussions' className='text-sm text-slate-400 hover:text-slate-500 pt-3'>GitHub Community Discussions</a>
<a href='https://groups.google.com/g/json-schema' className='text-sm text-slate-400 hover:text-slate-500 pt-3'>Google Groups</a>
</div>
<div className='flex flex-col items-start mt-8 sm:mt-16 lg:mt-0'>
<div className='flex flex-col items-start mt-8 sm:mt-0'>
<Logo />
<a href='https://opencollective.com/json-schema' className='text-sm text-slate-400 hover:text-slate-500 pt-3 mt-2'>Open Collective</a>
<a href='/understanding-json-schema/credits' className='text-sm text-slate-400 hover:text-slate-500 pt-3'>Acknowledgments</a>
</div>
</footer>
)

const OpenJS = () => (
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reviewed how this 2 columns footer looks like and I'd like to suggest trying single column approach like https://loopback.io/

Screenshot 2023-04-12 at 10 42 15

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pushed a commit revising the responsive layout for OpenJS artifacts and adjusted the overl padding and margins for the footer.

<div className={classnames(responsiveClasses, 'mx-auto flex flex-flow grid grid-cols-1 sm:grid-cols-2 md:grid-cols-4 gap-2')}>
<div className='flex flex-col items-start col-start-1 sm:inline md:inline lg:inline'>
<img className='h-16 mb-3.5' src='/img/logos/openjs_foundation-logo-horizontal-color.svg' alt='color openjs foundation logo'></img>
</div>
<div className='flex flex-col items-start col-start-1 md:col-span-3 sm:col-start-1 sm:col-span-2'>
<p className='text-sm mb-4'>Copyright <a className='text-blue-500 hover:text-blue-600' href='https://openjsf.org'>OpenJS Foundation</a> and JSON Schema contributors. All rights reserved. The <a className='text-blue-500 hover:text-blue-600' href='https://openjsf.org'>OpenJS Foundation</a> has registered trademarks and uses trademarks. For a list of trademarks of the <a className='text-blue-500 hover:text-blue-600' href='https://openjsf.org'>OpenJS Foundation</a>, please see our <a className='text-blue-500 hover:text-blue-600' href='https://trademark-policy.openjsf.org'>Trademark Policy</a> and <a className='text-blue-500 hover:text-blue-600' href='https://trademark-list.openjsf.org'>Trademark List</a>. Trademarks and logos not indicated on the <a className='text-blue-500 hover:text-blue-600' href='https://trademark-list.openjsf.org'>list of OpenJS Foundation trademarks</a> are trademarks&trade; or registered&reg; trademarks of their respective holders. Use of them does not imply any affiliation with or endorsement by them.</p>
<p className='text-sm mb-4 sm:mb-8'><a className='text-blue-500 hover:text-blue-600' href='https://openjsf.org'>The OpenJS Foundation</a> | <a className='text-blue-500 hover:text-blue-600' href='https://terms-of-use.openjsf.org'>Terms of Use</a> | <a className='text-blue-500 hover:text-blue-600' href='https://privacy-policy.openjsf.org'>Privacy Policy</a> | <a className='text-blue-500 hover:text-blue-600' href='https://bylaws.openjsf.org'>Bylaws</a> | <a className='text-blue-500 hover:text-blue-600' href='https://code-of-conduct.openjsf.org'>Code of Conduct</a> | <a className='text-blue-500 hover:text-blue-600' href='https://trademark-policy.openjsf.org'>Trademark Policy</a> | <a className='text-blue-500 hover:text-blue-600' href='https://trademark-list.openjsf.org'>Trademark List</a> | <a className='text-blue-500 hover:text-blue-600' href='https://www.linuxfoundation.org/cookies'>Cookie Policy</a></p>
</div>
<div className='relative mt-8 flex flex-col items-start col-start-1 col-span-2 sm:col-start-1 sm:col-span-2'>
<div className='absolute text-sm bottom-8'>© Copyright JSON Schema Organisation 2023</div>
</div>
</div>
)

const Logo = () => (
<Link href='/'>
<a>
Expand Down
67 changes: 67 additions & 0 deletions public/img/logos/openjs_foundation-logo-horizontal-color.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.