From bafcc47f78fb1cca7770b9baf7778d78578f5e5f Mon Sep 17 00:00:00 2001 From: Niall Maher Date: Wed, 19 Apr 2023 09:23:57 +0100 Subject: [PATCH 1/4] Update Tailwind config with new black --- tailwind.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tailwind.config.js b/tailwind.config.js index 4e5366a6..6d0ce590 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -6,7 +6,7 @@ module.exports = { theme: { extend: { colors: { - smoke: "#0d1117", + black: "#040404", }, }, }, From 0f98750832cd8e37efe797186d4233d4aebc11b3 Mon Sep 17 00:00:00 2001 From: Niall Maher Date: Wed, 19 Apr 2023 09:24:55 +0100 Subject: [PATCH 2/4] Update globals to use neutral gray --- styles/globals.css | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/styles/globals.css b/styles/globals.css index 728d1031..1de3feb3 100644 --- a/styles/globals.css +++ b/styles/globals.css @@ -1,8 +1,7 @@ @tailwind base; body { - background-color: #000; - color: #fff; + @apply bg-black text-white; } #__next { @@ -28,7 +27,7 @@ body { [multiple], textarea, select { - @apply mt-1 bg-black focus:outline-none focus:ring-2 focus:ring-gray-300 ring-offset-1 block w-full shadow-sm sm:text-sm border-white border-2 px-2 py-2 disabled:opacity-50 text-white; + @apply mt-1 bg-black focus:outline-none focus:ring-2 focus:ring-neutral-300 ring-offset-1 block w-full shadow-sm sm:text-sm border-white border-2 px-2 py-2 disabled:opacity-50 text-white; } label { @@ -37,11 +36,11 @@ body { } .primary-button { - @apply items-center bg-gradient-to-r from-orange-400 to-pink-600 rounded-md shadow-sm py-2 px-4 inline-flex justify-center font-medium text-white hover:from-orange-300 hover:to-pink-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-pink-300 disabled:from-slate-500 disabled:to-slate-700 disabled:border-slate-300 disabled:text-slate-300 disabled:hover:text-slate-300 transition-colors; + @apply items-center bg-gradient-to-r from-orange-400 to-pink-600 rounded-md shadow-sm py-2 px-4 inline-flex justify-center font-medium text-white hover:from-orange-300 hover:to-pink-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-pink-300 disabled:from-neutral-500 disabled:to-neutral-700 disabled:border-neutral-300 disabled:text-neutral-300 disabled:hover:text-neutral-300 transition-colors; } .secondary-button { - @apply items-center border-2 hover:bg-slate-700 bg-gradient-to-r rounded-md shadow-sm py-2 px-4 inline-flex justify-center font-medium text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-pink-300; + @apply items-center border-2 hover:bg-neutral-700 bg-gradient-to-r rounded-md shadow-sm py-2 px-4 inline-flex justify-center font-medium text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-pink-300; } .fancy-link { @@ -72,7 +71,7 @@ body { } .prose .anchor:after { - @apply text-gray-300 dark:text-gray-700; + @apply text-neutral-300 dark:text-neutral-700; content: "#"; } @@ -81,11 +80,11 @@ body { } .prose pre { - @apply border border-gray-200 bg-gray-100 dark:border-gray-700 dark:bg-smoke; + @apply border border-neutral-200 bg-neutral-100 dark:border-neutral-700 dark:bg-black; } .prose code { - @apply text-gray-800 dark:text-gray-200 px-1 py-0.5 border border-gray-100 dark:border-gray-800 rounded-lg bg-gray-100 dark:bg-smoke font-mono; + @apply text-neutral-800 dark:text-neutral-200 px-1 py-0.5 border border-neutral-100 dark:border-neutral-800 rounded-lg bg-neutral-100 dark:bg-black font-mono; } .prose code:after { @@ -97,7 +96,7 @@ body { } .prose pre code { - @apply text-gray-800 dark:text-gray-200 p-0; + @apply text-neutral-800 dark:text-neutral-200 p-0; border: initial; } @@ -116,11 +115,11 @@ body { .token.prolog, .token.doctype, .token.cdata { - @apply text-gray-700 dark:text-gray-300; + @apply text-neutral-700 dark:text-neutral-300; } .token.punctuation { - @apply text-gray-700 dark:text-gray-300; + @apply text-neutral-700 dark:text-neutral-300; } .token.property, @@ -169,7 +168,7 @@ body { code[class*="language-"], pre[class*="language-"] { - @apply text-gray-800 dark:text-gray-50; + @apply text-neutral-800 dark:text-neutral-50; } pre::-webkit-scrollbar { @@ -182,7 +181,7 @@ pre { } .rehype-code-title { - @apply px-5 py-3 font-mono text-sm font-bold text-gray-800 bg-gray-200 border border-b-0 border-gray-200 rounded-t-lg dark:text-gray-200 dark:border-gray-700 dark:bg-gray-800; + @apply px-5 py-3 font-mono text-sm font-bold text-neutral-800 bg-neutral-200 border border-b-0 border-neutral-200 rounded-t-lg dark:text-neutral-200 dark:border-neutral-700 dark:bg-neutral-800; } .rehype-code-title + pre { @@ -190,7 +189,7 @@ pre { } .highlight-line { - @apply block px-4 -mx-4 bg-gray-100 border-l-4 border-blue-500 dark:bg-gray-800; + @apply block px-4 -mx-4 bg-neutral-100 border-l-4 border-blue-500 dark:bg-neutral-800; } /* Remove Safari input shadow on mobile */ From 7e17bf70cd9ba05936af9807fb57324216d81fdd Mon Sep 17 00:00:00 2001 From: Niall Maher Date: Wed, 19 Apr 2023 09:27:00 +0100 Subject: [PATCH 3/4] Remove slate, gray and smoke colors --- components/ArticlePreview/ArticleLoading.tsx | 20 +-- components/ArticlePreview/ArticlePreview.tsx | 16 +-- components/BioBar/BioBar.tsx | 8 +- components/Comments/CommentsArea.tsx | 34 ++--- components/Footer/Footer.tsx | 8 +- components/Modal/Modal.tsx | 2 +- components/Nav/Nav.tsx | 42 +++--- components/PageHeading/PageHeading.tsx | 2 +- components/PromptService/PromptService.tsx | 130 +++++++++--------- pages/404.tsx | 2 +- pages/[username].tsx | 4 +- pages/alpha/create/[[...postIdArr]].tsx | 103 ++++++++------- pages/articles/[slug].tsx | 24 ++-- pages/articles/index.tsx | 6 +- pages/code-of-conduct/index.tsx | 131 +++++++++++++------ pages/create/[[...postIdArr]].tsx | 111 +++++++++------- pages/get-started/index.tsx | 2 +- pages/index.tsx | 20 +-- pages/my-posts/index.tsx | 36 ++--- pages/notifications/index.tsx | 12 +- pages/settings/index.tsx | 38 +++--- pages/sponsorship/index.tsx | 8 +- 22 files changed, 417 insertions(+), 342 deletions(-) diff --git a/components/ArticlePreview/ArticleLoading.tsx b/components/ArticlePreview/ArticleLoading.tsx index 0653d886..8edab94a 100644 --- a/components/ArticlePreview/ArticleLoading.tsx +++ b/components/ArticlePreview/ArticleLoading.tsx @@ -1,24 +1,24 @@ const ArticleLoading = () => ( -
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
); diff --git a/components/ArticlePreview/ArticlePreview.tsx b/components/ArticlePreview/ArticlePreview.tsx index 87370434..2ddcb285 100644 --- a/components/ArticlePreview/ArticlePreview.tsx +++ b/components/ArticlePreview/ArticlePreview.tsx @@ -73,7 +73,7 @@ const ArticlePreview: NextPage = ({ }; return ( -
+
{name} @@ -84,12 +84,12 @@ const ArticlePreview: NextPage = ({ alt={`${name}'s avatar`} /> -
-

+

+

Written by{" "} {name} @@ -129,7 +129,7 @@ const ArticlePreview: NextPage = ({

{showBookmark && (
-
+
{Markdoc.renderers.react(content, React, { components: markdocComponents, @@ -300,7 +300,7 @@ const CommentsArea = ({ postId, postOwnerId }: Props) => {
@@ -463,25 +463,25 @@ const CommentsArea = ({ postId, postOwnerId }: Props) => { }; return ( -
+
{!initiallyLoaded && (
-
+
Loading
)} -

+

{initiallyLoaded ? `Discussion (${commentsResponse?.count || 0})` : "Fetching comments"}

-
+
{session ? ( ) : ( -
+

Hey! 👋

Got something to say?

@@ -497,7 +497,7 @@ const CommentsArea = ({ postId, postOwnerId }: Props) => {

)}
-
{generateComments(comments)}
+
{generateComments(comments)}
{ href={item.href} target="_blank" rel="noopener noreferrer" - className="text-base text-gray-500 hover:text-gray-400" + className="text-base text-neutral-500 hover:text-neutral-400" > {item.name} ) : ( {item.name} @@ -78,14 +78,14 @@ const Footer = () => { href={item.href} target="_blank" rel="noopener noreferrer" - className="text-gray-500 hover:text-gray-400" + className="text-neutral-500 hover:text-neutral-400" > {item.name}
-

+

© {Temporal.Now.plainDateISO().year} CodĂș Software Solutions, Ltd.

diff --git a/components/Modal/Modal.tsx b/components/Modal/Modal.tsx index a35f7e6c..b6c553cf 100644 --- a/components/Modal/Modal.tsx +++ b/components/Modal/Modal.tsx @@ -20,7 +20,7 @@ export function Modal({ open, onClose, children }: Props) { leaveFrom="opacity-100" leaveTo="opacity-0" > -
+
diff --git a/components/Nav/Nav.tsx b/components/Nav/Nav.tsx index 2391bc05..b1f68154 100644 --- a/components/Nav/Nav.tsx +++ b/components/Nav/Nav.tsx @@ -82,13 +82,13 @@ const Nav = () => { href={item.href} target="_blank" rel="noopener noreferrer" - className="text-gray-300 hover:bg-smoke hover:text-white px-3 py-2 rounded-md" + className="text-neutral-300 hover:bg-neutral-900 hover:text-white px-3 py-2 rounded-md" > {item.name} ) : ( @@ -104,7 +104,7 @@ const Nav = () => { {session ? ( <> Your Posts @@ -120,7 +120,7 @@ const Nav = () => { ) : ( <> ) : ( {item.name} @@ -206,7 +206,7 @@ const Nav = () => { View notifications {hasNotifications && ( @@ -215,7 +215,7 @@ const Nav = () => {