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

fix: Footer added #6830

Closed
wants to merge 7 commits into from
Closed

fix: Footer added #6830

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
017d6f7
issue #6829 fixed
Wellitsabhi Jun 11, 2024
fe5eccc
fix: footer for small screen
Wellitsabhi Jun 11, 2024
42efc73
fix: sticky footer
Wellitsabhi Jun 12, 2024
74c9e09
comment resolved
Wellitsabhi Jun 12, 2024
5880613
fix: Metabar border
Wellitsabhi Jun 17, 2024
bb1ddc8
Merge branch 'my-branch' of https://github.com/Wellitsabhi/nodejs.org…
Wellitsabhi Jun 17, 2024
da08c42
Merge branch 'nodejs:main' into my-branch
Wellitsabhi Jun 21, 2024
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
27 changes: 20 additions & 7 deletions components/Containers/Footer/index.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,18 @@
@apply flex
flex-col
items-center
gap-6
border-t
border-neutral-200
bg-white
py-4

dark:border-neutral-900
dark:bg-neutral-950
sm:gap-0
sm:px-8
sm:py-0
md:flex-row
md:justify-between
md:gap-6
md:py-5;

.sectionPrimary {
Expand All @@ -20,8 +22,9 @@
content-start
items-center
justify-center
gap-1
self-stretch;
self-stretch
sm:gap-0
md:gap-1;

a {
@apply whitespace-nowrap;
Expand All @@ -32,13 +35,23 @@
@apply flex
flex-col
items-center
gap-1
md:flex-row;
sm:gap-0
md:flex-row
md:gap-1;

.social {
@apply flex
items-center
gap-1;
sm:gap-0
md:gap-1;
}
}
}

.mobileFooter {
@apply block md:hidden;
}

.desktopFooter {
@apply hidden md:block;
}
9 changes: 9 additions & 0 deletions layouts/About.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import type { FC, PropsWithChildren } from 'react';

import WithBreadcrumbs from '@/components/withBreadcrumbs';
import WithFooter from '@/components/withFooter';
import WithMetaBar from '@/components/withMetaBar';
import WithNavBar from '@/components/withNavBar';
import WithSidebar from '@/components/withSidebar';
import ArticleLayout from '@/layouts/Article';

import styles from '/components/Containers/Footer/index.module.css';

const AboutLayout: FC<PropsWithChildren> = ({ children }) => (
<>
<WithNavBar />
Expand All @@ -17,10 +20,16 @@ const AboutLayout: FC<PropsWithChildren> = ({ children }) => (
<main>{children}</main>

<WithMetaBar />
<div className={styles.mobileFooter}>
<WithFooter />
</div>
</div>

<WithBreadcrumbs navKeys={['about', 'getInvolved']} />
</ArticleLayout>
<div className={styles.desktopFooter}>
<WithFooter />
</div>
</>
);

Expand Down
8 changes: 8 additions & 0 deletions layouts/Learn.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import type { FC, PropsWithChildren } from 'react';

import WithBreadcrumbs from '@/components/withBreadcrumbs';
import WithFooter from '@/components/withFooter';
import WithMetaBar from '@/components/withMetaBar';
import WithNavBar from '@/components/withNavBar';
import WithProgressionSidebar from '@/components/withProgressionSidebar';
import WithSidebarCrossLinks from '@/components/withSidebarCrossLinks';
import ArticleLayout from '@/layouts/Article';

import styles from '/components/Containers/Footer/index.module.css';
const LearnLayout: FC<PropsWithChildren> = ({ children }) => (
<>
<WithNavBar />
Expand All @@ -22,10 +24,16 @@ const LearnLayout: FC<PropsWithChildren> = ({ children }) => (
</main>

<WithMetaBar />
<div className={styles.mobileFooter}>
<WithFooter />
</div>
</div>

<WithBreadcrumbs navKeys={['learn']} />
</ArticleLayout>
<div className={styles.desktopFooter}>
<WithFooter />
</div>
</>
);

Expand Down
2 changes: 1 addition & 1 deletion layouts/layouts.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
xl:px-18;
}

> *:last-child {
> *:nth-child(2) {
@apply mt-8
border-t
grid-in-[metabar]
Expand Down