summaryrefslogtreecommitdiff
path: root/site/public/about/index.html
diff options
context:
space:
mode:
authoradamhrv <adam@ahprojects.com>2019-04-03 23:24:12 +0200
committeradamhrv <adam@ahprojects.com>2019-04-03 23:24:12 +0200
commit7d2043eb24cd171e809d83219e543ce9541ba821 (patch)
treec415aae6c682093b18052d622fd201e983e18fd1 /site/public/about/index.html
parent2db426422eedc4847618f972b02189f3d49fe03a (diff)
parent24e4f4af71f1e146f33688822ac3e4242339faa4 (diff)
Merge branch 'master' of github.com:adamhrv/megapixels_dev
Diffstat (limited to 'site/public/about/index.html')
-rw-r--r--site/public/about/index.html13
1 files changed, 8 insertions, 5 deletions
diff --git a/site/public/about/index.html b/site/public/about/index.html
index d228b830..c379ec43 100644
--- a/site/public/about/index.html
+++ b/site/public/about/index.html
@@ -8,7 +8,6 @@
<meta name="referrer" content="no-referrer" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
<link rel='stylesheet' href='/assets/css/fonts.css' />
- <link rel='stylesheet' href='/assets/css/tabulator.css' />
<link rel='stylesheet' href='/assets/css/css.css' />
<link rel='stylesheet' href='/assets/css/leaflet.css' />
<link rel='stylesheet' href='/assets/css/applets.css' />
@@ -18,6 +17,7 @@
<a class='slogan' href="/">
<div class='logo'></div>
<div class='site_name'>MegaPixels</div>
+
</a>
<div class='links'>
<a href="/datasets/">Datasets</a>
@@ -30,8 +30,10 @@
<section class="about-menu">
<ul>
<li><a class="current" href="/about/">About</a></li>
+<li><a href="/about/faq/">FAQs</a></li>
<li><a href="/about/press/">Press</a></li>
-<li><a href="/about/legal/">Legal / Privacy</a></li>
+<li><a href="/about/terms/">Terms</a></li>
+<li><a href="/about/privacy/">Privacy</a></li>
</ul>
</section><p>MegaPixels is an independent art and research project by Adam Harvey and Jules LaPlace investigating the ethics and individual privacy implications of publicly available face recognition datasets, and their role in industry and governmental expansion into biometric surveillance technologies.</p>
<p>The MegaPixels site is made possible with support from <a href="http://mozilla.org">Mozilla</a></p>
@@ -77,10 +79,11 @@
<footer>
<div>
<a href="/">MegaPixels.cc</a>
- <a href="/datasets/">Datasets</a>
+ <a href="/about/disclaimer/">Disclaimer</a>
+ <a href="/about/terms/">Terms of Use</a>
+ <a href="/about/privacy/">Privacy</a>
<a href="/about/">About</a>
- <a href="/about/press/">Press</a>
- <a href="/about/legal/">Legal and Privacy</a>
+ <a href="/about/team/">Team</a>
</div>
<div>
MegaPixels &copy;2017-19 Adam R. Harvey /&nbsp;