Skip to content

Commit 57897d1

Browse files
authored
Merge branch 'main' into create-tests
2 parents 97ca671 + fef7719 commit 57897d1

File tree

5 files changed

+29
-3
lines changed

5 files changed

+29
-3
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,3 +349,4 @@ Massive thanks to all of these fine individuals who contributed to this project!
349349
<a href="https://github.com/VenomousKnight"><img src="https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/165161924?v=4&h=300&w=300&fit=cover&mask=circle&maxage=7d" width="80px"/></a>
350350
<a href="https://github.com/haseenafridi10"><img src="https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/123663002?v=4&h=300&w=300&fit=cover&mask=circle&maxage=7d" width="80px"/></a>
351351
<a href="https://github.com/vansh2408"><img src="https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/77244334?v=4&h=300&w=300&fit=cover&mask=circle&maxage=7d" width="80px"/></a>
352+
<a href="https://github.com/crashbandicootfm"><img src="https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/114340256?v=4&h=300&w=300&fit=cover&mask=circle&maxage=7d" width="80px"/></a>

components/data/contributorData.ts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6738,4 +6738,28 @@ export const contributorData = [
67386738
avatar: "https://avatars.githubusercontent.com/u/98661733?v=4&h=300&w=300&fit=cover&mask=circle&maxage=7d",
67396739
name: "PsydoV2"
67406740
},
6741+
{
6742+
id: "KubanjaElijahEldred",
6743+
url: "https://github.com/KubanjaElijahEldred",
6744+
avatar: "https://avatars.githubusercontent.com/u/185238919?v=4&h=300&w=300&fit=cover&mask=circle&maxage=7d",
6745+
name: "KubanjaElijahEldred"
6746+
},
6747+
{
6748+
id: "4eab",
6749+
url: "https://github.com/4eab",
6750+
avatar: "https://avatars.githubusercontent.com/u/193944771?v=4&h=300&w=300&fit=cover&mask=circle&maxage=7d",
6751+
name: "4eab"
6752+
},
6753+
{
6754+
id: "nabayousuf27",
6755+
url: "https://github.com/nabayousuf27",
6756+
avatar: "https://avatars.githubusercontent.com/u/171433928?v=4&h=300&w=300&fit=cover&mask=circle&maxage=7d",
6757+
name: "nabayousuf27"
6758+
},
6759+
{
6760+
id: "arch92",
6761+
url: "https://github.com/arch92",
6762+
avatar: "https://avatars.githubusercontent.com/u/3901126?v=4&h=300&w=300&fit=cover&mask=circle&maxage=7d",
6763+
name: "arch92"
6764+
},
67416765
]

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"jest-environment-jsdom": "^29.7.0",
4444
"postcss": "8.5.6",
4545
"prettier": "^3.5.3",
46-
"prettier-plugin-tailwindcss": "^0.6.11",
46+
"prettier-plugin-tailwindcss": "^0.7.1",
4747
"tailwindcss": "3.4.15",
4848
"ts-jest": "^29.4.5",
4949
"typescript": "5.9.3"

pages/help/faq.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ const faqs: FAQItem[] = [
101101
{
102102
question: 'What’s the Difference Between Open Source and Free Software?',
103103
answer:
104-
'While often used interchangeably, "Free Software" emphasizes user freedom (as defined by the Free Software Foundation), while "Open Source" focuses on source code availability and collaborative development.',
104+
'While often used interchangeably, "Free Software" emphasizes user freedom (as defined by the Free Software Foundation), while "Open Source" focuses on source code availability and collaborative development.',
105105
category: 'Legal'
106106
}
107107
]
@@ -209,7 +209,7 @@ export default function FAQ() {
209209
onClick={() => setActiveCategory(category)}
210210
className={`rounded-full px-6 py-2 text-sm font-medium transition-all duration-200 ${
211211
activeCategory === category
212-
? 'bg-modern-purple text-white'
212+
? 'bg-modern-blue text-white'
213213
: 'bg-gray-100 text-gray-600 hover:bg-gray-200'
214214
}`}
215215
>

tailwind.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ module.exports = {
2323
colors: {
2424
modern: {
2525
blue: 'rgba(2,104,225,0.88)',
26+
purple: '#844FBA',
2627
darkBlue: '#0F1F3A',
2728
navy: '#000C2D',
2829
lightBlue: '#6793E6',

0 commit comments

Comments
 (0)