Skip to content

Commit

Permalink
Merge pull request #28 from elijames-codecov/STAT-901-mobile-nav-qa
Browse files Browse the repository at this point in the history
mobile nav qa items
  • Loading branch information
elijames-codecov authored Aug 5, 2024
2 parents a47a2f4 + 4c7f81a commit d068ca2
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 11 deletions.
Binary file added src/assets/navigation/github4x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/navigation/twitter4x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/Footer.astro
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const { links, socialLinks } = Astro.props;
<ul class="flex gap-[0.38rem]">
{
socialLinks.map((link) => <li>
<a href={link.url} target={link.target} class="h-[30px] w-[30px]"><Image src={link.icon} alt={link.name} class="h-[30px] w-[30px]" /></a>
<a href={link.url} target={link.target} class="h-[30px] w-[30px]"><Image src={link.icon} alt={link.name} class="h-[30px] w-[30px]" densities={[1,2,3,4]} /></a>
</li>
)
}
Expand Down
17 changes: 11 additions & 6 deletions src/components/Navigation.astro
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@ import close from '/images/icons/close.svg?raw';
import hamburger from '/images/icons/hamburger.svg?raw';
const { links, socialLinks } = Astro.props;
const date = new Date();
const year = date.getFullYear();
---

<nav class="container mx-auto relative px-[0.5rem] sm:px-[1rem] md:px-[1.5rem] lg:px-[2rem] xl:px-[1.5rem] 2xl:px-[3.62rem] 3xl:px-[6.62rem] py-[2.5rem] flex justify-between items-center bg-transparent">
<a class="text-3xl font-bold leading-none w-4/12 md:w-3/12 lg:w-2/12" href="/">
<Image src={logo} densities={[1, 1.5, 2, 3, 4]} alt="Fair Source Licnese" />
<Image src={logo} densities={[1, 1.5, 2, 3, 4]} alt="Fair Source Licneses" />
</a>
<div class="lg:hidden">
<button class="navbar-burger flex items-center w-[32px] h-[18px]">
Expand All @@ -27,7 +31,7 @@ const { links, socialLinks } = Astro.props;
<ul class="flex gap-[0.38rem]">
{
socialLinks && socialLinks.map((link) => <li>
<a class="hidden lg:flex lg:ml-auto lg:ml-2 h-[30px] w-[30px]" href={link.url} target={link.target}><Image src={link.icon} alt={link.name}/></a>
<a class="hidden lg:flex lg:ml-auto lg:ml-2 h-[30px] w-[30px]" href={link.url} target={link.target}><Image src={link.icon} alt={link.name} densities={[1,2,3,4]} /></a>
</li>)
}
</ul>
Expand All @@ -37,7 +41,7 @@ const { links, socialLinks } = Astro.props;
<div class="navbar-backdrop fixed inset-0 bg-transparent"></div>
<nav class="fixed top-0 left-0 bottom-0 flex flex-col w-5/6 max-w-sm py-[2.5rem] px-[1rem] py-[1.5rem] bg-background border-r overflow-y-auto">
<div class="flex items-center mb-[3rem]">
<a class="mr-auto text-3xl font-bold leading-none w-6/12" href="/">
<a class="mr-auto text-3xl font-bold leading-none w-6/12 pr-[1rem] md:pr-0 md:w-6/12" href="/">
<Image src={logo} alt="Fair Source Licnese" densities={[1, 2, 3, 4]} />
</a>
<button class="navbar-close relative h-[24px] w-[24px]">
Expand All @@ -55,13 +59,14 @@ const { links, socialLinks } = Astro.props;
</div>
<div class="mt-auto">
<div class="pt-6">
<ul class="flex items-center gap-5">
<ul class="flex items-center gap-3">
{
socialLinks.map((link) => <li class="mb-1">
<a class="lg:mr-1 h-[30px] w-[30px]" href={link.url} target={link.target}><Image src={link.icon} alt={link.name}/></a>
socialLinks.map((link) => <li class="mb-[1rem]">
<a class="relative " href={link.url} target={link.target}><div class="relative h-[30px] w-[30px]"><Image src={link.icon} alt={link.name} densities={[1,2,3,4]} class="relative w-100 h-auto" /></div></a>
</li>)
}
</ul>
<p class="text-lightGray text-[1rem] heading-[130%] tracking-[-0.02rem]">Copyright © {year ? year : ''} Fair.io | All Rights Reserved</p>
</div>
</div>
</nav>
Expand Down
4 changes: 2 additions & 2 deletions src/layouts/Layout.astro
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import Navigation from '../components/Navigation.astro';
import Footer from '../components/Footer.astro';
import iconX from '../assets/navigation/x.png'
import iconGitHub from '../assets/navigation/github.png'
import iconX from '../assets/navigation/twitter4x.png'
import iconGitHub from '../assets/navigation/github4x.png'
const links = [
{
Expand Down
1 change: 0 additions & 1 deletion src/pages/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ const seoMeta = {
description: 'Whether you’re a developer looking to contribute or a business aiming to innovate, we the provide steps to successfully implement Fair Source in your projects. Join the community of ethical and innovative software sharing, balancing collaboration with control for everyone involved.',
};
---

<Layout title="Software Sharing for Modern Companies" seo={seoMeta}>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/licenses.astro
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const cardTitleClasses = `font-sans text-[1.375rem] font-[500] color-black leadi
<Image src={HeroImage} alt="How to adopt fair source" densities={[1, 2, 3]}/>
</div>
<div class="relative flex">
<div class="w-12/12 py-[7rem] 2xl:pt-[15.96rem] 2xl:pb-[17.56rem] lg:w-4/12">
<div class="w-12/12 py-[7rem] 2xl:pt-[12rem] 2xl:pb-[17.56rem] lg:w-4/12">
<h1>Fair Source Licenses</h1>
</div>
</div>
Expand Down

0 comments on commit d068ca2

Please sign in to comment.