Skip to content

Commit da8f62f

Browse files
author
Brandon Johnson
committed
Container tweaks
1 parent 8691c92 commit da8f62f

File tree

9 files changed

+107
-59
lines changed

9 files changed

+107
-59
lines changed

‎css/main.scss‎

Lines changed: 51 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,12 @@ img {
118118
min-height: 55px;
119119
box-sizing: border-box;
120120
transition: all 0.2s ease-out;
121+
text-decoration: none;
122+
color: #000;
123+
124+
&.small-button {
125+
max-width: 150px;
126+
}
121127

122128
&:hover {
123129
background: #000;
@@ -217,8 +223,9 @@ img {
217223

218224
.secondary-content-header {
219225
display: inline-block;
220-
position: relative;
226+
position: absolute;
221227
margin: 0;
228+
top: 0;
222229
font-size: 1.8rem;
223230
background: #000;
224231
color: #fff;
@@ -237,6 +244,14 @@ img {
237244

238245
.tilt-right {
239246

247+
.info-column {
248+
padding-left: 20px;
249+
}
250+
251+
.secondary-content-blurb {
252+
margin-bottom: 10px;
253+
}
254+
240255
.secondary-content-header {
241256
top: -10px;
242257
right: -35px;
@@ -246,7 +261,7 @@ img {
246261

247262
.secondary-content-blurb {
248263
width: 85%;
249-
margin-top: 10px;
264+
margin-top: 45px;
250265
font-size: 1.1rem;
251266
padding-bottom: 10px;
252267
border-bottom: 1px solid #efefef;
@@ -267,22 +282,34 @@ address {
267282

268283
.footer {
269284
display: flex;
270-
justify-content: center;
271285
min-height: 300px;
272286
color: #666;
273287
margin-top: 10px;
274288
border-top: 5px solid #eee;
275289
padding: 20px 10%;
290+
box-sizing: border-box;
276291
}
277292

278-
.footer-column {
279-
flex: 1;
293+
.footer-content {
294+
display: flex;
295+
justify-content: center;
296+
width: 100%;
297+
max-width: 1000px;
298+
margin: 0 auto;
299+
flex-direction: row;
280300
}
281301

282-
.footer-sitemap {
302+
.footer-column {
303+
flex: 1 1 45%;
304+
padding: 0 2.5%;
305+
border-right: 1px dotted rgba( #000, 0.1 );
283306
display: flex;
284307
flex-direction: column;
285308

309+
&:last-child {
310+
border-right: none;
311+
}
312+
286313
a {
287314
font-size: 0.8rem;
288315
color: #ccc;
@@ -296,12 +323,12 @@ address {
296323

297324
}
298325

299-
300326
}
301327

302328
.interior-page {
329+
position: relative;
303330
background: #ffffff;
304-
padding: 25px;
331+
padding: 75px 25px 25px;
305332
max-width: 960px;
306333
box-sizing: border-box;
307334
margin: 2% auto;
@@ -331,14 +358,22 @@ address {
331358
margin: 10px 0;
332359
}
333360

334-
.sponsers-page {
361+
.sponser-tier {
362+
position: relative;
335363

336364
.sponser-container-row {
337-
margin: 20px 0 40px;
365+
padding: 40px 0 45px;
338366
}
339367

340368
}
341369

370+
.tier-title {
371+
font-size: 1.6rem;
372+
font-family: 'Didot';
373+
font-style: oblique;
374+
opacity: 0.6;
375+
}
376+
342377
.sponser-tier-2 {
343378

344379
.sponser {
@@ -362,3 +397,9 @@ address {
362397
font-style: oblique;
363398
font-size: 0.9rem;
364399
}
400+
401+
.footer h6 {
402+
margin-bottom: 10px;
403+
text-transform: uppercase;
404+
}
405+

‎pages/404.html‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<div class="interior-page tilt-left">
2+
<h1 class="secondary-content-header">Not Found</h1>
3+
4+
<p>
5+
You just hit a route that doesn't exist... the sadness.
6+
</p>
7+
8+
</div>
9+

‎pages/404.md‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎pages/_template.jsx‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -43,34 +43,33 @@ module.exports = React.createClass({
4343
</Container>
4444

4545
<Container style={{ maxWidth: '100vw' }} className="footer">
46-
<div className="footer-column footer-sitemap">
47-
<h6>Sitemap</h6>
48-
<Link to={prefixLink('/')} >
49-
Home
50-
</Link>
51-
<Link to={prefixLink('/about/')} >
52-
About
53-
</Link>
54-
<Link to={prefixLink('/our_sponsors/')} >
55-
Current Sponsors
56-
</Link>
57-
<Link to={prefixLink('/code-of-conduct/')} >
58-
Code of Conduct
59-
</Link>
60-
<Link className="highlight" to={prefixLink('/speak/')} >
61-
Speak
62-
</Link>
63-
</div>
64-
<div className="footer-column footer-social-sharing">
65-
<h6>Social Sharing</h6>
66-
<div className="social">
67-
twitter
68-
</div>
69-
<div className="social">
70-
facebook?
46+
<div className="footer-content">
47+
<div className="footer-column footer-sitemap">
48+
<h6>Meetup</h6>
49+
<Link to={prefixLink('/')} >
50+
Home
51+
</Link>
52+
<Link to={prefixLink('/about/')} >
53+
About
54+
</Link>
55+
<Link to={prefixLink('/our_sponsors/')} >
56+
Current Sponsors
57+
</Link>
58+
<Link to={prefixLink('/code-of-conduct/')} >
59+
Code of Conduct
60+
</Link>
61+
<Link className="highlight" to={prefixLink('/speak/')} >
62+
Speak
63+
</Link>
7164
</div>
72-
<div className="social">
73-
meetup
65+
<div className="footer-column footer-social-sharing">
66+
<h6>Connect</h6>
67+
<div className="social">
68+
<a href="https://twitter.com/JavaScriptMN/">Twitter</a>
69+
</div>
70+
<div className="social">
71+
<a href="https://www.meetup.com/JavaScriptMN/events/">Calendar</a>
72+
</div>
7473
</div>
7574
</div>
7675
</Container>

‎pages/about.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<div class="interior-page">
2-
<h1>About JavaScriptMN</h1>
1+
<div class="interior-page tilt-left">
2+
<h1 class="secondary-content-header">About JavaScriptMN</h1>
33
</div>

‎pages/index.html‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<div id="#location" class="secondary-content tilt-left">
5050
<div class="column">
5151
<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>
52+
<div class="secondary-content-blurb">We are graciously hosted at <strong>Olson's</strong> office space in downtown Minneapolis. Parking is available in the adjacent lot or additional street parking near the building.</div>
5353
<address>
5454
Olson<br>
5555
420 N 5th St<br>
@@ -67,11 +67,15 @@ <h2 class="secondary-content-header">Location</h2>
6767

6868
<div class="secondary-content tilt-right">
6969
<div class="column">
70-
<img src="images/speak.jpeg" />
70+
<img width="650" src="images/speak.jpeg" />
7171
</div>
72-
<div class="column">
72+
<div class="column info-column">
7373
<h2 class="secondary-content-header">Speaking</h2>
74-
<div>Interested in speaking?</div>
74+
<div class="secondary-content-blurb">
75+
<strong>Interested in speaking?</strong><br/>
76+
We are always open to new speakers, please see our questionnaire for more details.
77+
</div>
78+
<a class="outline-button small-button" href="/speak/">Learn More</a>
7579
</div>
7680
</div>
7781

‎pages/our_sponsors.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<div class="interior-page sponsers-page">
1+
<div class="interior-page sponsers-page tilt-left">
22

3-
<h1>Current Sponsers</h1>
3+
<h1 class="secondary-content-header">Current Sponsers</h1>
44

5-
<div class="sponser-tier platnium tilt-left">
6-
<span class="secondary-content-header">Platnium</span>
5+
<div class="sponser-tier platnium">
6+
<span class="tier-title">Platnium</span>
77

88
<div class="sponser-container-row">
99

@@ -19,8 +19,8 @@ <h1>Current Sponsers</h1>
1919

2020
</div>
2121

22-
<div class="sponser-tier gold tilt-left">
23-
<span class="secondary-content-header">Gold</span>
22+
<div class="sponser-tier gold">
23+
<span class="tier-title">Gold</span>
2424

2525
<div class="sponser-container-row sponser-tier-2">
2626

@@ -36,8 +36,8 @@ <h1>Current Sponsers</h1>
3636

3737
</div>
3838

39-
<div class="sponser-tier silver tilt-left">
40-
<span class="secondary-content-header">Silver</span>
39+
<div class="sponser-tier silver">
40+
<span class="tier-title">Silver</span>
4141

4242
<div class="sponser-container-row sponser-tier-3">
4343

‎pages/speak.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<div class="interior-page">
1+
<div class="interior-page tilt-left">
22

3-
<h1>Speaker Questionnaire</h1>
3+
<h1 class="secondary-content-header">Speaker Questionnaire</h1>
44

55
<p>We ask that those speaking at our meetup prepare asnwers to the following questions so that we may better prepeare our members for their presentaion.</p>
66

‎pages/styles.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@
2525
text-decoration: underline;
2626
}
2727

28+

0 commit comments

Comments
 (0)