Permalink
Browse files

Merge pull request #65 from rossbruniges/master

Copy updates
  • Loading branch information...
2 parents 5b6fca6 + 4623f7c commit c553e80f7488c6817fdd3185c9bc081f7cec8936 @jonoxia jonoxia committed Feb 27, 2012
Showing with 21 additions and 17 deletions.
  1. +20 −16 index.html
  2. +1 −1 website/branding/css/template.css
  3. BIN website/branding/img/nodes.png
View
@@ -35,20 +35,20 @@
</ul>
</nav>
- <h1><img src="website/branding/img/header-mozilla.png" alt="mozilla"><img src="website/branding/img/ford_foundation.gif" alt="Ford Foundation" /></h1>
+ <h1><img src="website/branding/img/header-mozilla.png" alt="mozilla" /></h1>
</header>
-<h1 id="main-feature" class="large">Collusion</h1>
+<h1 id="main-feature" class="large">Introducing Collusion</h1>
<section id="primary" class="container box">
-
- <img src="website/branding/img/collusion.png" alt="" />
+<h2>Discover who's tracking you online</h2>
+ <img src="website/branding/img/nodes.png" alt="" />
<p>Collusion is an experimental add-on for Firefox and allows you, for the first time, to see all the third parties that are tracking your movements across the Web. It will show, in real time, how that data creates a spider-web of interaction between companies and other trackers.</p>
<a class="button" href="demo/">View our demo - see how you're being tracked</a>
- <a class="button" href="https://secure.toolness.com/xpi/collusion.xpi">Download the Collusion add-on for Firefox</a>
+ <a class="button" href="https://addons.mozilla.org/en-US/firefox/addon/collusion/">Download the Collusion add-on for Firefox</a>
</section>
<section id="secondary" class="container">
@@ -66,6 +66,18 @@ <h1 id="main-feature" class="large">Collusion</h1>
<p>Your data can be part of the larger story. When we launch the full version of Collusion, it will allow you to opt-in to sharing your anonymous data in a global database of web tracker data. We’ll combine all that information and make it available to help researchers, journalists, and others analyze and explain how data is tracked on the web.</p>
+ <h2>Building user awareness</h2>
+
+<p>Through our work with the Ford Foundation, we’ll be building outreach campaigns to help people understand online data tracking — both the benefits and the issues — so they can make their own choices about how they want to be tracked (or choose not to be tracked at all).</p>
+
+
+
+<h2>Collusion is about choice</h2>
+
+<p>Not all tracking is bad. Many services rely on user data to provide relevant content and enhance your online experience. But most tracking happens without user’s consent and without their knowledge. That’s not okay. It should be you who decides when, how and if you want to be tracked. Collusion will be a powerful tool to help you do that.</p>
+
+
+
</div>
<div class="span5">
@@ -364,17 +376,9 @@ <h1 id="main-feature" class="large">Collusion</h1>
<p class="footnote">We will only send you Mozilla-related information.</p>
</form>
- <h2>Building user awareness</h2>
-
-<p>Through our work with the Ford Foundation, we’ll be building outreach campaigns to help people understand online data tracking — both the benefits and the issues — so they can make their own choices about how they want to be tracked (or choose not to be tracked at all).</p>
-
-
-
-<h2>Collusion is about choice</h2>
-
-<p>Not all tracking is bad. Many services rely on user data to provide relevant content and enhance your online experience. But most tracking happens without user’s consent and without their knowledge. That’s not okay. It should be you who decides when, how and if you want to be tracked. Collusion will be a powerful tool to help you do that.</p>
-
- </div>
+ <h2>Supported by</h2>
+ <img src="website/branding/img/ford_foundation.gif" alt="Ford Foundation" />
+ </div>
</div>
@@ -48,7 +48,7 @@ h1#main-feature .large {
#primary {
padding-top:48px;
padding-bottom:48px;
- height:15em;
+ height:19em;
margin-bottom:72px;
}
#primary img{
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c553e80

Please sign in to comment.