Skip to content

Commit

Permalink
Merge pull request #2 from UtahJS/SurlyMae-plus-sisters
Browse files Browse the repository at this point in the history
[SurlyMae-plus-sisters] SurlyMae updates plus sister logos
  • Loading branch information
kensnyder authored Jan 19, 2017
2 parents c0c00d8 + f2947b7 commit d030b76
Show file tree
Hide file tree
Showing 8 changed files with 76 additions and 10 deletions.
32 changes: 27 additions & 5 deletions assets/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,16 @@ p {
margin-bottom: 8px;
}
.btn-slack { background-color: #e81d62; }
.btn-mailing { background-color: #3e50b4; }
.btn-mailing { background-color: #5f7c8a; }
.btn-orem-meetup { background-color: #fe5621; }
.btn-slc-meetup { background-color: #4bae4f; }
.btn-linkedin { background-color: #2095f2; }
.btn-conf { background-color: #5f7c8a; }
.btn-videos { background-color: #f34235; }
.btn-ogden-meetup { background-color: #2095f2; }
.btn-learners-meetup { background-color: #e81d62; }
.btn-linkedin { background-color: #5f7c8a; }
.btn-twitter { background-color: #fe5621; }
.btn-conf { background-color: #4bae4f; }
.btn-videos { background-color: #2095f2; }

dl.ways-to-participate {
margin: 45px 0 0 0;
}
Expand All @@ -85,7 +89,25 @@ dl.ways-to-participate dd {
float: right;
max-width: 425px;
}
.sisters {
display: flex;
justify-content: center;
align-items: flex-end;
flex-wrap: wrap;
margin-top: 20px;
}
.sister {
flex: 100px;
text-align: center;
margin-bottom: 20px;
display: block;
}
.sister-img,
.sister-name {
display: block;
margin: 0 auto;
}
.about {
padding-top: 60px;
max-width: 600px;
}
}
Binary file added assets/img/sisters/angularjs.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/sisters/emberjs.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/sisters/js-alt.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/sisters/lunchjs.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/sisters/nodejs.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/sisters/reactjs.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 49 additions & 5 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h2>UtahJS</h2>
<div class="hero-subtext hero-venue">Get Involved!</div>
</div>
<div class="hero-buttons">
<a href="https://conf.utahjs.com" class="btn btn-primary">2016 Conference</a>
<a href="https://conf.utahjs.com" class="btn btn-primary">Conference</a>
<a href="https://slack.utahjs.com" class="btn btn-slack">Slack</a>
</div>
</div>
Expand Down Expand Up @@ -75,7 +75,7 @@ <h1>Ways to participate in UtahJS</h1>

<dt><a href="http://www.meetup.com/UtahJS/" class="btn btn-participate btn-orem-meetup">Orem Meetup</a></dt>
<dd>
Join us the first Thursday of every month at Stevens-Henager college in Orem.
Join us the first Thursday of every month at Jane in Lehi.
<a href="http://www.meetup.com/UtahJS/">Schedule on Meetup.com</a>
</dd>

Expand All @@ -85,16 +85,33 @@ <h1>Ways to participate in UtahJS</h1>
<a href="http://www.meetup.com/UtahJS/">Schedule on Meetup.com</a>
</dd>

<dt><a href="http://www.meetup.com/UtahJS/" class="btn btn-participate btn-ogden-meetup">Ogden Meetup</a></dt>
<dd>
Join us the first Thursday of every month at Startup Ogden.
<a href="http://www.meetup.com/UtahJS/">Schedule on Meetup.com</a>
</dd>

<dt><a href="http://www.meetup.com/UtahJS/" class="btn btn-participate btn-learners-meetup">Learners Meetup</a></dt>
<dd>
Presentations immediately proceeding the SLC meetup, as well as monthly study groups.
<a href="http://www.meetup.com/UtahJS/">Schedule on Meetup.com</a>
</dd>

<dt><a href="https://www.linkedin.com/groups/6635311" class="btn btn-participate btn-linkedin">LinkedIn</a></dt>
<dd>
Get to know us, connect with us and network with us on our
<a href="https://www.linkedin.com/groups/6635311">LinkedIn Group</a>.
</dd>

<dt><a href="https://twitter.com/utjs" class="btn btn-participate btn-twitter">Twitter</a></dt>
<dd>
Get updates, join the conversation and follow us on
<a href="https://twitter.com/utjs">Twitter</a>.
</dd>

<dt><a href="https://conf.utahjs.com" class="btn btn-participate btn-conf">Conferences</a></dt>
<dd>
Our 5th annual conference will be held at the O.C. Tanner Event Center on September 16, 2016.
Details at
Our 6th annual conference is coming Fall 2017. Get the details on last year's conference at
<a href="https://conf.utahjs.com">conf.utahjs.com</a>.
</dd>

Expand All @@ -103,9 +120,36 @@ <h1>Ways to participate in UtahJS</h1>
Watch meetup presentations and conference talks on
<a href="https://www.youtube.com/channel/UCimy8Fjcw_8XwEDEsI0cKeA">YouTube</a>.
</dd>

</dl>

<h2>Sister Groups</h2>
<div class="sisters">
<a href="https://www.meetup.com/utahnodejs/" target="_blank" class="sister">
<img class="sister-img" src="assets/img/sisters/nodejs.jpg" width="70" height="90" alt="" />
<span class="sister-name">Utah Node.js</span>
</a>
<a href="https://www.meetup.com/AngularJS-Utah/" target="_blank" class="sister">
<img class="sister-img" src="assets/img/sisters/angularjs.jpg" width="90" height="90" alt="" />
<span class="sister-name">AngularJS</span>
</a>
<a href="https://www.meetup.com/lunch-js/" target="_blank" class="sister">
<img class="sister-img" src="assets/img/sisters/lunchjs.jpg" width="90" height="90" alt="" />
<span class="sister-name">Lunch.JS</span>
</a>
<a href="https://www.meetup.com/EmberJS-SLC/" target="_blank" class="sister">
<img class="sister-img" src="assets/img/sisters/emberjs.jpg" width="60" height="90" alt="" />
<span class="sister-name">Ember.JS</span>
</a>
<a href="https://www.meetup.com/ReactJS-Utah/" target="_blank" class="sister">
<img class="sister-img" src="assets/img/sisters/reactjs.jpg" width="90" height="90" alt="" />
<span class="sister-name">ReactJS</span>
</a>
<a href="https://www.meetup.com/JS-alt/" target="_blank" class="sister">
<img class="sister-img" src="assets/img/sisters/js-alt.jpg" width="90" height="54" alt="" />
<span class="sister-name">JS.alt</span>
</a>
</div>

<div class="about">
UtahJS is a 501(c)(3) organization and contributions are tax deductible.
We are run by a passionate group of volunteers.
Expand Down

0 comments on commit d030b76

Please sign in to comment.