m1ngsama/FUJI
1
0
Fork 0
mirror of https://github.com/m1ngsama/FUJI.git synced 2025-12-24 10:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #108 from wen-templari/fix/merge-conflicts

Browse source 
Fix merge conflicts in HeaderNavigation component
This commit is contained in:
clas 2025-09-30 00:03:56 +08:00 committed by GitHub
commit d59bbfa7c7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/components/header/HeaderNavigation.tsx
View file

@ -86,13 +86,14 @@ export default function App() {
<NavbarItem> <NavbarItem>
<Link <Link
color="foreground" color="foreground"
className="flex items-center gap-2 w-full py-1 font-semibold"
size="lg"
href="https://github.com/nbtca" href="https://github.com/nbtca"
target="_blank" target="_blank"
rel="noopener noreferrer" rel="noopener noreferrer"
className="flex items-center"
> >
Github <img src={GithubMark.src} alt="GitHub" className="w-6 h-6" />
<img src="/src/pages/_assets/github-mark.svg" alt="GitHub" className="w-6 h-6" /> <span>Github</span>
</Link> </Link>
</NavbarItem> </NavbarItem>
</NavbarMenu> </NavbarMenu>