Skip to content

Commit 4ad6019

Browse files
committed
Fix: Layout colors and sizings
1 parent 3efd387 commit 4ad6019

File tree

3 files changed

+15
-26
lines changed

3 files changed

+15
-26
lines changed

src/components/common/Layout.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ const DefaultLayout = ({ data, children, bodyClass, isHome }) => {
6868
<div className="viewport-top">
6969
{/* The main header section on top of the screen */}
7070
<header className="bg-center bg-cover py-5 text-white bg-bg-black">
71-
<div className="responsive-container px-4">
72-
<div className="flex items-center justify-between" id="site-mast">
71+
<div className="px-4">
72+
<div className="flex items-center justify-between max-w-6xl mx-auto" id="site-mast">
7373
<Link to="/">
7474
{isHome ? null : (
7575
<img
@@ -109,7 +109,7 @@ const DefaultLayout = ({ data, children, bodyClass, isHome }) => {
109109
</div>
110110
</div>
111111
{isHome ? (
112-
<div id="site-banner" className="my-0 mx-auto">
112+
<div id="site-banner" className="my-0 mx-auto responsive-container ">
113113
<img src="/images/logo.svg" className=" w-72 mt-24" />
114114
<h1
115115
id=" site-banner-title"
@@ -119,21 +119,21 @@ const DefaultLayout = ({ data, children, bodyClass, isHome }) => {
119119
</h1>
120120
<p
121121
id="site-banner-desc"
122-
className="mt-4 text-body-grey text-big-body not-italic max-w-2xl"
122+
className="mt-4 text-gray-400 text-big-body not-italic max-w-2xl"
123123
>
124124
{localData.subDescription}
125125
</p>
126126
<p
127127
id="site-banner-desc"
128-
className="mt-4 text-body-grey text-big-body not-italic max-w-2xl"
128+
className="mt-4 text-gray-400 text-big-body not-italic max-w-2xl"
129129
>
130130
{localData.cta}
131131
</p>
132132
<div id="action" className="mb-20 mt-8 flex">
133-
<button class="bg-iff-orange hover:bg-iff-orange-700 text-white font-normal text-xl leading-6 not-italic py-2 px-4 rounded w-full md:w-36 h-14">
133+
<button class="btn w-full text-xl md:w-36 h-14">
134134
Donate
135135
</button>
136-
<button class="border border-iff-orange hover:text-white text-iff-orange font-normal text-xl leading-6 not-italic py-2 ml-4 rounded w-full md:w-36 h-14">
136+
<button class="btn-secondary ml-4 w-full text-xl md:w-36 h-14">
137137
Subscribe
138138
</button>
139139
</div>

src/styles/global.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
}
2121

2222
.btn {
23-
@apply border-2 border-iff-orange text-white bg-iff-orange px-6 py-2 rounded-md;
23+
@apply border-2 border-iff-orange text-white bg-iff-orange hover:bg-opacity-80 px-6 py-2 rounded-md;
2424
}
2525

2626
.btn-secondary {
27-
@apply border border-iff-orange text-iff-orange px-6 py-2 rounded-md;
27+
@apply border border-iff-orange text-iff-orange hover:bg-iff-orange hover:bg-opacity-10 px-6 py-2 rounded-md;
2828
}
2929

3030
.responsive-container {

src/templates/index.js

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
Pagination,
99
PostCarousel,
1010
ProjectCarousel,
11+
PostCardBlog
1112
} from "../components/common";
1213
import { MetaData } from "../components/common/meta";
1314
import DonateCard from "../components/common/DonateCard";
@@ -30,34 +31,22 @@ const Index = ({ data, location, pageContext }) => {
3031
<>
3132
<MetaData location={location} />
3233
<Layout isHome={true}>
33-
<div id="container" className="responsive-container mt-4 text-left">
34-
<h1 className="text-3xl mb-6 font-bold">Blogposts</h1>
34+
<div id="container" className="responsive-container px-4 mt-4 text-left">
35+
<h1 className="text-subheading-1 mb-4 mt-24 font-bold">Blogposts</h1>
3536
<section id="post-feed">
3637
{posts.map(({ node }, index) => (
3738
// The tag below includes the markup for each post - components/common/PostCard.js
38-
<PostCard key={node.id} post={node} number={index + 1} />
39+
<PostCardBlog key={node.id} post={node} number={index + 1} />
3940
))}
4041
</section>
4142

42-
{/* <Pagination pageContext={pageContext} /> */}
43-
<p className="ml-14 text-body-grey">
43+
<p className="text-body-grey">
4444
Read more blogs on numerous other topics
4545
</p>
46-
<button class="ml-14 mt-6 mb-20 bg-iff-orange hover:bg-iff-orange-700 text-white font-normal text-xl leading-6 not-italic py-2 px-4 rounded w-36 h-14">
46+
<button class="mt-6 mb-16 bg-iff-orange hover:bg-iff-orange-700 text-white font-normal text-xl leading-6 not-italic py-2 px-4 rounded w-36 h-14">
4747
Read more
4848
</button>
4949
<hr></hr>
50-
<h1 className="text-3xl mt-20 mb-6 font-bold">Our latest work</h1>
51-
<section
52-
id="post-feed"
53-
className="flex flex-col lg:w-1/3 md:flex-row"
54-
>
55-
{posts.map(({ node }, index) => (
56-
// The tag below includes the markup for each post - components/common/PostCard.js
57-
<PostCarousel key={node.id} post={node} number={index + 1} />
58-
))}
59-
</section>
60-
<hr></hr>
6150
<h1 className="text-3xl mt-20 font-bold">Campaigns & Projects</h1>
6251
<p className="text-base text-body-grey mt-6 mb-6">
6352
Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris

0 commit comments

Comments
 (0)