Skip to content
This repository has been archived by the owner on Mar 22, 2019. It is now read-only.

Makes legal page responsive #2563

Merged
merged 1 commit into from
Apr 24, 2016
Merged

Makes legal page responsive #2563

Show file tree
Hide file tree
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
83 changes: 44 additions & 39 deletions source/legal.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,48 @@
---
title: Legal
responsive: true
---

<h1>Legal</h1>

<p>
Ember is a registered trademark owned by <a href="http://www.tilde.io">Tilde Inc</a>.
</p>
<p>
The trademarks, logos, and service marks (collectively the “Trademarks”) displayed on our website are registered and unregistered Trademarks used by us, or other third parties. Nothing contained on this website should be construed as granting, by implication, estoppel, or otherwise, any license or right to use any Trademark displayed on the website without written permission from us or such third party that may own the Trademarks displayed on the website.
</p>

<h3>Non-Legalese TL;DR</h3>

<p>
Ember's strong brand and identity are an important part of the project. We're protective of it! Please be respectful and <a href="mailto:[email protected]">reach out</a> if you're unsure if your use is acceptable. Visit <a href="/logos">the Logos page</a> to learn more about what is and isn't permitted, and to download logos.
</p>
<p>
We often grant licenses for use of the Ember logo for non-commercial community use cases. If you think you might be one of them, let's talk. We always aim to be reasonable.
</p>
<p>
The Tomster in particular has many more restrictions and should not be used without express authorization. <a href="../tomster">You can view the various official Tomsters</a>, and check out <a href="../tomster/faq">our growing FAQ</a>.
</p>

<h1>The Ember License</h1>

<p>
The most current Ember license details <a href="https://github.com/emberjs/ember.js/blob/master/LICENSE">can be found on GitHub</a>.
</p>

<h1>Documentation Images</h1>

<p>
The graphs, diagrams and charts in the <a href="/guides">Ember Guides</a> have been released under the Creative Commons Attribution-NonCommercial-ShareAlike (CC BY-NC-SA) license.
</p>
<img class="rightFloat" src="/images/legal/license-cc_by_nc_sa.png" />
<p>
This license allows others to remix, tweak, and build upon the instructional materials non-commercially, as long as they credit Ember and license any new creations under the identical terms.
</p>
<p>
This license does <strong>not</strong> include any uses of the Tomster included in the Guides. Please reach out for clarification on any ambiguous images before using.
</p>
<% content_for :outside_wrapper do %>
<div class="legal-wrapper">
<h1>Legal</h1>

<p>
Ember is a registered trademark owned by <a href="http://www.tilde.io">Tilde Inc</a>.
</p>
<p>
The trademarks, logos, and service marks (collectively the “Trademarks”) displayed on our website are registered and unregistered Trademarks used by us, or other third parties. Nothing contained on this website should be construed as granting, by implication, estoppel, or otherwise, any license or right to use any Trademark displayed on the website without written permission from us or such third party that may own the Trademarks displayed on the website.
</p>

<h3>Non-Legalese TL;DR</h3>

<p>
Ember's strong brand and identity are an important part of the project. We're protective of it! Please be respectful and <a href="mailto:[email protected]">reach out</a> if you're unsure if your use is acceptable. Visit <a href="/logos">the Logos page</a> to learn more about what is and isn't permitted, and to download logos.
</p>
<p>
We often grant licenses for use of the Ember logo for non-commercial community use cases. If you think you might be one of them, let's talk. We always aim to be reasonable.
</p>
<p>
The Tomster in particular has many more restrictions and should not be used without express authorization. <a href="../tomster">You can view the various official Tomsters</a>, and check out <a href="../tomster/faq">our growing FAQ</a>.
</p>

<h1>The Ember License</h1>

<p>
The most current Ember license details <a href="https://github.com/emberjs/ember.js/blob/master/LICENSE">can be found on GitHub</a>.
</p>

<h1>Documentation Images</h1>

<p>
The graphs, diagrams and charts in the <a href="/guides">Ember Guides</a> have been released under the Creative Commons Attribution-NonCommercial-ShareAlike (CC BY-NC-SA) license.
</p>
<img class="rightFloat" src="/images/legal/license-cc_by_nc_sa.png" />
<p>
This license allows others to remix, tweak, and build upon the instructional materials non-commercially, as long as they credit Ember and license any new creations under the identical terms.
</p>
<p>
This license does <strong>not</strong> include any uses of the Tomster included in the Guides. Please reach out for clarification on any ambiguous images before using.
</p>
</div>
<% end %>
12 changes: 12 additions & 0 deletions source/stylesheets/components/legal.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.legal-wrapper {
padding: 3em;
padding-bottom: 1em;
max-width: 60em;
margin: 0 auto;
}

@media screen and (max-width: 460px) {
.legal-wrapper {
padding: 2em 1em 1em 1em;
}
}
1 change: 1 addition & 0 deletions source/stylesheets/site.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
@import 'dashboard';
@import 'shared';
@import 'survey';
@import 'components/legal';

/* Calculated page dimensions. */
$page-width: 960px;
Expand Down