Skip to content
This repository was archived by the owner on Mar 22, 2019. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ Other parts of the public website are separate apps:

New contributors are welcome! The website is maintained by an all-volunteer team, and we are thankful for your help.

The best way to get started is to find issue labeled "good first issue" or "help wanted." If you have questions or want a buddy to pair with, drop by the #-team-learning channel on the
[Ember Community Slack](https://ember-community-slackin.herokuapp.com/).
The best way to get started is to find issue labeled "good first issue" or "help wanted." If you have questions or want a buddy to pair with, drop by the #-team-learning channel on the
[Ember Community Discord](https://discordapp.com/invite/zT3asNS).
Like most open source projects, contributors are encouraged to open an issue
to propose changes and iterate on ideas before investing time in coding.
Some tips for working with git/GitHub can be found in
Expand Down
8 changes: 4 additions & 4 deletions source/_footer.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</div>

<div class="footer-statement">

<p class="footer-tagline">Ember.js is free, open source and always will be.</p>
<div class="footer-social">
<a href="http://twitter.com/emberjs" title="Twitter">
Expand All @@ -26,8 +26,8 @@
<a href="https://github.com/emberjs/ember.js" title="GitHub">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000"><path d="M392 643q0 22-7 45t-24 43q-17 20-40 19t-41-19q-18-18-24-43t-7-45q-1-20 7-46t24-43q16-17 41-19t40 19q15 21 24 43t7 46zm357 0q0 22-7 45t-24 43q-17 20-40 19t-41-19q-18-18-24-43t-7-45q-1-20 7-46t24-43q16-17 41-19t40 19q15 21 24 43t7 46zm90 0q0-67-39-114t-104-47q-23 0-109 12-40 6-88 6t-87-6q-85-12-109-12-66 0-104 47t-39 114q0 49 18 85t45 58q27 22 68 33t78 17q37 6 83 4h94q46 0 83-4t78-17q41-13 69-33t45-58q17-38 18-85zm125-99q0 116-34 185-22 43-59 74t-79 48q-42 17-95 27t-96 12q-43 2-93 3-43 0-79-2t-82-7q-46-5-85-17t-77-29q-38-17-67-45t-48-64q-35-69-35-185 0-132 76-221-15-45-15-95 0-64 28-121 61 0 106 22t106 69q82-20 172-20 83 0 157 18 58-46 104-67t105-22q29 57 29 121 0 49-15 94 76 89 76 222z"></path></svg>
</a>
<a href="https://ember-community-slackin.herokuapp.com/" title="Slack">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M446.2 270.4c-6.2-19-26.9-29.1-46-22.9l-45.4 15.1-30.3-90 45.4-15.1c19.1-6.2 29.1-26.8 23-45.9-6.2-19-26.9-29.1-46-22.9l-45.4 15.1-15.7-47c-6.2-19-26.9-29.1-46-22.9-19.1 6.2-29.1 26.8-23 45.9l15.7 47-93.4 31.2-15.7-47c-6.2-19-26.9-29.1-46-22.9-19.1 6.2-29.1 26.8-23 45.9l15.7 47-45.3 15c-19.1 6.2-29.1 26.8-23 45.9 5 14.5 19.1 24 33.6 24.6 6.8 1 12-1.6 57.7-16.8l30.3 90L78 354.8c-19 6.2-29.1 26.9-23 45.9 5 14.5 19.1 24 33.6 24.6 6.8 1 12-1.6 57.7-16.8l15.7 47c5.9 16.9 24.7 29 46 22.9 19.1-6.2 29.1-26.8 23-45.9l-15.7-47 93.6-31.3 15.7 47c5.9 16.9 24.7 29 46 22.9 19.1-6.2 29.1-26.8 23-45.9l-15.7-47 45.4-15.1c19-6 29.1-26.7 22.9-45.7zm-254.1 47.2l-30.3-90.2 93.5-31.3 30.3 90.2-93.5 31.3z"></path></svg>
<a href="https://discordapp.com/invite/zT3asNS" title="Discord">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 245 240"><path d="M104.4 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1.1-6.1-4.5-11.1-10.2-11.1zM140.9 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1s-4.5-11.1-10.2-11.1z"/><path class="st0" d="M189.5 20h-134C44.2 20 35 29.2 35 40.6v135.2c0 11.4 9.2 20.6 20.5 20.6h113.4l-5.3-18.5 12.8 11.9 12.1 11.2 21.5 19V40.6c0-11.4-9.2-20.6-20.5-20.6zm-38.6 130.6s-3.6-4.3-6.6-8.1c13.1-3.7 18.1-11.9 18.1-11.9-4.1 2.7-8 4.6-11.5 5.9-5 2.1-9.8 3.5-14.5 4.3-9.6 1.8-18.4 1.3-25.9-.1-5.7-1.1-10.6-2.7-14.7-4.3-2.3-.9-4.8-2-7.3-3.4-.3-.2-.6-.3-.9-.5-.2-.1-.3-.2-.4-.3-1.8-1-2.8-1.7-2.8-1.7s4.8 8 17.5 11.8c-3 3.8-6.7 8.3-6.7 8.3-22.1-.7-30.5-15.2-30.5-15.2 0-32.2 14.4-58.3 14.4-58.3 14.4-10.8 28.1-10.5 28.1-10.5l1 1.2c-18 5.2-26.3 13.1-26.3 13.1s2.2-1.2 5.9-2.9c10.7-4.7 19.2-6 22.7-6.3.6-.1 1.1-.2 1.7-.2 6.1-.8 13-1 20.2-.2 9.5 1.1 19.7 3.9 30.1 9.6 0 0-7.9-7.5-24.9-12.7l1.4-1.6s13.7-.3 28.1 10.5c0 0 14.4 26.1 14.4 58.3 0 0-8.5 14.5-30.6 15.2z"></path></svg>
</a>
</div>
</div>
Expand Down Expand Up @@ -61,4 +61,4 @@

</div>
</div>
</footer>
</footer>
8 changes: 4 additions & 4 deletions source/community.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ responsive: true
<a href="http://discuss.emberjs.com">Ember Discussion Forum</a> &mdash; a great
venue for discussing features, architecture and best practices.
</p>

<p>
<a href="https://embercommunity.slack.com">Ember Community Slack</a> &mdash; use <a href="https://ember-community-slackin.herokuapp.com/">the Slackin app</a> to receive an invitation.
<a href="https://discordapp.com/invite/zT3asNS">Ember Community Discord</a> &mdash; use <a href="https://discordapp.com/invite/zT3asNS">this link</a> to receive an invitation.
</p>

<p>
<a href="http://stackoverflow.com/questions/tagged/ember.js">StackOverflow</a> &mdash; used to
track questions. Just tag your question with <code>ember.js</code> or
Expand Down Expand Up @@ -110,4 +110,4 @@ responsive: true
<iframe width="640" height="360" src="https://www.youtube.com/embed/rY5D38RQoEg?rel=0" frameborder="0" allowfullscreen></iframe>
</div>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion source/meetup-assets.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ responsive: true
</p>

<p>
There's also an Ember Meetup Organizer Slack Channel, which we're happy to add new organizers to. <a href="mailto:meetups@emberjs.com">Reach out via email to be added</a>, and be sure to specify what group you're working on.
There's also an Ember Meetup Organizer Discord Channel, which we're happy to add new organizers to. <a href="mailto:meetups@emberjs.com">Reach out via email to be added</a>, and be sure to specify what group you're working on.
</p>

</div>