css tweaks

6 files changed, 25 insertions, 33 deletions

diff --git a/site/public/about/credits/index.html b/site/public/about/credits/index.html
index 6e4f06c1..7f3da564 100644
--- a/site/public/about/credits/index.html
+++ b/site/public/about/credits/index.html
@@ -36,14 +36,7 @@
 <li><a href="/about/terms/">Terms and Conditions</a></li>
 <li><a href="/about/privacy/">Privacy Policy</a></li>
 </ul>
-</div><ul>
-<li>MegaPixels by Adam Harvey</li>
-<li>Made with support from Mozilla</li>
-<li>Site developed by Jules Laplace</li>
-<li>Design and graphics: Adam Harvey</li>
-<li>Research assistants: Berit Gilma</li>
-</ul>
-</section>
+</div></section>
 
   </div>
   <footer>
diff --git a/site/public/about/disclaimer/index.html b/site/public/about/disclaimer/index.html
index b93194fa..2f915c48 100644
--- a/site/public/about/disclaimer/index.html
+++ b/site/public/about/disclaimer/index.html
@@ -25,18 +25,17 @@
       <a href="/about/">About</a>
     </div>
   </header>
-  <div class="content">
+  <div class="content content-about">
     
   <section><h1>Disclaimer</h1>
-</section><section><div class='right-sidebar'><ul>
+<ul>
 <li><a href="/about/">About</a></li>
 <li><a href="/about/press/">Press</a></li>
-<li><a href="/about/credits/">Credits</a></li>
 <li><a href="/about/disclaimer/">Disclaimer</a></li>
 <li><a href="/about/terms/">Terms and Conditions</a></li>
 <li><a href="/about/privacy/">Privacy Policy</a></li>
 </ul>
-</div><p>Last updated: December 04, 2018</p>
+</section><section><p>Last updated: December 04, 2018</p>
 <p>The information contained on MegaPixels.cc website (the "Service") is for academic and artistic purposes only.</p>
 <p>MegaPixels.cc assumes no responsibility for errors or omissions in the contents on the Service.</p>
 <p>In no event shall MegaPixels.cc be liable for any special, direct, indirect, consequential, or incidental damages or any damages whatsoever, whether in an action of contract, negligence or other tort, arising out of or in connection with the use of the Service or the contents of the Service. MegaPixels.cc reserves the right to make additions, deletions, or modification to the contents on the Service at any time without prior notice.</p>
diff --git a/site/public/about/index.html b/site/public/about/index.html
index b7401ee8..71038691 100644
--- a/site/public/about/index.html
+++ b/site/public/about/index.html
@@ -25,22 +25,25 @@
       <a href="/about/">About</a>
     </div>
   </header>
-  <div class="content">
+  <div class="content content-about">
     
-  <section><h1>About MegaPixels</h1>
-</section><section><div class='right-sidebar'><ul>
+  <section><h1>About This Project</h1>
+<ul>
+<li><a href="/about/">About</a></li>
 <li><a href="/about/press/">Press</a></li>
-<li><a href="/about/credits/">Credits</a></li>
 <li><a href="/about/disclaimer/">Disclaimer</a></li>
 <li><a href="/about/terms/">Terms and Conditions</a></li>
 <li><a href="/about/privacy/">Privacy Policy</a></li>
 </ul>
