Skip to content

Commit 042b5dd

Browse files
Merge branch 'sugarlabs:main' into feature/fixes-header
2 parents a55c89e + 7847431 commit 042b5dd

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

src/components/FAQItem.tsx

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,14 @@ const faqItemVariants = {
1313
};
1414

1515
const faqQuestionButtonVariants = {
16-
hover: { scale: 1.02 },
16+
initial: { backgroundColor: 'rgba(0,0,0,0)', y: 0 },
17+
hover: {
18+
scale: 1.02,
19+
backgroundColor: 'rgba(0,0,0,0.12)',
20+
y: -1,
21+
boxShadow: '0 4px 8px rgba(0,0,0,0.1)',
22+
transition: { type: 'spring' as const, stiffness: 300, damping: 15 },
23+
},
1724
};
1825

1926
const faqToggleIconVariants = (isOpen: boolean) => ({
@@ -44,17 +51,17 @@ const FAQItem = ({ index, question, answer }: FAQItemProps) => {
4451
animate="animate"
4552
>
4653
<motion.button
47-
className="w-full text-left py-4 text-lg font-medium flex justify-between items-center hover:cursor-pointer text-gray-900 dark:text-gray-100"
54+
className="w-full text-left py-4 px-4 text-lg font-medium flex justify-between items-center hover:cursor-pointer text-gray-900 dark:text-gray-100 rounded-md"
4855
onClick={toggleFAQ}
4956
whileHover="hover"
5057
variants={faqQuestionButtonVariants}
5158
>
52-
{question}
59+
<span className="flex-1">{question}</span>
5360
<motion.span
5461
variants={faqToggleIconVariants(isOpen)}
5562
initial="initial"
5663
animate="animate"
57-
className="text-gray-600 dark:text-gray-400"
64+
className="text-gray-600 dark:text-gray-400 ml-2"
5865
>
5966
{isOpen ? '-' : '+'}
6067
</motion.span>
@@ -65,7 +72,7 @@ const FAQItem = ({ index, question, answer }: FAQItemProps) => {
6572
animate="animate"
6673
style={{ overflow: 'hidden' }}
6774
>
68-
<p className="p-4 text-gray-700 dark:text-gray-300">{answer}</p>
75+
<p className="px-6 pb-4 text-gray-700 dark:text-gray-300">{answer}</p>
6976
</motion.div>
7077
</motion.div>
7178
);

src/components/TryNow/Paragraph.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ const Paragraph: React.FC<ParagraphProps> = ({
1616
title,
1717
content,
1818
button,
19-
buttonLink,
2019
links,
2120
}) => {
2221
const contentPoints = content.includes('\n')
@@ -80,7 +79,9 @@ const Paragraph: React.FC<ParagraphProps> = ({
8079
className="mt-4 bg-blue-600 text-white font-bold py-2 px-6 rounded-full shadow-lg hover:bg-blue-700 transition"
8180
whileHover="hover"
8281
variants={paragraphAnimations.button}
83-
onClick={() => window.open(buttonLink, '_blank')}
82+
onClick={() =>
83+
window.open('https://musicblocks.sugarlabs.org/', '_blank')
84+
}
8485
>
8586
{button}
8687
</motion.button>

src/constants/TryCardData.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export const TryCardData: CardDataType[] = [
7575
{
7676
title: 'Desktop/laptop installation',
7777
description:
78-
'Sugar Learning platform can be installed as a full operating system on ost desktop and laptop computers.',
78+
'Sugar Learning platform can be installed as a full operating system on most desktop and laptop computers.',
7979
tryNowText: 'Try Desktop Installation now!',
8080
tryNowHref: 'https://fedoraproject.org/spins/soas/download/',
8181
learnMoreText: 'Learn more about Installation',

0 commit comments

Comments
 (0)