Skip to content

Commit 8691c92

Browse files
lancebeckerBrandon Johnson
authored andcommitted
Update a few pages and give them a page wrapper
1 parent 0da71b4 commit 8691c92

File tree

6 files changed

+77
-31
lines changed

6 files changed

+77
-31
lines changed

css/main.scss

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ img {
2727
text-decoration: none;
2828
color: #000;
2929
font-weight: bold;
30-
margin-right: 25px;
30+
margin-right: 15px;
3131
padding: 0px 5px;
3232
font-size: 0.9rem;
3333
letter-spacing: 0.03rem;
34+
border: 3px solid transparent;
3435

3536
&:last-child {
3637
margin-right: 0;
@@ -39,7 +40,7 @@ img {
3940
}
4041

4142
.highlight {
42-
border: 1px solid #ccc;
43+
border: 3px solid #e5cf5f;
4344
}
4445

4546
}
@@ -266,24 +267,36 @@ address {
266267

267268
.footer {
268269
display: flex;
269-
width: 100%;
270+
justify-content: center;
270271
min-height: 300px;
271-
color: #000;
272-
max-width: 1000px;
273-
margin: 0 auto;
274-
border-top: 3px solid #efefef;
272+
color: #666;
273+
margin-top: 10px;
274+
border-top: 5px solid #eee;
275+
padding: 20px 10%;
276+
}
277+
278+
.footer-column {
279+
flex: 1;
275280
}
276281

277282
.footer-sitemap {
278283
display: flex;
279284
flex-direction: column;
280285

281286
a {
282-
color: #000;
287+
font-size: 0.8rem;
288+
color: #ccc;
283289
text-decoration: none;
284-
font-weight: bold;
290+
text-transform: uppercase;
291+
transition: color 0.2 ease-out;
292+
293+
&:hover {
294+
color: #444;
295+
}
296+
285297
}
286298

299+
287300
}
288301

289302
.interior-page {
@@ -292,6 +305,7 @@ address {
292305
max-width: 960px;
293306
box-sizing: border-box;
294307
margin: 2% auto;
308+
border: 5px solid #e5cf5f;
295309
}
296310

297311
.code-of-conduct {

pages/_template.jsx

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ module.exports = React.createClass({
2626
<Link to={prefixLink('/about/')} >
2727
About
2828
</Link>
29-
<Link to={prefixLink('/code-of-conduct/')} >
30-
Code of Conduct
31-
</Link>
3229
<Link to={prefixLink('/our_sponsors/')} >
3330
Current Sponsors
3431
</Link>
32+
<Link to={prefixLink('/code-of-conduct/')} >
33+
Code of Conduct
34+
</Link>
3535
<Link className="highlight" to={prefixLink('/speak/')} >
3636
Speak
3737
</Link>
@@ -43,20 +43,36 @@ module.exports = React.createClass({
4343
</Container>
4444

4545
<Container style={{ maxWidth: '100vw' }} className="footer">
46-
<div className="footer-sitemap">
46+
<div className="footer-column footer-sitemap">
47+
<h6>Sitemap</h6>
48+
<Link to={prefixLink('/')} >
49+
Home
50+
</Link>
4751
<Link to={prefixLink('/about/')} >
4852
About
4953
</Link>
50-
<Link to={prefixLink('/code-of-conduct/')} >
51-
Code of Conduct
52-
</Link>
5354
<Link to={prefixLink('/our_sponsors/')} >
5455
Current Sponsors
5556
</Link>
57+
<Link to={prefixLink('/code-of-conduct/')} >
58+
Code of Conduct
59+
</Link>
5660
<Link className="highlight" to={prefixLink('/speak/')} >
5761
Speak
5862
</Link>
5963
</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?
71+
</div>
72+
<div className="social">
73+
meetup
74+
</div>
75+
</div>
6076
</Container>
6177
</div>
6278
)

pages/about.html

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

pages/about.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

pages/speak.html

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<div class="interior-page">
2+
3+
<h1>Speaker Questionnaire</h1>
4+
5+
<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>
6+
7+
<ol>
8+
<li>
9+
What is the title for your presentation?
10+
</li>
11+
<li>
12+
What is a brief description of your talk?
13+
</li>
14+
<li>
15+
How will this improve how people work with JavaScript?
16+
</li>
17+
<li>
18+
What is one thing people should know beforehand to better understand this talk?
19+
</li>
20+
<li>
21+
What are pre-meetup resources that individuals should check out?
22+
</li>
23+
<li>
24+
What information about you would you like to share (bio, links, contact info?)
25+
</li>
26+
</ol>
27+
28+
</div>

pages/speak.md

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

0 commit comments

Comments
 (0)