-<div class='meta'><div><div class='gray'>Years</div><div>2002-2019</div></div><div><div class='gray'>Datasets Analyzed</div><div>325</div></div><div><div class='gray'>Author</div><div>Adam Harvey</div></div><div><div class='gray'>Development</div><div>Jules LaPlace</div></div><div><div class='gray'>Research Assistance</div><div>Berit Gilma</div></div></div></div><p>MegaPixels aims to answer to these questions and reveal the stories behind the millions of images used to train, evaluate, and power the facial recognition surveillance algorithms used today. MegaPixels is authored by Adam Harvey, developed in collaboration with Jules LaPlace, and produced in partnership with Mozilla.</p>
-<p>MegaPixels aims to answer to these questions and reveal the stories behind the millions of images used to train, evaluate, and power the facial recognition surveillance algorithms used today. MegaPixels is authored by Adam Harvey, developed in collaboration with Jules LaPlace, and produced in partnership with Mozilla.</p>
+</section><section><div class='right-sidebar'><h3>Project Statistics</h3>
+<div class='meta'><div><div class='gray'>Project Started</div><div>2012</div></div><div><div class='gray'>Datasets Discovered</div><div>325</div></div><div><div class='gray'>Analyzed So Far</div><div>10</div></div></div><h3>Credits</h3>
+<div class='meta'><div><div class='gray'>Author</div><div>Adam Harvey</div></div><div><div class='gray'>Development</div><div>Jules LaPlace</div></div><div><div class='gray'>Research Assistance</div><div>Berit Gilma</div></div><div><div class='gray'>Supported by</div><div>Mozilla</div></div></div></div><p>MegaPixels is an art and research project about the origins and ethics of facial analysis datasets. Where do they come from? Who's included? Who created it and for what reason?</p>
+<p>MegaPixels sets out to answer to these questions and reveal the stories behind the millions of images used to train, evaluate, and power the facial recognition surveillance algorithms used today. MegaPixels is authored by Adam Harvey, developed in collaboration with Jules LaPlace, and produced in partnership with Mozilla.</p>
 </section><section class='images'><div class='sideimage'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/site/about/assets/adam-harvey.jpg' alt='Adam Harvey'><div><p><strong>Adam Harvey</strong> is an American artist and researcher based in Berlin. His previous projects (CV Dazzle, Stealth Wear, and SkyLift) explore the potential for countersurveillance as artwork. He is the founder of VFRAME (visual forensics software for human rights groups), the recipient of 2 PrototypeFund awards, and is currently a researcher in residence at Karlsruhe HfG studying artifical intelligence and datasets.</p>
 </div></div></section><section class='images'><div class='sideimage'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/site/about/assets/jules-laplace.jpg' alt='Jules LaPlace'><div><p><strong>Jules LaPlace</strong> is an American artist and technologist also based in Berlin. He was previously the CTO of a NYC digital agency and currently works at VFRAME, developing computer vision for human rights groups, and building creative software for artists.</p>
-</div></div></section><section class='images'><div class='sideimage'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/site/about/assets/mozilla.png' alt='Mozilla'><div><p><strong>Mozilla</strong> is a free software community founded in 1998 by members of Netscape. The Mozilla community uses, develops, spreads and supports Mozilla products, thereby promoting exclusively free software and open standards, with only minor exceptions. The community is supported institutionally by the not-for-profit Mozilla Foundation and its tax-paying subsidiary, the Mozilla Corporation.</p>
-</div></div></section>
+</div></div></section><section><h2>Partnership</h2>
+<p>MegaPixels is produced in partnership with <strong>Mozilla</strong>, a free software community founded in 1998 by members of Netscape. The Mozilla community uses, develops, spreads and supports Mozilla products, thereby promoting exclusively free software and open standards, with only minor exceptions. The community is supported institutionally by the not-for-profit Mozilla Foundation and its tax-paying subsidiary, the Mozilla Corporation.</p>
+</section>
 
   </div>
   <footer>
diff --git a/site/public/about/press/index.html b/site/public/about/press/index.html
index d36b6bc6..0791d2a2 100644
--- a/site/public/about/press/index.html
+++ b/site/public/about/press/index.html
@@ -25,22 +25,19 @@
       <a href="/about/">About</a>
     </div>
   </header>
-  <div class="content">
+  <div class="content content-about">
     
   <section><h1>Press</h1>
-</section><section><div class='right-sidebar'><ul>
+<ul>
 <li><a href="/about/">About</a></li>
 <li><a href="/about/press/">Press</a></li>
