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.

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

Added open source information and fixed ampersands #1583

Merged
merged 6 commits into from Feb 15, 2017
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions get-involved.php
Expand Up @@ -114,8 +114,8 @@
<p></p>
</div>
<div class="half">
<h3>Question & Answer</h3>
<p>StackExchange is a Q&A website built around finding the best answers to common questions. Anyone can create an account to start asking and answering.</p>
<h3>Question &amp; Answer</h3>
<p>StackExchange is a Q&amp;A website built around finding the best answers to common questions. Anyone can create an account to start asking and answering.</p>

<div class="actions actions--column">
<a class="button flat suggested-action" href="https://elementaryos.stackexchange.com/unanswered">Unanswered Questions</a>
Expand Down
4 changes: 2 additions & 2 deletions index.php
Expand Up @@ -153,7 +153,7 @@
<img src="images/icons/apps/64/internet-web-browser.svg" alt="epiphany icon" />
<div>
<h2>Epiphany</h2>
<p>Surf the web with a fast & lightweight web browser. Epiphany lets you use HTML5 websites and web apps while being lighter on battery life.</p>
<p>Surf the web with a fast &amp; lightweight web browser. Epiphany lets you use HTML5 websites and web apps while being lighter on battery life.</p>
</div>
</div>
</div>
Expand Down Expand Up @@ -253,7 +253,7 @@
<img src="images/icons/apps/64/utilities-terminal.svg" alt="terminal icon" />
<div>
<h2>Terminal</h2>
<p>With a color scheme designed to prevent eye strain, browser-class tabs with history and smart naming, task-completion notifications, natural copy & paste, backlog search and more, who says you can't teach an old app new tricks?</p>
<p>With a color scheme designed to prevent eye strain, browser-class tabs with history and smart naming, task-completion notifications, natural copy &amp; paste, backlog search and more, who says you can't teach an old app new tricks?</p>
</div>
</div>
</div>
Expand Down
16 changes: 15 additions & 1 deletion open-source.php
Expand Up @@ -15,7 +15,21 @@
<div class="two-thirds">
<h1>We're Built on Open Source</h1>
<h4>The elementary OS platform is built upon a strong foundation of Free &amp; Open Source software. Without projects such as these, elementary OS would not exist.</h4>
<a class="button suggested-action" href="get-involved#desktop-development">Get Involved</a>
</div>
<div class="half">
<h3>Security &amp; Privacy</h3>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indentation looks off starting here. Our code style is 4 spaces.

<h4>By being Open Source, elementary OS can benefit from superior security and privacy over closed source software. When the source code is available to audit, anyone in the community — whether a security researcher, a concerned user, or an OEM shipping the OS on their hardware — can ensure the software is secure and not collecting or leaking personal information.</h4>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Switch to a <p>

</div>
<div class="half">
<h3>Better for Developers</h3>
<h4>If your app could benefit from a system API or feature that’s not yet available, you can help write that feature into the OS. Similarly, you might be curious as to how a feature or design pattern in elementary OS was made. Instead of guessing or trying to reimplement it on your own, you can just look at the underlying source code for a definitive answer.</h4>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Switch to a <p>

</div>
<a class="button suggested-action" href="get-involved#desktop-development">Get Involved</a>
<div class="whole">
<div class="two-thirds">
<h2>We Support Open Source Projects</h2>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this block got copied in up here when it's already down below.

<h4>elementary makes a point to send funds back to the projects we rely on. When you purchase a copy of elementary OS, you're also supporting great projects like these.</h4>
</div>
</div>
</div>
<div class="grid">
Expand Down
2 changes: 1 addition & 1 deletion privacy-policy.php
Expand Up @@ -14,7 +14,7 @@
<p class="text-center"><strong>You can choose to disable or selectively turn off any cookies or third-party cookies in your browser settings.</strong></p>
<p>This site uses cookies for incremental improvements. You may find the services function without them but at a reduced usability. For example, the site will not remember if you have previously paid for elementary OS; by default you will be asked to pay again.</p>
<h5 data-l10n-off>CloudFlare</h5>
<p>Stores cookies to log behavioral elements and analyze potential threats. For more information, see the <a class="read-more" target="_blank" href="https://www.cloudflare.com/security-policy">CloudFlare Privacy & Security Policy</a></p>
<p>Stores cookies to log behavioral elements and analyze potential threats. For more information, see the <a class="read-more" target="_blank" href="https://www.cloudflare.com/security-policy">CloudFlare Privacy &amp; Security Policy</a></p>
<h5 data-l10n-off>Google Analytics</h5>
<p>Stores cookies to collect information—including the number of visitors to this site, from where they were referred, and the pages they visit—in an anonymous form. This information is used to help improve the site. For more information, see Google's article on <a class="read-more" target="_blank" href="https://support.google.com/analytics/answer/6004245">Safeguarding Your Data</a></p>
<h5 data-l10n-off>Stripe</h5>
Expand Down