Skip to content

Commit cac52a3

Browse files
authored
Merge pull request #248 from tarunfy/responsivess-design-fix
Responsivess design fix
2 parents 102589a + 9186564 commit cac52a3

File tree

3 files changed

+28
-31
lines changed

3 files changed

+28
-31
lines changed

src/components/Global/Footer.js

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ import Link from "next/link";
33

44
const navigation = [
55
{
6-
name: "ABOUT US",
7-
href: "/about-us",
6+
name: "About Us",
7+
href: "/about",
88
children: [
99
{ name: "Who we are?", href: "/about-us#who" },
1010
{ name: "What we do?", href: "/about-us#what" },
1111
{ name: "Team WebX", href: "/team" },
1212
],
1313
},
1414
{
15-
name: "SOCIALS",
15+
name: "Socials",
1616
href: "/",
1717
children: [
1818
{ name: "GitHub", href: "https://github.com/WebXDAO" },
@@ -22,12 +22,12 @@ const navigation = [
2222
],
2323
},
2424
{
25-
name: "CONTACT",
25+
name: "Contact",
2626
href: "/contact",
2727
children: [{ name: "Contact us", href: "mailto:[email protected]" }],
2828
},
2929
{
30-
name: "PARTNERS",
30+
name: "Partners",
3131
href: "/partners",
3232
children: [
3333
{ name: "Our partners", href: "/partners" },
@@ -45,7 +45,7 @@ const Footer = () => {
4545
<div className="flex justify-center text-teal-600 sm:justify-start">
4646
<a href="https://webxdao.xyz">
4747
<span className="sr-only">WebX DAO</span>
48-
<img className="w-auto h-14 sm:h-16" src="/images/logo/logo.png" alt="WebX DAO Logo" />
48+
<img className="w-auto sm:h-14 md:h-16 h-12" src="/images/logo/logo.png" alt="" />
4949
</a>
5050
</div>
5151
{/*
@@ -60,16 +60,14 @@ const Footer = () => {
6060
<div key={item.name + "_footer"} className="sm:text-left">
6161
<p className="text-lg sm:text-sm font-medium text-white/90">{item.name}</p>
6262

63-
<nav className="mt-4 sm:mt-8" aria-label={item.name}>
63+
<nav className="mt-4 sm:mt-3" aria-label={item.name}>
6464
<ul className="space-y-4 text-sm">
6565
{item.children.map((child) => (
6666
<li key={child.name}>
67-
<Link
68-
className="transition text-white/60 hover:text-white/60/75 "
69-
href={child.href}
70-
key = {child.name}
71-
>
72-
<span className="text-white/60 cursor-pointer">{child.name}</span>
67+
<Link href="/">
68+
<span className="text-white/60 hover:text-white/95 transition cursor-pointer">
69+
{child.name}
70+
</span>
7371
</Link>
7472
</li>
7573
))}

src/components/Global/Navbar.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const Navbar = () => {
2222
aria-label="Global"
2323
>
2424
<div className="flex items-center flex-1">
25-
<div className="flex items-center justify-between w-full md:w-auto">
25+
<div className="flex items-center justify-between w-full lg:w-auto">
2626
<Link href="/">
2727
<a>
2828
<>
@@ -35,7 +35,7 @@ const Navbar = () => {
3535
</>
3636
</a>
3737
</Link>
38-
<div className="flex items-center -mr-2 md:hidden">
38+
<div className="flex items-center justify-between -mr-2 lg:hidden ">
3939
<Popover.Button className="inline-flex items-center justify-center p-2 text-gray-400 bg-transparent rounded-md focus-ring-inset hover:bg-gray-800 focus:outline-none focus:ring-2 focus:ring-white">
4040
<span className="sr-only">Open main menu</span>
4141
<Bars3Icon className="w-6 h-6" aria-hidden="true" />
@@ -44,8 +44,8 @@ const Navbar = () => {
4444
</div>
4545
{/* Add content here to get menu next to icon */}
4646
</div>
47-
<div className="hidden md:flex md:items-center md:space-x-6">
48-
<div className="hidden space-x-8 md:ml-10 md:flex">
47+
<div className="hidden lg:flex lg:items-center md:space-x-6">
48+
<div className="hidden space-x-8 lg:ml-10 lg:flex">
4949
{navigation.map((item) => (
5050
<Link href={item.href} key={item.name}>
5151
<a className="text-base font-medium text-white hover:text-gray-300">
@@ -77,12 +77,16 @@ const Navbar = () => {
7777
>
7878
<Popover.Panel
7979
focus
80-
className="absolute inset-x-0 top-0 z-10 p-2 transition origin-top transform md:hidden"
80+
className="absolute inset-x-0 top-0 z-10 p-2 transition origin-top transform lg:hidden"
8181
>
8282
<div className="overflow-hidden rounded-lg shadow-xl backdrop-blur-sm bg-gradient1/50 ring-1 ring-white ring-opacity-5">
8383
<div className="flex items-center justify-between px-5 pt-4">
8484
<div>
85-
<img className="w-auto h-12" src="/images/logo/logo.png" alt="WebX DAO" />
85+
<img
86+
className="w-auto h-10 sm:h-12 md:h-14 lg:h-16"
87+
src="/images/logo/logo.png"
88+
alt="WebX DAO"
89+
/>
8690
</div>
8791
<div className="-mr-2">
8892
<Popover.Button className="inline-flex items-center justify-center p-2 text-gray-400 rounded-md bg-white/20 hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-inset focus:ring-cyber-webx">

src/components/Home/HeroSection/Hero.js

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,26 @@ export default function Hero() {
1515
<div className="lg:py-24">
1616
<h1 className="mt-4 text-5xl font-bold tracking-tight text-white sm:mt-5 sm:text-6xl lg:mt-6 xl:text-7xl">
1717
<span className="block">Build with us,</span>
18-
<span className="block text-white">
19-
the future of web.
20-
</span>
18+
<span className="block text-white">the future of web.</span>
2119
</h1>
2220
<p className="mt-3 text-base text-white/70 sm:mt-5 sm:text-xl lg:text-lg xl:text-xl">
23-
We focus on building and talking about possible future
24-
usage of web technologies.
21+
We focus on building and talking about possible future usage of web
22+
technologies.
2523
</p>
2624
<div className="mt-8 sm:mt-6">
2725
<div className="sm:mx-auto sm:max-w-7xl">
2826
<div className="sm:flex">
29-
<div className="flex flex-col w-full mb-6 sm:mt-0 md:flex-row gap-x-4 gap-y-4">
27+
<div className="flex flex-col md:items-center md:justify-center lg:items-start lg:justify-start w-full mb-6 sm:mt-0 md:flex-row gap-x-4 gap-y-4">
3028
<DiscordButton></DiscordButton>
3129
<ContributeButton></ContributeButton>
3230
</div>
3331
</div>
3432
<CallToActionHero></CallToActionHero>
3533
<p className="mt-3 text-sm text-white/70 sm:mt-4">
36-
We are an opensource community working around the
37-
future of the web. Learn blockchain technology
38-
together. The community is powered by{" "}
34+
We are an opensource community working around the future of the web. Learn
35+
blockchain technology together. The community is powered by{" "}
3936
<Link href="https://devprotocol.xyz/">
40-
<a className="font-medium text-white">
41-
Dev Protocol
42-
</a>
37+
<a className="font-medium text-white">Dev Protocol</a>
4338
</Link>
4439
.
4540
</p>

0 commit comments

Comments
 (0)