From 017d6f7765c61c7310d50c1906107c3c584e2f9f Mon Sep 17 00:00:00 2001 From: wellitsabhi Date: Tue, 11 Jun 2024 11:49:24 +0530 Subject: [PATCH 1/5] issue #6829 fixed --- layouts/About.tsx | 2 ++ layouts/Learn.tsx | 2 ++ 2 files changed, 4 insertions(+) diff --git a/layouts/About.tsx b/layouts/About.tsx index ef2258cab5999..4d33dbb7f3edd 100644 --- a/layouts/About.tsx +++ b/layouts/About.tsx @@ -1,6 +1,7 @@ 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'; @@ -21,6 +22,7 @@ const AboutLayout: FC = ({ children }) => ( + ); diff --git a/layouts/Learn.tsx b/layouts/Learn.tsx index 6b4f6763f1925..822c25a14ae3a 100644 --- a/layouts/Learn.tsx +++ b/layouts/Learn.tsx @@ -1,6 +1,7 @@ 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'; @@ -26,6 +27,7 @@ const LearnLayout: FC = ({ children }) => ( + ); From fe5eccce74f30598f9f0cf6617f07ffe1c6de474 Mon Sep 17 00:00:00 2001 From: wellitsabhi Date: Tue, 11 Jun 2024 16:02:48 +0530 Subject: [PATCH 2/5] fix: footer for small screen --- components/Containers/Footer/index.module.css | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/components/Containers/Footer/index.module.css b/components/Containers/Footer/index.module.css index 732cace0cabf8..dd9e20a4b0ac8 100644 --- a/components/Containers/Footer/index.module.css +++ b/components/Containers/Footer/index.module.css @@ -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 { @@ -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; @@ -32,13 +35,15 @@ @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; } } } From 42efc73927df0a81538ee85889d55cce98f2103d Mon Sep 17 00:00:00 2001 From: wellitsabhi Date: Wed, 12 Jun 2024 10:12:44 +0530 Subject: [PATCH 3/5] fix: sticky footer --- components/Containers/Footer/index.module.css | 18 ++++++++++++++++++ layouts/About.tsx | 9 ++++++++- layouts/Learn.tsx | 8 +++++++- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/components/Containers/Footer/index.module.css b/components/Containers/Footer/index.module.css index dd9e20a4b0ac8..325d7a938166f 100644 --- a/components/Containers/Footer/index.module.css +++ b/components/Containers/Footer/index.module.css @@ -47,3 +47,21 @@ } } } + +.mobileFooter { + display: none; +} + +.desktopFooter { + display: block; +} + +@media (max-width: 640px) { + .mobileFooter { + display: block; + } + + .desktopFooter { + display: none; + } +} diff --git a/layouts/About.tsx b/layouts/About.tsx index 4d33dbb7f3edd..9ce249f7c1361 100644 --- a/layouts/About.tsx +++ b/layouts/About.tsx @@ -7,6 +7,8 @@ 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 = ({ children }) => ( <> @@ -18,11 +20,16 @@ const AboutLayout: FC = ({ children }) => (
{children}
+
+ +
- +
+ +
); diff --git a/layouts/Learn.tsx b/layouts/Learn.tsx index 822c25a14ae3a..13d88ae5f2810 100644 --- a/layouts/Learn.tsx +++ b/layouts/Learn.tsx @@ -8,6 +8,7 @@ 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 = ({ children }) => ( <> @@ -23,11 +24,16 @@ const LearnLayout: FC = ({ children }) => ( +
+ +
- +
+ +
); From 74c9e09e6aac7d54d1c12ce906125c246f1a070c Mon Sep 17 00:00:00 2001 From: Abhishek Singh <99867024+Wellitsabhi@users.noreply.github.com> Date: Wed, 12 Jun 2024 22:20:15 +0530 Subject: [PATCH 4/5] comment resolved Signed-off-by: Abhishek Singh <99867024+Wellitsabhi@users.noreply.github.com> --- components/Containers/Footer/index.module.css | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/components/Containers/Footer/index.module.css b/components/Containers/Footer/index.module.css index 325d7a938166f..8aa87274a822e 100644 --- a/components/Containers/Footer/index.module.css +++ b/components/Containers/Footer/index.module.css @@ -49,19 +49,9 @@ } .mobileFooter { - display: none; + @apply block md:hidden; } .desktopFooter { - display: block; -} - -@media (max-width: 640px) { - .mobileFooter { - display: block; - } - - .desktopFooter { - display: none; - } + @apply hidden md:block; } From 5880613e8778b8c6f1f5bcedbdcf481f7a888906 Mon Sep 17 00:00:00 2001 From: wellitsabhi Date: Mon, 17 Jun 2024 21:08:36 +0530 Subject: [PATCH 5/5] fix: Metabar border --- layouts/layouts.module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/layouts.module.css b/layouts/layouts.module.css index 5c2197b363535..a2b95da9b5864 100644 --- a/layouts/layouts.module.css +++ b/layouts/layouts.module.css @@ -43,7 +43,7 @@ xl:px-18; } - > *:last-child { + > *:nth-child(2) { @apply mt-8 border-t grid-in-[metabar]