Skip to content

Commit 30d68ed

Browse files
authored
Merge pull request #1009 from samridhivig/content-updates-to-logos-route
Add /logos/ route new sections and anchor links
2 parents 7fc181c + d5b8a6e commit 30d68ed

File tree

2 files changed

+38
-1
lines changed

2 files changed

+38
-1
lines changed

app/components/mascots/mascot-list.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<ul class="unstyled grid {{if (eq @display "small") "sm:grid-2 lg:grid-3" "sm:grid-1 lg:grid-2"}}">
22
{{#each @mascots as |mascot|}}
3-
<li data-test-mascot>
3+
<li id={{mascot.id}} data-test-mascot>
44
<Mascots::MascotList::Item
55
@mascot={{mascot}}
66
/>

app/templates/logos.hbs

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,43 @@
131131
<p>We sometimes grant licenses for specific use cases, and certain community initiatives may, with approval, commission the design of custom Tomsters and Zoeys via official channels. For more info on commissioned mascots, <LinkTo @route="mascots.faq">visit the Tomster FAQ page</LinkTo>.</p>
132132
</section>
133133

134+
<section aria-labelledby="company-technology-pages" class="branding-section">
135+
<h2 id="company-technology-pages">Company Technology Pages</h2>
136+
<p>Many companies choose to display icons and logos of their technology stack on their company About Us or Career pages. The <strong>Tomster Lockup, Classic Zoey</strong> and <strong>Primary Logo</strong> are approved for this use case. Specific permission is not required. The images should link to <LinkTo @route="index">https://emberjs.com/</LinkTo>.</p>
137+
</section>
138+
139+
<section aria-labelledby="blog-posts-and-articles" class="branding-section">
140+
<h2 id="blog-post-and-articles">Blog Posts and Articles</h2>
141+
<p>Blogs by individuals, companies, and media publications may utilize any of the pieces of art below in the <a href="#standard-art-set">Standard Art Set section</a>, provided they add the following footer content to their posts/pages:</p>
142+
<p>
143+
<em>Ember, the Ember logo, and the Tomster/Zoey designs are exclusive trademarks registered in the United States by Tilde Inc, and are used here with permission. [Blog page/product/etc] is unaffiliated with the Ember project, and the use of this art does not imply any endorsement or official status.</em>
144+
</p>
145+
<p>We reserve the right to require the art to be taken down at any point, with or without explanation.</p>
146+
</section>
147+
148+
<section aria-labelledby="presentation-slides" class="branding-section">
149+
<h2 id="presentation-slides">Presentation Slides</h2>
150+
<p>The <a href="#standard-art-set">Standard Art Set</a> may also be used in presentation slides for industry conferences, internal corporate presentations, training presentations, and funding pitch decks, provided the following footer/asterisk content is added to a slide earlier in the Deck than where the art is used (it's alright for it to be small). It needs to appear once per deck, not every time a piece of art is used:</p>
151+
<p>
152+
<em>Ember, the Ember logo, and the Tomster/Zoey designs are exclusive trademarks registered in the United States by Tilde Inc, and are used here with permission. [Blog page/product/etc] is unaffiliated with the Ember project, and the use of this art does not imply any endorsement or official status.</em>
153+
</p>
154+
</section>
155+
156+
<section aria-labelledby="standard-art-set" class="branding-section">
157+
<h2 id="standard-art-set">Standard Art Set</h2>
158+
<p>The following items are included in the Standard Art Set:</p>
159+
<p>
160+
<em>Tomster/Zoey Octane car lockup, Primary Logo Lockup,
161+
<a href="/mascots/#ember-a11y" rel="noopener noreferrer" target="_blank">Ember A11y Tomster and Zoey</a>,
162+
<a href="/mascots/#classic-zoey" rel="noopener noreferrer" target="_blank">Classic Zoey</a>,
163+
<a href="/mascots/#lt-s-tomster" rel="noopener noreferrer" target="_blank">LTS Tomster</a>,
164+
<a href="/mascots/#construction-tomster" rel="noopener noreferrer" target="_blank">Construction Tomster</a>,
165+
<a href="/mascots/#classic-tomster" rel="noopener noreferrer" target="_blank">Classic Tomster</a>,
166+
<a href="/mascots/#original-tomster" rel="noopener noreferrer" target="_blank">Original Tomster</a>,
167+
</em>
168+
</p>
169+
</section>
170+
134171
<section aria-labelledby="project-naming" class="branding-section">
135172
<h2 id="project-naming">Naming</h2>
136173
<p>Please avoid naming your projects and events anything that implies Ember or Tilde's endorsement. Keep this in mind when selecting domain names as well.</p>

0 commit comments

Comments
 (0)