Skip to content

Commit 610c606

Browse files
robtarrrobtarr
committed
feat: Updating a bunch of CSS/content
1 parent bb43487 commit 610c606

11 files changed

+146
-32
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Generated by us
2+
.divshot-cache
23
_SpecRunner.html
34
npm-debug.log
45
tmp/*

‎divshot.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"name": "gemcityjs",
3+
"root": "dist",
4+
"clean_urls": true,
5+
"error_page": "error.html"
6+
}

‎public/img/bruiser-bot.png

41.8 KB
Loading

‎public/img/logo-gemcityjs.png

5.94 KB
Loading

‎public/img/logo-sparkbox.png

10 KB
Loading

‎public/img/wheelie-bot.png

59.5 KB
Loading

‎scss/_nodebots.scss

+90-22
Original file line numberDiff line numberDiff line change
@@ -5,49 +5,117 @@
55
text-align: center;
66
padding: 20px;
77

8-
img {
9-
height: 80px;
8+
h1 {
9+
background: none;
10+
text-indent: 0;
11+
height: auto;
12+
width: auto;
13+
margin: 1.1em 0;
1014

11-
@include sb-media(28em) {
12-
height: 120px;
15+
@include sb-media(45em) {
16+
font-size: 3em;
1317
}
18+
}
1419

15-
@include sb-media(47em) {
16-
height: auto;
17-
}
20+
.header-bot {
21+
position: absolute;
22+
top: 15px;
1823
}
19-
}
2024

21-
.plus {
22-
font-size: 4em;
23-
position: relative;
24-
top: 50%;
25-
transform: translateY(-27%);
26-
display: inline-block;
27-
width: 20%;
25+
.bruiser-bot {
26+
left: 9%;
27+
width: 13%;
28+
max-width: 125px;
29+
}
2830

29-
@include sb-media(28em) {
30-
font-size: 5em;
31-
transform: translateY(-40%);
31+
.wheelie-bot {
32+
right: 9%;
33+
width: 21%;
34+
max-width: 203px;
3235
}
3336

34-
@include sb-media(47em) {
35-
font-size: 7em;
36-
transform: translateY(-50%);
37+
p {
38+
font-size: 1.5em;
39+
40+
@include sb-media(37em) {
41+
margin-top: 2em;
42+
}
43+
44+
@include sb-media(68em) {
45+
margin-top: 0;
46+
}
3747
}
3848
}
3949

40-
4150
.upcoming {
4251
article {
4352
&.next-meeting {
4453
margin: 0;
4554
}
4655
}
56+
57+
p {
58+
font-size: 1em;
59+
color: #333;
60+
}
61+
62+
.buy-ticket {
63+
text-decoration: line-through;
64+
}
65+
}
66+
67+
.schedule {
68+
clear: left;
69+
background: #555;
70+
padding: 1em 0;
71+
}
72+
73+
.schedule-list {
74+
color: #fff;
75+
list-style: none;
76+
padding: 0;
77+
width: 90%;
78+
margin: 0 auto;
79+
80+
@include sb-media(43em) {
81+
display: block;
82+
width: 41em;
83+
}
84+
}
85+
86+
.schedule-list--item {
87+
font-size: 1em;
88+
89+
@include sb-media(30em) {
90+
font-size: 1.5em;
91+
}
92+
93+
@include sb-media(43em) {
94+
font-size: 2em;
95+
}
96+
}
97+
98+
.schedule-list--time {
99+
color: #ccc;
100+
display: block;
101+
102+
@include sb-media(43em) {
103+
display: inline-block;
104+
width: 6em;
105+
}
106+
}
107+
108+
.schedule-list--description {
109+
display: inline-block;
110+
margin-bottom: 1em;
47111
}
48112

49113
.sponsor-list {
50114
list-style: none;
51115
padding: 0;
52116
}
117+
118+
.sponsor-list--sponsor {
119+
display: inline-block;
120+
}
53121
}

‎templates/layouts/nodebots.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
66
<head>
77
<meta charset="utf-8">
8-
<title>GemCity JS</title>
8+
<title>NodeBots @ GemCity JS</title>
99
<meta name="description" content="">
1010
<meta name="viewport" content="width=device-width,initial-scale=1.0">
1111
<meta name="msapplication-TileColor" content="#73c5d3"/>

‎templates/pages/nodebots.hbs

+33-3
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,44 @@ layout: nodebots.hbs
66
<article class="next-meeting">
77
<h1>NodeBots Day</h1>
88
<time>July 25, 2015 - 9:00 am to 5:00 pm</time>
9-
<p>NodeBots Day</p>
109
<ul class="links">
1110
<li class="link-item">
1211
<a href="//nodebots.io">NodeBots.io</a>
1312
</li>
1413
<li class="link-item">
15-
<a href="/eventbrite/________">Buy My Ticket</a>
14+
<a href="#" class="buy-ticket">Buy My Ticket</a> (on sale soon)
1615
</li>
17-
<p class="lunch"></p>
16+
</ul>
17+
<p>$15 Ticket cost includes breakfast (doughnuts/coffee), lunch, and robot kit (which you can take home).</p>
1818
</article>
1919
</section>
20+
21+
<section class="schedule">
22+
<ol class="schedule-list">
23+
<li class="schedule-list--item">
24+
<time class="schedule-list--time">8:30 - 9:00</time>
25+
<span class="schedule-list--description">Checkin/Registration</span>
26+
</li>
27+
<li class="schedule-list--item">
28+
<time class="schedule-list--time">9:00 - 9:45</time>
29+
<span class="schedule-list--description">Introduction &amp; Instructions</span>
30+
</li>
31+
<li class="schedule-list--item">
32+
<time class="schedule-list--time">9:45 - 12:00</time>
33+
<span class="schedule-list--description">Design &amp; Build</span>
34+
</li>
35+
<li class="schedule-list--item">
36+
<time class="schedule-list--time">12:00 - 1:00</time>
37+
<span class="schedule-list--description">Lunch</span>
38+
</li>
39+
<li class="schedule-list--item">
40+
<time class="schedule-list--time">1:00 - 4:00</time>
41+
<span class="schedule-list--description">Build &amp; Test</span>
42+
</li>
43+
<li class="schedule-list--item">
44+
<time class="schedule-list--time">4:00 - 5:00</time>
45+
<span class="schedule-list--description">Battle</span>
46+
</li>
47+
</ol>
48+
49+
</section>

‎templates/partials/_nodebots-footer.hbs

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
<div class="sponsorship">
22
<h1>Brought to you by:</h1>
3-
<ul class="sponsor-list">
4-
<li>
3+
<ul class="sponsor-list sponsor-robot">
4+
<li class="sponsor-list--sponsor">
5+
<img src="/img/logo-sparkbox.png" alt="Sparkbox">
6+
</li>
7+
{{!-- <li class="sponsor-list--sponsor">
58
<img src="/img/logo-datayard.png" alt="DataYard">
9+
</li> --}}
10+
</ul>
11+
<ul class="sponsor-list sponsor-circuit">
12+
<li class="sponsor-list--sponsor">
13+
<img src="/img/logo-gemcityjs.png" alt="GemCity JS">
14+
</li>
615
</ul>
716
{{!-- <h2>Want to be a sponsor?</h2>
817
<p>Check out the <a href="https://drive.google.com/a/heysparkbox.com/file/d/0B4CEmoP-hNToYy1URk1ITTA2LUU/view?usp=sharing">Sponsor Prospectus</a> for more details.</p> --}}

‎templates/partials/_nodebots-header.hbs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<header>
2-
<img src="/img/sd/gemCityJS-white.png" alt="GemCityJS">
3-
<span class="plus">+</span>
4-
<img src="/img/NodeBots-logo.png" alt="NodeBots">
2+
<img class="header-bot bruiser-bot" src="/img/bruiser-bot.png" alt="Bruiser Bot">
3+
<h1>Dayton<br> NodeBots Day</h1>
4+
<img class="header-bot wheelie-bot" src="/img/wheelie-bot.png" alt="Wheelie Bot">
55
<p>
6-
Join us for a day of building robots with Javascript.
6+
Join us for a day of building robots with Javascript.
77
</p>
88
</header>

0 commit comments

Comments
 (0)