-<li><a href="/about/credits/">Credits</a></li>
 <li><a href="/about/disclaimer/">Disclaimer</a></li>
 <li><a href="/about/terms/">Terms and Conditions</a></li>
 <li><a href="/about/privacy/">Privacy Policy</a></li>
 </ul>
-</div></section><section class='images'><div class='image'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/site/about/assets/test.jpg' alt='alt text'><div class='caption'>alt text</div></div></section><section><ul>
+</section><section><p>(list of press articles and images will go here)</p>
+<ul>
 <li>Aug 22, 2018: "Transgender YouTubers had their videos grabbed to train facial recognition software" by James Vincent <a href="https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset">https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset</a></li>
-<li>Aug 22, 2018: "Transgender YouTubers had their videos grabbed to train facial recognition software" by James Vincent <a href="https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset">https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset</a></li>
-<li>Aug 22, 2018: "Transgender YouTubers had their videos grabbed to train facial recognition software" by James Vincent <a href="https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset">https://www.theverge.com/2017/8/22/16180080/transgender-youtubers-ai-facial-recognition-dataset</a>
-lfw</li>
 </ul>
 </section>
 
diff --git a/site/public/about/privacy/index.html b/site/public/about/privacy/index.html
index 1b3b9d2f..1d9b2252 100644
--- a/site/public/about/privacy/index.html
+++ b/site/public/about/privacy/index.html
@@ -25,18 +25,17 @@
       <a href="/about/">About</a>
     </div>
   </header>
-  <div class="content">
+  <div class="content content-about">
     
   <section><h1>Privacy Policy</h1>
-</section><section><div class='right-sidebar'><ul>
+<ul>
 <li><a href="/about/">About</a></li>
 <li><a href="/about/press/">Press</a></li>
-<li><a href="/about/credits/">Credits</a></li>
 <li><a href="/about/disclaimer/">Disclaimer</a></li>
 <li><a href="/about/terms/">Terms and Conditions</a></li>
 <li><a href="/about/privacy/">Privacy Policy</a></li>
 </ul>
-</div><p>A summary of our privacy policy is as follows:</p>
+<p>A summary of our privacy policy is as follows:</p>
 <p>The MegaPixels site does not use any analytics programs or collect any data besides the necessary IP address of your connection, which are deleted every 30 days and used only for security and to prevent misuse.</p>
 <p>The image processing sections of the site do not collect any data whatsoever. All processing takes place in temporary memory (RAM) and then is displayed back to the user over a SSL secured HTTPS connection. It is the sole responsibility of the user whether they discard, by closing the page, or share their analyzed information and any potential consequences that may arise from doing so.</p>
 <p>A more complete legal version is below:</p>
diff --git a/site/public/about/terms/index.html b/site/public/about/terms/index.html
index 8bd6e738..76cf1159 100644
--- a/site/public/about/terms/index.html
+++ b/site/public/about/terms/index.html
@@ -25,7 +25,7 @@
       <a href="/about/">About</a>
     </div>
   </header>
-  <div class="content">
+  <div class="content content-about">
     
   <section><h1>Terms and Conditions ("Terms")</h1>
 </section><section><div class='right-sidebar'><ul>
@@ -36,7 +36,8 @@
 <li><a href="/about/terms/">Terms and Conditions</a></li>
 <li><a href="/about/privacy/">Privacy Policy</a></li>
 </ul>
-</div><p>Last updated: December 04, 2018</p>
+</div><p>(FPO: this is only example text)</p>
+<p>Last updated: December 04, 2018</p>
 <p>Please read these Terms and Conditions ("Terms", "Terms and Conditions") carefully before using the MegaPixels website (the "Service") operated by megapixels.cc ("us", "we", or "our").</p>
 <p>Your access to and use of the Service is conditioned on your acceptance of and compliance with these Terms.</p>
 <p>By accessing or using the Service you agree to be bound by these Terms. If you disagree with any part of the terms then you may not access the Service.</p>