Skip to content

fixes some positions of elements in header #520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

fixes some positions of elements in header #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca84775
fixes some positions of elements in header
Dakshsharma1108 Nov 1, 2025
a55c89e
remove changes in package-lock
Dakshsharma1108 Nov 2, 2025
042b5dd
Merge branch 'sugarlabs:main' into feature/fixes-header
Dakshsharma1108 Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop
Copy link
Member

@sa-fw-an sa-fw-an Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only push files that you have made changes to. Do not push files that you have not touched.

Copy link
Contributor Author

@Dakshsharma1108 Dakshsharma1108 Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it was done by last commit
@sa-fw-an

Copy link
Contributor Author

@Dakshsharma1108 Dakshsharma1108 Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i remove the changes that i made in package-lock

Copy link
Member

@sa-fw-an sa-fw-an Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please cherry pick the commit and then push it. Or Raise a seperate PR.

Copy link
Contributor Author

@Dakshsharma1108 Dakshsharma1108 Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

got it raising another pr and closing this one

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 20 additions & 18 deletions src/sections/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ const Header: React.FC = () => {
/>
</Link>

{/* Mobile menu toggle button */}
{/* Mobile menu toggle button (visible below lg) */}
<button
className="md:hidden relative w-10 h-10 focus:outline-none z-50"
className="lg:hidden relative w-10 h-10 focus:outline-none z-50"
onClick={() => setIsMobileMenuOpen(!isMobileMenuOpen)}
aria-label="Toggle menu"
aria-expanded={isMobileMenuOpen}
Expand Down Expand Up @@ -102,8 +102,8 @@ const Header: React.FC = () => {
</div>
</button>

{/* Desktop Navigation */}
<nav className="hidden md:flex md:items-center md:space-x-4 lg:space-x-8">
{/* Desktop Navigation (visible from lg and up) */}
<nav className="hidden lg:flex lg:items-center lg:space-x-4">
{/* Dropdown menus */}
{Object.entries(navigationData.dropdowns).map(
([key, dropdown]) => (
Expand All @@ -124,27 +124,29 @@ const Header: React.FC = () => {
<Link
key={link.label}
to={link.path}
className="px-2 lg:px-3 py-2 text-gray-700 dark:text-gray-200 hover:text-blue-600 font-medium rounded-md
transition-all duration-200 hover:bg-gray-50 dark:hover:bg-gray-800 text-sm lg:text-base"
className="px-2 lg:px-2 py-2 text-gray-700 dark:text-gray-200 hover:text-blue-600 font-medium rounded-md
transition-all duration-200 hover:bg-gray-50 dark:hover:bg-gray-800 text-sm lg:text-sm whitespace-nowrap"
onClick={handleNavigation}
>
{link.label}
</Link>
))}

<DarkModeToggle />
<div className="flex items-center gap-3">
<DarkModeToggle />

{/* CTA Button */}
<Link
to="/try-sugar"
className="inline-flex items-center px-4 lg:px-6 py-2 lg:py-2.5 rounded-full font-semibold text-white
bg-gradient-to-r from-blue-600 to-blue-700 hover:from-blue-700 hover:to-blue-800
transition-all duration-300 transform hover:scale-105 hover:shadow-lg
focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 text-sm lg:text-base"
onClick={handleNavigation}
>
TRY NOW
</Link>
{/* CTA Button (slightly reduced padding at lg so it fits tighter layouts) */}
<Link
to="/try-sugar"
className="inline-flex items-center px-3 lg:px-4 py-2 rounded-full font-semibold text-white
bg-gradient-to-r from-blue-600 to-blue-700 hover:from-blue-700 hover:to-blue-800
transition-all duration-300 transform hover:scale-105 hover:shadow-lg
focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 text-sm"
onClick={handleNavigation}
>
TRY NOW
</Link>
</div>
</nav>
</div>
</div>
Expand Down