From be556981ceb9e974cb421467c966a95ba5b2f87f Mon Sep 17 00:00:00 2001 From: Ritesh Hiremath Date: Sat, 26 Oct 2024 15:29:32 +0530 Subject: [PATCH 01/11] Changing the tailwindconfig file --- tailwind.config.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tailwind.config.js b/tailwind.config.js index 19c659958..d1b5c509e 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -3,6 +3,22 @@ module.exports = { './pages/**/*.{js,ts,jsx,tsx,md}', './components/**/*.{js,ts,jsx,tsx,md}', ], +<<<<<<< HEAD +======= + safelist: [ + 'h-8', + 'w-8', // smaller avatar sizes + 'h-11', + 'w-11', // larger avatar sizes + 'bg-slate-50', + 'rounded-full', + '-ml-3', + 'bg-cover', + 'bg-center', + 'border-2', + 'border-white', + ], +>>>>>>> 944a1db (Changing the tailwindconfig file) darkMode: 'class', theme: { screens: { From 97b6cc30a5cf1fc7e66c110ec00f17cb217bd0ba Mon Sep 17 00:00:00 2001 From: Ritesh Hiremath Date: Sat, 26 Oct 2024 15:46:20 +0530 Subject: [PATCH 02/11] added the changes to blogpage --- pages/blog/index.page.tsx | 11 +---------- tailwind.config.js | 16 ---------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/pages/blog/index.page.tsx b/pages/blog/index.page.tsx index 4eaa2a77e..913c8a50d 100644 --- a/pages/blog/index.page.tsx +++ b/pages/blog/index.page.tsx @@ -316,16 +316,7 @@ export default function StaticMarkdownPage({ return (
>>>>>> 944a1db (Changing the tailwindconfig file) darkMode: 'class', theme: { screens: { From 0bed3723ad8a5fdf62e507e86fb5fa4eb5b9eb60 Mon Sep 17 00:00:00 2001 From: Ritesh Hiremath Date: Sat, 26 Oct 2024 21:13:07 +0530 Subject: [PATCH 03/11] resolving include file conflict --- _includes/community | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/community b/_includes/community index b8c6a9ef4..93f841dc3 160000 --- a/_includes/community +++ b/_includes/community @@ -1 +1 @@ -Subproject commit b8c6a9ef4511bbf70de9ef0666987c9cad449b54 +Subproject commit 93f841dc3181a0d643294f0d994cc515ed381cb0 From 7b03447dc1bb2c96fc8eab2e22a394186f8dbd53 Mon Sep 17 00:00:00 2001 From: Ritesh Hiremath Date: Sat, 26 Oct 2024 21:19:59 +0530 Subject: [PATCH 04/11] Reverted _includes/community to match upstream/main --- _includes/community | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/community b/_includes/community index 93f841dc3..b8c6a9ef4 160000 --- a/_includes/community +++ b/_includes/community @@ -1 +1 @@ -Subproject commit 93f841dc3181a0d643294f0d994cc515ed381cb0 +Subproject commit b8c6a9ef4511bbf70de9ef0666987c9cad449b54 From 86a8dfe79d13bbc3217ed3ea71255f8aac60b63f Mon Sep 17 00:00:00 2001 From: Ritesh Hiremath Date: Sat, 26 Oct 2024 21:37:39 +0530 Subject: [PATCH 05/11] Adding some changes to blogpage --- pages/blog/index.page.tsx | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/pages/blog/index.page.tsx b/pages/blog/index.page.tsx index 913c8a50d..eee7e04fd 100644 --- a/pages/blog/index.page.tsx +++ b/pages/blog/index.page.tsx @@ -299,31 +299,18 @@ export default function StaticMarkdownPage({ items-center `} > -
+
{(frontmatter.authors || []).map( - (author: Author, index: number) => { - const sizeClass = - frontmatter.authors.length > 2 - ? 'h-8 w-8' - : 'h-11 w-11'; - return ( -
- ); - }, + (author: Author, index: number) => ( +
2 ? 'h-8 w-8' : 'h-11 w-11'} rounded-full -ml-3 bg-cover bg-center border-2 border-white`} + style={{ + backgroundImage: `url(${author.photo})`, + zIndex: 10 - index, + }} + /> + ), )}
From a747a87af8fb71358c82fc0ab2b61cc6326379b9 Mon Sep 17 00:00:00 2001 From: Ritesh Hiremath Date: Sat, 26 Oct 2024 22:08:39 +0530 Subject: [PATCH 06/11] Some changes in string concatenation --- pages/blog/index.page.tsx | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pages/blog/index.page.tsx b/pages/blog/index.page.tsx index eee7e04fd..da350c45b 100644 --- a/pages/blog/index.page.tsx +++ b/pages/blog/index.page.tsx @@ -301,16 +301,24 @@ export default function StaticMarkdownPage({ >
{(frontmatter.authors || []).map( - (author: Author, index: number) => ( -
2 ? 'h-8 w-8' : 'h-11 w-11'} rounded-full -ml-3 bg-cover bg-center border-2 border-white`} - style={{ - backgroundImage: `url(${author.photo})`, - zIndex: 10 - index, - }} - /> - ), + (author: Author, index: number) => { + const isMultipleAuthors = + frontmatter.authors.length > 2; + const sizeClass = isMultipleAuthors + ? 'h-8 w-8' + : 'h-11 w-11'; + + return ( +
+ ); + }, )}
From 4b71dad1b44e9acbb2ee212d37b4fe44652cfdee Mon Sep 17 00:00:00 2001 From: Ritesh Hiremath Date: Sat, 26 Oct 2024 22:28:56 +0530 Subject: [PATCH 07/11] Adding safelist --- tailwind.config.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tailwind.config.js b/tailwind.config.js index 19c659958..7cc3e9afc 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -76,6 +76,16 @@ module.exports = { }, }, plugins: [], + safelist: [ + 'bg-slate-50', + 'h-8', + 'h-11', + 'w-8', + 'w-11', + 'rounded-full', + 'border-2', + 'border-white', + ], }; /* From fc4a65f420e3014a19d4545df500b7764ce48253 Mon Sep 17 00:00:00 2001 From: Ritesh Hiremath Date: Sat, 26 Oct 2024 22:37:50 +0530 Subject: [PATCH 08/11] Trying some changes in the code --- pages/blog/index.page.tsx | 20 ++++++++++++++------ tailwind.config.js | 23 +++++++++++++---------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/pages/blog/index.page.tsx b/pages/blog/index.page.tsx index da350c45b..9586c6d15 100644 --- a/pages/blog/index.page.tsx +++ b/pages/blog/index.page.tsx @@ -302,16 +302,24 @@ export default function StaticMarkdownPage({
{(frontmatter.authors || []).map( (author: Author, index: number) => { - const isMultipleAuthors = - frontmatter.authors.length > 2; - const sizeClass = isMultipleAuthors - ? 'h-8 w-8' - : 'h-11 w-11'; + const sizeClass = + frontmatter.authors.length > 2 + ? 'h-8 w-8' + : 'h-11 w-11'; return (
Date: Sat, 26 Oct 2024 22:43:09 +0530 Subject: [PATCH 09/11] Removing the safelist --- tailwind.config.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/tailwind.config.js b/tailwind.config.js index c85bfaa51..19c659958 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -4,19 +4,6 @@ module.exports = { './components/**/*.{js,ts,jsx,tsx,md}', ], darkMode: 'class', - safelist: [ - 'w-8', - 'h-11', - 'w-11', - 'bg-slate-50', - 'rounded-full', - '-ml-3', - 'bg-cover', - 'bg-center', - 'border-2', - 'border-white', - 'h-8', - ], theme: { screens: { sm: '640px', From 58e4f377b6fb3ece6545cca289cc7f5a8676cc76 Mon Sep 17 00:00:00 2001 From: Ritesh Hiremath Date: Mon, 28 Oct 2024 20:49:48 +0530 Subject: [PATCH 10/11] Updated the join method --- pages/blog/index.page.tsx | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pages/blog/index.page.tsx b/pages/blog/index.page.tsx index 9586c6d15..895b0be3c 100644 --- a/pages/blog/index.page.tsx +++ b/pages/blog/index.page.tsx @@ -310,16 +310,15 @@ export default function StaticMarkdownPage({ return (
Date: Wed, 13 Nov 2024 09:36:00 +0530 Subject: [PATCH 11/11] Adding the purgeble edited file --- pages/blog/index.page.tsx | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/pages/blog/index.page.tsx b/pages/blog/index.page.tsx index 895b0be3c..67aaf5e74 100644 --- a/pages/blog/index.page.tsx +++ b/pages/blog/index.page.tsx @@ -301,31 +301,20 @@ export default function StaticMarkdownPage({ >
{(frontmatter.authors || []).map( - (author: Author, index: number) => { - const sizeClass = - frontmatter.authors.length > 2 - ? 'h-8 w-8' - : 'h-11 w-11'; - - return ( -
- ); - }, + (author: Author, index: number) => ( +
2 + ? 'h-8 w-8' + : 'h-11 w-11' + }`} + style={{ + backgroundImage: `url(${author.photo})`, + zIndex: 10 - index, + }} + /> + ), )}