Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove new brand assets from trademarks list [#15091] #15174

Merged
merged 1 commit into from
Sep 18, 2024
Merged

Remove new brand assets from trademarks list [#15091] #15174

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 35 additions & 25 deletions bedrock/foundation/templates/foundation/trademarks/list.html
View file
Open in desktop
craigcook marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@ <h2>Wordmarks</h2>
<li>Mozilla Communities</li>
<li>Mozilla Reps</li>
<li>Mozilla Webmaker</li>
<li>Mozilla Wordmark</li>
<li>Mozilla Wordmark + Logo</li>
{#
# <li>Mozilla Wordmark</li>
# <li>Mozilla Wordmark + Logo</li>
#}
<li>Mozillians</li>
<li>Pontoon</li>
<li>QMO</li>
Expand All @@ -52,9 +54,11 @@ <h2>Wordmarks</h2>
<li>Thunderbird</li>
<li>View Source</li>
<li>XUL</li>
<li>Zilla Dino</li>
<li>Zilla Dino Roar</li>
<li>Zilla Flag</li>
{#
# <li>Zilla Dino</li>
# <li>Zilla Dino Roar</li>
# <li>Zilla Flag</li>
#}
</ul>

<h2>Logos</h2>
Expand Down Expand Up @@ -147,10 +151,12 @@ <h2>Logos</h2>
<td><img width="100" height="100" alt="Mozilla logo™" src="{{ static('img/trademarks/mozilla-logo-tm.svg') }}"></td>
<th>Mozilla logo</th>
</tr>
<tr>
<td><img width="100" height="100" alt="Mozilla Wordmark" src="{{ static('img/trademarks/mozilla-rebranded.svg') }}"></td>
<th>Mozilla Wordmark</th>
</tr>
{#
# <tr>
# <td><img width="100" height="100" alt="Mozilla Wordmark" src="{{ static('img/trademarks/mozilla-rebranded.svg') }}"></td>
# <th>Mozilla Wordmark</th>
# </tr>
#}
<tr>
<td><img width="100" alt="Mozilla reps logo™" src="{{ static('img/trademarks/logo-mozilla-reps.png') }}"></td>
<th>Mozilla Reps</th>
Expand All @@ -159,10 +165,12 @@ <h2>Logos</h2>
<td><img width="100" height="100" alt="Mozilla small m logo™" src="{{ static('img/trademarks/logo-mozm.png') }}"></td>
<th>Mozilla small m</th>
</tr>
<tr>
<td><img width="100" height="100" alt="Mozilla Wordmark + Zilla Flag™" src="{{ static('img/trademarks/mozilla-dino-flag.svg') }}"></td>
<th>Mozilla Wordmark + Zilla Flag</th>
</tr>
{#
# <tr>
# <td><img width="100" height="100" alt="Mozilla Wordmark + Zilla Flag™" src="{{ static('img/trademarks/mozilla-dino-flag.svg') }}"></td>
# <th>Mozilla Wordmark + Zilla Flag</th>
# </tr>
#}
<tr>
<td><img width="100" height="100" alt="Pontoon logo™" src="{{ static('img/trademarks/pontoon-logo.svg') }}"></td>
<th>Pontoon</th>
Expand Down Expand Up @@ -199,18 +207,20 @@ <h2>Logos</h2>
</td>
<th>Webmaker</th>
</tr>
<tr>
<td><img width="100" height="100" alt="Zilla Dino™" src="{{ static('img/trademarks/zilla-dino.svg') }}"></td>
<th>Zilla Dino</th>
</tr>
<tr>
<td><img width="100" height="100" alt="Zilla Dino Roar™" src="{{ static('img/trademarks/zilla-dino-roar.svg') }}"></td>
<th>Zilla Dino Roar</th>
</tr>
<tr>
<td><img width="100" height="100" alt="Zilla Flag™" src="{{ static('img/trademarks/zilla-flag.svg') }}"></td>
<th>Zilla Flag</th>
</tr>
{#
# <tr>
# <td><img width="100" height="100" alt="Zilla Dino™" src="{{ static('img/trademarks/zilla-dino.svg') }}"></td>
# <th>Zilla Dino</th>
# </tr>
# <tr>
# <td><img width="100" height="100" alt="Zilla Dino Roar™" src="{{ static('img/trademarks/zilla-dino-roar.svg') }}"></td>
# <th>Zilla Dino Roar</th>
# </tr>
# <tr>
# <td><img width="100" height="100" alt="Zilla Flag™" src="{{ static('img/trademarks/zilla-flag.svg') }}"></td>
# <th>Zilla Flag</th>
# </tr>
#}
</table>

<h2>Pocket Trademark List</h2>
Expand Down