Skip to content

Commit 8baff06

Browse files
committed
Enhance the sub content on the home page
1 parent 7f4dfc9 commit 8baff06

File tree

3 files changed

+112
-15
lines changed

3 files changed

+112
-15
lines changed

css/main.scss

Lines changed: 79 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ img {
6060
min-height: 100vh;
6161
background: url('/images/jsmn-hero-banner.jpg') center center no-repeat;
6262
background-size: cover;
63-
padding: 20% 0;
6463
box-sizing: border-box;
6564
}
6665

@@ -75,7 +74,7 @@ img {
7574

7675
.hero-container-content {
7776
max-width: 1000px;
78-
padding: 30px;
77+
padding: 50px 0 0;
7978
}
8079

8180
.sponsered-by-label {
@@ -196,5 +195,83 @@ img {
196195
}
197196

198197
.secondary-content {
198+
position: relative;
199199
display: flex;
200+
margin: 3% auto;
201+
border: 5px solid #e5cf5f;
202+
padding: 20px;
203+
max-width: 1000px;
204+
}
205+
206+
.secondary-content-header {
207+
display: inline-block;
208+
position: relative;
209+
margin: 0;
210+
font-size: 1.8rem;
211+
background: #000;
212+
color: #fff;
213+
padding: 5px 8px;
214+
}
215+
216+
.tilt-left {
217+
218+
.secondary-content-header {
219+
top: -10px;
220+
left: -35px;
221+
transform: rotate( -1deg );
222+
}
223+
224+
}
225+
226+
.tilt-right {
227+
228+
.secondary-content-header {
229+
top: -10px;
230+
right: -35px;
231+
transform: rotate( 1deg );
232+
}
233+
}
234+
235+
.secondary-content-blurb {
236+
width: 85%;
237+
margin-top: 10px;
238+
font-size: 1.1rem;
239+
padding-bottom: 10px;
240+
border-bottom: 1px solid #efefef;
241+
}
242+
243+
.map-container {
244+
width: 500px;
245+
height: 350px;
246+
background: #eee;
247+
}
248+
249+
address {
250+
margin-top: 15px;
251+
font-weight: bold;
252+
font-size: 0.9rem;
253+
font-family: 'Didot';
254+
}
255+
256+
.footer {
257+
display: flex;
258+
width: 100%;
259+
min-height: 300px;
260+
color: #000;
261+
max-width: 1000px;
262+
margin: 0 auto;
263+
background: #efefef;
264+
}
265+
266+
.footer-sitemap {
267+
display: flex;
268+
flex-direction: column;
269+
270+
a {
271+
color: #000;
272+
text-decoration: none;
273+
font-weight: bold;
274+
275+
}
276+
200277
}

pages/_template.jsx

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module.exports = React.createClass({
2727
About
2828
</Link>
2929
<Link to={prefixLink('/code-of-conduct/')} >
30-
Code of conduct
30+
Code of Conduct
3131
</Link>
3232
<Link to={prefixLink('/our_sponsors/')} >
3333
Current Sponsors
@@ -38,9 +38,26 @@ module.exports = React.createClass({
3838
</Container>
3939
</Headroom>
4040

41-
<Container style={{ maxWidth: '100vw' }} >
41+
<Container className="content-body" style={{ maxWidth: '100vw' }} >
4242
{this.props.children}
4343
</Container>
44+
45+
<Container style={{ maxWidth: '100vw' }} className="footer">
46+
<div className="footer-sitemap">
47+
<Link to={prefixLink('/about/')} >
48+
About
49+
</Link>
50+
<Link to={prefixLink('/code-of-conduct/')} >
51+
Code of Conduct
52+
</Link>
53+
<Link to={prefixLink('/our_sponsors/')} >
54+
Current Sponsors
55+
</Link>
56+
<Link className="highlight" to={prefixLink('/speak/')} >
57+
Speak
58+
</Link>
59+
</div>
60+
</Container>
4461
</div>
4562
)
4663
},

pages/index.html

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,29 +46,32 @@
4646

4747
</div>
4848

49-
<div class="secondary-content">
49+
<div id="#location" class="secondary-content tilt-left">
5050
<div class="column">
51-
<h2>Location</h2>
52-
<div>We are graciously hosted at <a target="_blank" href="http://www.olson.com">Olson</a>'s office space in downtown Minneapolis.</div>
51+
<h2 class="secondary-content-header">Location</h2>
52+
<div class="secondary-content-blurb">We are graciously hosted at <a target="_blank" href="http://www.olson.com">Olson</a>'s office space in downtown Minneapolis. Parking is available in the adjacent lot or additional street parking near the building.</div>
53+
<address>
54+
Olson<br>
55+
420 N 5th St<br>
56+
Suite #1000<br>
57+
Minneapolis, MN 55401
58+
</address>
59+
5360
</div>
5461
<div class="column">
5562
<div class="map-container">
56-
<!--<iframe-->
57-
<!--width="600"-->
58-
<!--height="450"-->
59-
<!--frameborder="0" style="border:0" src="https://www.google.com/maps/embed/v1/place?key=AIzaSyAPxFG1VO32vtbAYZC1xP9FmikFnzCl_aQ &q=420+N+5th+St+Minneapolis,+MN+55401" allowfullscreen>-->
60-
<!--</iframe>-->
6163
</div>
6264
</div>
6365

6466
</div>
6567

66-
<div class="secondary-content">
68+
<div class="secondary-content tilt-right">
6769
<div class="column">
6870
<img src="images/speak.jpeg" />
6971
</div>
7072
<div class="column">
71-
<h2>Speaking</h2>
72-
<div>Interested in speaking?
73+
<h2 class="secondary-content-header">Speaking</h2>
74+
<div>Interested in speaking?</div>
7375
</div>
7476
</div>
77+

0 commit comments

Comments
 (0)