Skip to content

Commit a4b1d54

Browse files
authored
Merge pull request #228 from vincenavarro/menu-hero-proximity
Make hero image positioning consistant.
2 parents ac0d4a4 + 248b888 commit a4b1d54

File tree

2 files changed

+53
-57
lines changed

2 files changed

+53
-57
lines changed

src/pages/blog/index.js

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,29 @@ export default class BlogIndexPage extends React.Component {
77
render() {
88
return (
99
<Layout>
10+
<div
11+
className="full-width-image-container margin-top-0"
12+
style={{
13+
backgroundImage: `url('/img/blog-index.jpg')`,
14+
}}
15+
>
16+
<h1
17+
className="has-text-weight-bold is-size-1"
18+
style={{
19+
boxShadow: '0.5rem 0 0 #f40, -0.5rem 0 0 #f40',
20+
backgroundColor: '#f40',
21+
color: 'white',
22+
padding: '1rem',
23+
}}
24+
>
25+
Latest Stories
26+
</h1>
27+
</div>
1028
<section className="section">
1129
<div className="container">
1230
<div className="content">
13-
<div
14-
className="full-width-image-container margin-top-0"
15-
style={{
16-
backgroundImage: `url('/img/blog-index.jpg')`,
17-
}}
18-
>
19-
<h1
20-
className="has-text-weight-bold is-size-1"
21-
style={{
22-
boxShadow: '0.5rem 0 0 #f40, -0.5rem 0 0 #f40',
23-
backgroundColor: '#f40',
24-
color: 'white',
25-
padding: '1rem',
26-
}}
27-
>
28-
Latest Stories
29-
</h1>
30-
</div>
31+
<BlogRoll />
3132
</div>
32-
<BlogRoll />
3333
</div>
3434
</section>
3535
</Layout>

src/templates/product-page.js

Lines changed: 34 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -18,42 +18,38 @@ export const ProductPageTemplate = ({
1818
fullImage,
1919
pricing,
2020
}) => (
21-
<section className="section section--gradient">
22-
<div className="container">
23-
<div className="section">
24-
<div className="columns">
25-
<div className="column is-10 is-offset-1">
26-
<div className="content">
27-
<div
28-
className="full-width-image-container margin-top-0"
29-
style={{
30-
backgroundImage: `url(${
31-
!!image.childImageSharp
32-
? image.childImageSharp.fluid.src
33-
: image
34-
})`,
35-
}}
36-
>
37-
<h2
38-
className="has-text-weight-bold is-size-1"
39-
style={{
40-
boxShadow: '0.5rem 0 0 #f40, -0.5rem 0 0 #f40',
41-
backgroundColor: '#f40',
42-
color: 'white',
43-
padding: '1rem',
44-
}}
45-
>
46-
{title}
47-
</h2>
48-
</div>
49-
<div className="columns">
50-
<div className="column is-7">
51-
<h3 className="has-text-weight-semibold is-size-2">
52-
{heading}
53-
</h3>
54-
<p>{description}</p>
55-
</div>
56-
</div>
21+
<div className="content">
22+
<div
23+
className="full-width-image-container margin-top-0"
24+
style={{
25+
backgroundImage: `url(${
26+
!!image.childImageSharp ? image.childImageSharp.fluid.src : image
27+
})`,
28+
}}
29+
>
30+
<h2
31+
className="has-text-weight-bold is-size-1"
32+
style={{
33+
boxShadow: '0.5rem 0 0 #f40, -0.5rem 0 0 #f40',
34+
backgroundColor: '#f40',
35+
color: 'white',
36+
padding: '1rem',
37+
}}
38+
>
39+
{title}
40+
</h2>
41+
</div>
42+
<section className="section section--gradient">
43+
<div className="container">
44+
<div className="section">
45+
<div className="columns">
46+
<div className="column is-7 is-offset-1">
47+
<h3 className="has-text-weight-semibold is-size-2">{heading}</h3>
48+
<p>{description}</p>
49+
</div>
50+
</div>
51+
<div className="columns">
52+
<div className="column is-10 is-offset-1">
5753
<Features gridItems={intro.blurbs} />
5854
<div className="columns">
5955
<div className="column is-7">
@@ -104,8 +100,8 @@ export const ProductPageTemplate = ({
104100
</div>
105101
</div>
106102
</div>
107-
</div>
108-
</section>
103+
</section>
104+
</div>
109105
)
110106

111107
ProductPageTemplate.propTypes = {

0 commit comments

Comments
 (0)