From dc7d5f87f470745a6c1ccbf649a6a07eadd09a55 Mon Sep 17 00:00:00 2001 From: adamhrv Date: Sun, 10 Mar 2019 18:30:27 +0100 Subject: about, rm old assets --- site/assets/css/css.css | 24 +- site/content/assets/ajax-loader.gif | Bin 1849 -> 0 bytes site/content/assets/icon_camera.svg | 2 - site/content/assets/megapixels_logo.svg | 10 - site/content/assets/megapixels_logo_01.svg | 14 - site/content/assets/roboto/Roboto_300.eot | Bin 17481 -> 0 bytes site/content/assets/roboto/Roboto_300.svg | 312 ---------------- site/content/assets/roboto/Roboto_300.ttf | Bin 35468 -> 0 bytes site/content/assets/roboto/Roboto_300.woff | Bin 19916 -> 0 bytes site/content/assets/roboto/Roboto_300.woff2 | Bin 15440 -> 0 bytes site/content/assets/roboto/Roboto_400.eot | Bin 17405 -> 0 bytes site/content/assets/roboto/Roboto_400.svg | 308 ---------------- site/content/assets/roboto/Roboto_400.ttf | Bin 35408 -> 0 bytes site/content/assets/roboto/Roboto_400.woff | Bin 19824 -> 0 bytes site/content/assets/roboto/Roboto_400.woff2 | Bin 15344 -> 0 bytes site/content/assets/roboto/Roboto_500.eot | Bin 17596 -> 0 bytes site/content/assets/roboto/Roboto_500.svg | 305 ---------------- site/content/assets/roboto/Roboto_500.ttf | Bin 35588 -> 0 bytes site/content/assets/roboto/Roboto_500.woff | Bin 20012 -> 0 bytes site/content/assets/roboto/Roboto_500.woff2 | Bin 15552 -> 0 bytes site/content/assets/roboto/Roboto_700.eot | Bin 17391 -> 0 bytes site/content/assets/roboto/Roboto_700.svg | 309 ---------------- site/content/assets/roboto/Roboto_700.ttf | Bin 35236 -> 0 bytes site/content/assets/roboto/Roboto_700.woff | Bin 19888 -> 0 bytes site/content/assets/roboto/Roboto_700.woff2 | Bin 15436 -> 0 bytes site/content/assets/roboto/Roboto_Mono_300.eot | Bin 18064 -> 0 bytes site/content/assets/roboto/Roboto_Mono_300.svg | 392 --------------------- site/content/assets/roboto/Roboto_Mono_300.ttf | Bin 32160 -> 0 bytes site/content/assets/roboto/Roboto_Mono_300.woff | Bin 19884 -> 0 bytes site/content/assets/roboto/Roboto_Mono_300.woff2 | Bin 16380 -> 0 bytes site/content/assets/roboto/Roboto_Mono_400.eot | Bin 17757 -> 0 bytes site/content/assets/roboto/Roboto_Mono_400.svg | 390 -------------------- site/content/assets/roboto/Roboto_Mono_400.ttf | Bin 31052 -> 0 bytes site/content/assets/roboto/Roboto_Mono_400.woff | Bin 19576 -> 0 bytes site/content/assets/roboto/Roboto_Mono_400.woff2 | Bin 16028 -> 0 bytes site/content/assets/roboto/Roboto_Mono_500.eot | Bin 17909 -> 0 bytes site/content/assets/roboto/Roboto_Mono_500.svg | 387 -------------------- site/content/assets/roboto/Roboto_Mono_500.ttf | Bin 31168 -> 0 bytes site/content/assets/roboto/Roboto_Mono_500.woff | Bin 19656 -> 0 bytes site/content/assets/roboto/Roboto_Mono_500.woff2 | Bin 16016 -> 0 bytes site/content/assets/roboto/roboto-mono.css | 54 --- site/content/assets/roboto/roboto.css | 36 -- site/content/pages/about/disclaimer.md | 6 +- site/content/pages/about/index.md | 23 +- site/content/pages/about/press.md | 4 +- site/content/pages/datasets/brainwash/index.md | 3 +- site/content/pages/datasets/lfw/index.md | 6 +- .../pages/research/00_introduction/index.md | 4 +- .../research/01_from_1_to_100_pixels/index.md | 2 +- site/content/pages/research/wider_sample.png | Bin 2942481 -> 0 bytes site/includes/citations.html | 1 + site/includes/map.html | 2 +- site/public/about/disclaimer/index.html | 3 +- site/public/about/index.html | 25 +- site/public/about/press/index.html | 5 +- site/public/about/privacy/index.html | 1 - site/public/about/research/index.html | 1 - site/public/about/terms/index.html | 1 - .../datasets/50_people_one_question/index.html | 4 +- site/public/datasets/afad/index.html | 1 - site/public/datasets/aflw/index.html | 1 - site/public/datasets/brainwash/index.html | 28 +- site/public/datasets/caltech_10k/index.html | 1 - site/public/datasets/celeba/index.html | 4 +- site/public/datasets/cofw/index.html | 4 +- site/public/datasets/facebook/index.html | 1 - site/public/datasets/feret/index.html | 1 - site/public/datasets/index.html | 1 - site/public/datasets/lfpw/index.html | 1 - site/public/datasets/lfw/index.html | 28 +- .../datasets/lfw/right-to-removal/index.html | 62 ---- site/public/datasets/lfw/tables/index.html | 52 --- site/public/datasets/mars/index.html | 4 +- site/public/datasets/uccs/index.html | 1 - site/public/datasets/vgg_face2/index.html | 1 - .../public/datasets/youtube_celebrities/index.html | 1 - site/public/datasets_v0/index.html | 53 --- site/public/datasets_v0/lfw/index.html | 131 ------- .../datasets_v0/lfw/right-to-removal/index.html | 61 ---- site/public/datasets_v0/lfw/tables/index.html | 52 --- site/public/datasets_v0/vgg_face2/index.html | 80 ----- site/public/index.html | 2 +- site/public/info/index.html | 1 - site/public/research/00_introduction/index.html | 1 - .../research/01_from_1_to_100_pixels/index.html | 1 - .../research/02_what_computers_can_see/index.html | 1 - site/public/research/index.html | 3 +- site/public/test/chart/index.html | 1 - site/public/test/citations/index.html | 1 - site/public/test/csv/index.html | 1 - site/public/test/datasets/index.html | 1 - site/public/test/face_search/index.html | 1 - site/public/test/gallery/index.html | 1 - site/public/test/index.html | 1 - site/public/test/map/index.html | 1 - site/public/test/name_search/index.html | 1 - site/public/test/style/index.html | 90 ----- site/templates/home.html | 2 +- site/templates/layout.html | 1 - 99 files changed, 85 insertions(+), 3229 deletions(-) delete mode 100644 site/content/assets/ajax-loader.gif delete mode 100644 site/content/assets/icon_camera.svg delete mode 100755 site/content/assets/megapixels_logo.svg delete mode 100644 site/content/assets/megapixels_logo_01.svg delete mode 100644 site/content/assets/roboto/Roboto_300.eot delete mode 100644 site/content/assets/roboto/Roboto_300.svg delete mode 100644 site/content/assets/roboto/Roboto_300.ttf delete mode 100644 site/content/assets/roboto/Roboto_300.woff delete mode 100644 site/content/assets/roboto/Roboto_300.woff2 delete mode 100644 site/content/assets/roboto/Roboto_400.eot delete mode 100644 site/content/assets/roboto/Roboto_400.svg delete mode 100644 site/content/assets/roboto/Roboto_400.ttf delete mode 100644 site/content/assets/roboto/Roboto_400.woff delete mode 100644 site/content/assets/roboto/Roboto_400.woff2 delete mode 100644 site/content/assets/roboto/Roboto_500.eot delete mode 100644 site/content/assets/roboto/Roboto_500.svg delete mode 100644 site/content/assets/roboto/Roboto_500.ttf delete mode 100644 site/content/assets/roboto/Roboto_500.woff delete mode 100644 site/content/assets/roboto/Roboto_500.woff2 delete mode 100644 site/content/assets/roboto/Roboto_700.eot delete mode 100644 site/content/assets/roboto/Roboto_700.svg delete mode 100644 site/content/assets/roboto/Roboto_700.ttf delete mode 100644 site/content/assets/roboto/Roboto_700.woff delete mode 100644 site/content/assets/roboto/Roboto_700.woff2 delete mode 100644 site/content/assets/roboto/Roboto_Mono_300.eot delete mode 100644 site/content/assets/roboto/Roboto_Mono_300.svg delete mode 100644 site/content/assets/roboto/Roboto_Mono_300.ttf delete mode 100644 site/content/assets/roboto/Roboto_Mono_300.woff delete mode 100644 site/content/assets/roboto/Roboto_Mono_300.woff2 delete mode 100644 site/content/assets/roboto/Roboto_Mono_400.eot delete mode 100644 site/content/assets/roboto/Roboto_Mono_400.svg delete mode 100644 site/content/assets/roboto/Roboto_Mono_400.ttf delete mode 100644 site/content/assets/roboto/Roboto_Mono_400.woff delete mode 100644 site/content/assets/roboto/Roboto_Mono_400.woff2 delete mode 100644 site/content/assets/roboto/Roboto_Mono_500.eot delete mode 100644 site/content/assets/roboto/Roboto_Mono_500.svg delete mode 100644 site/content/assets/roboto/Roboto_Mono_500.ttf delete mode 100644 site/content/assets/roboto/Roboto_Mono_500.woff delete mode 100644 site/content/assets/roboto/Roboto_Mono_500.woff2 delete mode 100644 site/content/assets/roboto/roboto-mono.css delete mode 100644 site/content/assets/roboto/roboto.css delete mode 100644 site/content/pages/research/wider_sample.png delete mode 100644 site/public/datasets/lfw/right-to-removal/index.html delete mode 100644 site/public/datasets/lfw/tables/index.html delete mode 100644 site/public/datasets_v0/index.html delete mode 100644 site/public/datasets_v0/lfw/index.html delete mode 100644 site/public/datasets_v0/lfw/right-to-removal/index.html delete mode 100644 site/public/datasets_v0/lfw/tables/index.html delete mode 100644 site/public/datasets_v0/vgg_face2/index.html delete mode 100644 site/public/test/style/index.html diff --git a/site/assets/css/css.css b/site/assets/css/css.css index 7def3e56..6c049436 100644 --- a/site/assets/css/css.css +++ b/site/assets/css/css.css @@ -95,7 +95,7 @@ header .links { header .links span, header .links a { display: block; - color: #d7ba5a; + color: #dedede; text-decoration: none; text-transform: uppercase; margin-right: 32px; @@ -105,16 +105,16 @@ header .links a { font-weight: 400; } header .links a.active { - color: #f3c266; - border-bottom: 1px solid rgba(240,200,150,255); + color: #fff; + border-bottom: 1px solid rgba(255,255,255,255); } .desktop header .links a:hover { - color: #e9bb5f; - border-bottom: 1px solid rgba(240,200,150,255); + color: #fff; + border-bottom: 1px solid rgba(255,255,255,255); } .desktop header .links a.active:hover { - color: #e9bb5f; - border-bottom: 1px solid rgba(240,200,150,255); + color: #fff; + border-bottom: 1px solid rgba(255,255,255,255); } header .links.splash{ font-size:22px; @@ -488,10 +488,18 @@ section.fullwidth .image { justify-content: flex-start; align-items: flex-start; } -.sideImage p{ +.sideimage p{ margin-top:0px; padding-top:0px; } +.sideimage strong{ + display: block; + font-size:26px; + line-height: 26px; + font-weight: 400; + font-family: 'Roboto'; + margin-bottom: 16px; +} .sideimage img { margin-right: 40px; width: 200px; diff --git a/site/content/assets/ajax-loader.gif b/site/content/assets/ajax-loader.gif deleted file mode 100644 index dc21df18..00000000 Binary files a/site/content/assets/ajax-loader.gif and /dev/null differ diff --git a/site/content/assets/icon_camera.svg b/site/content/assets/icon_camera.svg deleted file mode 100644 index b349072e..00000000 --- a/site/content/assets/icon_camera.svg +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/site/content/assets/megapixels_logo.svg b/site/content/assets/megapixels_logo.svg deleted file mode 100755 index 00aa430f..00000000 --- a/site/content/assets/megapixels_logo.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/site/content/assets/megapixels_logo_01.svg b/site/content/assets/megapixels_logo_01.svg deleted file mode 100644 index a9b7eff2..00000000 --- a/site/content/assets/megapixels_logo_01.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/site/content/assets/roboto/Roboto_300.eot b/site/content/assets/roboto/Roboto_300.eot deleted file mode 100644 index 17b7d5cd..00000000 Binary files a/site/content/assets/roboto/Roboto_300.eot and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_300.svg b/site/content/assets/roboto/Roboto_300.svg deleted file mode 100644 index 4ded944a..00000000 --- a/site/content/assets/roboto/Roboto_300.svg +++ /dev/null @@ -1,312 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/site/content/assets/roboto/Roboto_300.ttf b/site/content/assets/roboto/Roboto_300.ttf deleted file mode 100644 index a22188ee..00000000 Binary files a/site/content/assets/roboto/Roboto_300.ttf and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_300.woff b/site/content/assets/roboto/Roboto_300.woff deleted file mode 100644 index 96663f07..00000000 Binary files a/site/content/assets/roboto/Roboto_300.woff and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_300.woff2 b/site/content/assets/roboto/Roboto_300.woff2 deleted file mode 100644 index 52c5845a..00000000 Binary files a/site/content/assets/roboto/Roboto_300.woff2 and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_400.eot b/site/content/assets/roboto/Roboto_400.eot deleted file mode 100644 index a0780d6e..00000000 Binary files a/site/content/assets/roboto/Roboto_400.eot and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_400.svg b/site/content/assets/roboto/Roboto_400.svg deleted file mode 100644 index 627f5a36..00000000 --- a/site/content/assets/roboto/Roboto_400.svg +++ /dev/null @@ -1,308 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/site/content/assets/roboto/Roboto_400.ttf b/site/content/assets/roboto/Roboto_400.ttf deleted file mode 100644 index b91bf3f7..00000000 Binary files a/site/content/assets/roboto/Roboto_400.ttf and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_400.woff b/site/content/assets/roboto/Roboto_400.woff deleted file mode 100644 index 92dfacc6..00000000 Binary files a/site/content/assets/roboto/Roboto_400.woff and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_400.woff2 b/site/content/assets/roboto/Roboto_400.woff2 deleted file mode 100644 index 7e854e66..00000000 Binary files a/site/content/assets/roboto/Roboto_400.woff2 and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_500.eot b/site/content/assets/roboto/Roboto_500.eot deleted file mode 100644 index 849f4a50..00000000 Binary files a/site/content/assets/roboto/Roboto_500.eot and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_500.svg b/site/content/assets/roboto/Roboto_500.svg deleted file mode 100644 index 67eecf44..00000000 --- a/site/content/assets/roboto/Roboto_500.svg +++ /dev/null @@ -1,305 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/site/content/assets/roboto/Roboto_500.ttf b/site/content/assets/roboto/Roboto_500.ttf deleted file mode 100644 index 55b559f6..00000000 Binary files a/site/content/assets/roboto/Roboto_500.ttf and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_500.woff b/site/content/assets/roboto/Roboto_500.woff deleted file mode 100644 index 2633e152..00000000 Binary files a/site/content/assets/roboto/Roboto_500.woff and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_500.woff2 b/site/content/assets/roboto/Roboto_500.woff2 deleted file mode 100644 index 8dceabcf..00000000 Binary files a/site/content/assets/roboto/Roboto_500.woff2 and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_700.eot b/site/content/assets/roboto/Roboto_700.eot deleted file mode 100644 index 0df88af1..00000000 Binary files a/site/content/assets/roboto/Roboto_700.eot and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_700.svg b/site/content/assets/roboto/Roboto_700.svg deleted file mode 100644 index 11db87dd..00000000 --- a/site/content/assets/roboto/Roboto_700.svg +++ /dev/null @@ -1,309 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/site/content/assets/roboto/Roboto_700.ttf b/site/content/assets/roboto/Roboto_700.ttf deleted file mode 100644 index 031bf06c..00000000 Binary files a/site/content/assets/roboto/Roboto_700.ttf and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_700.woff b/site/content/assets/roboto/Roboto_700.woff deleted file mode 100644 index a0d26516..00000000 Binary files a/site/content/assets/roboto/Roboto_700.woff and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_700.woff2 b/site/content/assets/roboto/Roboto_700.woff2 deleted file mode 100644 index e327dc95..00000000 Binary files a/site/content/assets/roboto/Roboto_700.woff2 and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_Mono_300.eot b/site/content/assets/roboto/Roboto_Mono_300.eot deleted file mode 100644 index f44d93dd..00000000 Binary files a/site/content/assets/roboto/Roboto_Mono_300.eot and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_Mono_300.svg b/site/content/assets/roboto/Roboto_Mono_300.svg deleted file mode 100644 index e8645765..00000000 --- a/site/content/assets/roboto/Roboto_Mono_300.svg +++ /dev/null @@ -1,392 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/site/content/assets/roboto/Roboto_Mono_300.ttf b/site/content/assets/roboto/Roboto_Mono_300.ttf deleted file mode 100644 index 6c101fe4..00000000 Binary files a/site/content/assets/roboto/Roboto_Mono_300.ttf and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_Mono_300.woff b/site/content/assets/roboto/Roboto_Mono_300.woff deleted file mode 100644 index 68d8403e..00000000 Binary files a/site/content/assets/roboto/Roboto_Mono_300.woff and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_Mono_300.woff2 b/site/content/assets/roboto/Roboto_Mono_300.woff2 deleted file mode 100644 index ab64df38..00000000 Binary files a/site/content/assets/roboto/Roboto_Mono_300.woff2 and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_Mono_400.eot b/site/content/assets/roboto/Roboto_Mono_400.eot deleted file mode 100644 index 550df22a..00000000 Binary files a/site/content/assets/roboto/Roboto_Mono_400.eot and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_Mono_400.svg b/site/content/assets/roboto/Roboto_Mono_400.svg deleted file mode 100644 index f384d9ce..00000000 --- a/site/content/assets/roboto/Roboto_Mono_400.svg +++ /dev/null @@ -1,390 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/site/content/assets/roboto/Roboto_Mono_400.ttf b/site/content/assets/roboto/Roboto_Mono_400.ttf deleted file mode 100644 index 27363d17..00000000 Binary files a/site/content/assets/roboto/Roboto_Mono_400.ttf and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_Mono_400.woff b/site/content/assets/roboto/Roboto_Mono_400.woff deleted file mode 100644 index 0ea5db89..00000000 Binary files a/site/content/assets/roboto/Roboto_Mono_400.woff and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_Mono_400.woff2 b/site/content/assets/roboto/Roboto_Mono_400.woff2 deleted file mode 100644 index 6163de7b..00000000 Binary files a/site/content/assets/roboto/Roboto_Mono_400.woff2 and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_Mono_500.eot b/site/content/assets/roboto/Roboto_Mono_500.eot deleted file mode 100644 index fb603779..00000000 Binary files a/site/content/assets/roboto/Roboto_Mono_500.eot and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_Mono_500.svg b/site/content/assets/roboto/Roboto_Mono_500.svg deleted file mode 100644 index 34c55b65..00000000 --- a/site/content/assets/roboto/Roboto_Mono_500.svg +++ /dev/null @@ -1,387 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/site/content/assets/roboto/Roboto_Mono_500.ttf b/site/content/assets/roboto/Roboto_Mono_500.ttf deleted file mode 100644 index 036a9907..00000000 Binary files a/site/content/assets/roboto/Roboto_Mono_500.ttf and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_Mono_500.woff b/site/content/assets/roboto/Roboto_Mono_500.woff deleted file mode 100644 index b12f6a1e..00000000 Binary files a/site/content/assets/roboto/Roboto_Mono_500.woff and /dev/null differ diff --git a/site/content/assets/roboto/Roboto_Mono_500.woff2 b/site/content/assets/roboto/Roboto_Mono_500.woff2 deleted file mode 100644 index 125f0983..00000000 Binary files a/site/content/assets/roboto/Roboto_Mono_500.woff2 and /dev/null differ diff --git a/site/content/assets/roboto/roboto-mono.css b/site/content/assets/roboto/roboto-mono.css deleted file mode 100644 index 04a17f3a..00000000 --- a/site/content/assets/roboto/roboto-mono.css +++ /dev/null @@ -1,54 +0,0 @@ -@font-face { - font-family: 'Roboto Mono'; - font-style: normal; - font-weight: 300; - src: - local('Roboto Mono Light'), - local('RobotoMono-Light'), - /* from https://fonts.gstatic.com/s/robotomono/v5/L0xkDF4xlVMF-BfR8bXMIjDgiWqxf7s.eot */ - url('Roboto_Mono_300.eot?#iefix') format('embedded-opentype'), - /* from https://fonts.gstatic.com/s/robotomono/v5/L0xkDF4xlVMF-BfR8bXMIjDgiWqxf7k.woff */ - url('Roboto_Mono_300.woff') format('woff'), - /* from https://fonts.gstatic.com/s/robotomono/v5/L0xkDF4xlVMF-BfR8bXMIjDgiWqxf78.woff2 */ - url('Roboto_Mono_300.woff2') format('woff2'), - /* from https://fonts.gstatic.com/l/font?kit=L0xkDF4xlVMF-BfR8bXMIjDgiWqxf7g&skey=6c4331d29fc39c00&v=v5#RobotoMono */ - url('Roboto_Mono_300.svg#RobotoMono') format('svg'), - /* from https://fonts.gstatic.com/s/robotomono/v5/L0xkDF4xlVMF-BfR8bXMIjDgiWqxf7o.ttf */ - url('Roboto_Mono_300.ttf') format('truetype'); -} -@font-face { - font-family: 'Roboto Mono'; - font-style: normal; - font-weight: 400; - src: - local('Roboto Mono'), - local('RobotoMono-Regular'), - /* from https://fonts.gstatic.com/s/robotomono/v5/L0x5DF4xlVMF-BfR8bXMIjhLq3s.eot */ - url('Roboto_Mono_400.eot?#iefix') format('embedded-opentype'), - /* from https://fonts.gstatic.com/s/robotomono/v5/L0x5DF4xlVMF-BfR8bXMIjhLq3k.woff */ - url('Roboto_Mono_400.woff') format('woff'), - /* from https://fonts.gstatic.com/s/robotomono/v5/L0x5DF4xlVMF-BfR8bXMIjhLq38.woff2 */ - url('Roboto_Mono_400.woff2') format('woff2'), - /* from https://fonts.gstatic.com/l/font?kit=L0x5DF4xlVMF-BfR8bXMIjhLq3g&skey=7b92570108d40690&v=v5#RobotoMono */ - url('Roboto_Mono_400.svg#RobotoMono') format('svg'), - /* from https://fonts.gstatic.com/s/robotomono/v5/L0x5DF4xlVMF-BfR8bXMIjhLq3o.ttf */ - url('Roboto_Mono_400.ttf') format('truetype'); -} -@font-face { - font-family: 'Roboto Mono'; - font-style: normal; - font-weight: 500; - src: - local('Roboto Mono Medium'), - local('RobotoMono-Medium'), - /* from https://fonts.gstatic.com/s/robotomono/v5/L0xkDF4xlVMF-BfR8bXMIjC4iGqxf7s.eot */ - url('Roboto_Mono_500.eot?#iefix') format('embedded-opentype'), - /* from https://fonts.gstatic.com/s/robotomono/v5/L0xkDF4xlVMF-BfR8bXMIjC4iGqxf7k.woff */ - url('Roboto_Mono_500.woff') format('woff'), - /* from https://fonts.gstatic.com/s/robotomono/v5/L0xkDF4xlVMF-BfR8bXMIjC4iGqxf78.woff2 */ - url('Roboto_Mono_500.woff2') format('woff2'), - /* from https://fonts.gstatic.com/l/font?kit=L0xkDF4xlVMF-BfR8bXMIjC4iGqxf7g&skey=8be08dae698074e5&v=v5#RobotoMono */ - url('Roboto_Mono_500.svg#RobotoMono') format('svg'), - /* from https://fonts.gstatic.com/s/robotomono/v5/L0xkDF4xlVMF-BfR8bXMIjC4iGqxf7o.ttf */ - url('Roboto_Mono_500.ttf') format('truetype'); -} diff --git a/site/content/assets/roboto/roboto.css b/site/content/assets/roboto/roboto.css deleted file mode 100644 index 510d9f41..00000000 --- a/site/content/assets/roboto/roboto.css +++ /dev/null @@ -1,36 +0,0 @@ -/* Fonts */ -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 300; - src: url("Roboto_300.eot?#iefix") format("embedded-opentype"), url("Roboto_300.woff") format("woff"), url("Roboto_300.woff2") format("woff2"), url("Roboto_300.svg#Roboto") format("svg"), url("Roboto_300.ttf") format("truetype"); } - -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 400; - src: url("Roboto_400.eot?#iefix") format("embedded-opentype"), url("Roboto_400.woff") format("woff"), url("Roboto_400.woff2") format("woff2"), url("Roboto_400.svg#Roboto") format("svg"), url("Roboto_400.ttf") format("truetype"); } - -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 500; - src: url("Roboto_500.eot?#iefix") format("embedded-opentype"), url("Roboto_500.woff") format("woff"), url("Roboto_500.woff2") format("woff2"), url("Roboto_500.svg#Roboto") format("svg"), url("Roboto_500.ttf") format("truetype"); } - -@font-face { - font-family: 'Roboto-Mono'; - font-style: normal; - font-weight: 300; - src: url("Roboto_Mono_300.eot?#iefix") format("embedded-opentype"), url("Roboto_Mono_300.woff") format("woff"), url("Roboto_Mono_300.woff2") format("woff2"), url("Roboto_Mono_300.svg#RobotoMono") format("svg"), url("Roboto_Mono_300.ttf") format("truetype"); } - -@font-face { - font-family: 'Roboto-Mono'; - font-style: normal; - font-weight: 400; - src: url("Roboto_Mono_400.eot?#iefix") format("embedded-opentype"), url("Roboto_Mono_400.woff") format("woff"), url("Roboto_Mono_400.woff2") format("woff2"), url("Roboto_Mono_400.svg#RobotoMono") format("svg"), url("Roboto_Mono_400.ttf") format("truetype"); } - -@font-face { - font-family: 'Roboto-Mono'; - font-style: normal; - font-weight: 500; - src: local("Roboto-Mono Medium"), local("RobotoMono-Medium"), url("Roboto_Mono_500.eot?#iefix") format("embedded-opentype"), url("Roboto_Mono_500.woff") format("woff"), url("Roboto_Mono_500.woff2") format("woff2"), url("Roboto_Mono_500.svg#RobotoMono") format("svg"), url("Roboto_Mono_500.ttf") format("truetype"); } diff --git a/site/content/pages/about/disclaimer.md b/site/content/pages/about/disclaimer.md index c0baad71..00f7ba92 100644 --- a/site/content/pages/about/disclaimer.md +++ b/site/content/pages/about/disclaimer.md @@ -13,11 +13,7 @@ authors: Adam Harvey # Disclaimer -- [About](/about/) -- [Press](/about/press/) -- [Disclaimer](/about/disclaimer/) -- [Terms and Conditions](/about/terms/) -- [Privacy Policy](/about/privacy/) +{% include 'about_navigation.html' %} ### Sidebar diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md index ccb6ed0d..dff3a3aa 100644 --- a/site/content/pages/about/index.md +++ b/site/content/pages/about/index.md @@ -15,26 +15,17 @@ authors: Adam Harvey {% include 'about_navigation.html' %} -MegaPixels is an art and research project by Adam Harvey about the origins and ethics of facial analysis datasets. Where do they come from? Who's included? Who created it and for what reason? +

Ever since government agencies began developing face recognition in the early 1960's, datasets of face images have always been central to the development and evaluation of their algorithms. Today, these datasets no longer originate in labs, but instead from family photos albums posted on Flickr, CCTV cameras on college campuses, livestreams at cafes, search engine queries for celebrities, or videos on YouTube.

-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. +These datasets include many public figures, politicans, athletes, and actors; but also many non-public figures: digital activists, students, and pedestrians. Some of the images were originally used with creative commons licenses, but others were taken in unconstrained scenarios without anyone's awareness or consent. During the last year hundreds of these datasets have been collected to understand how they contribute to a global data supply chain powering surveillance. -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. +MegaPixels is art and research by Adam Harvey about publicly available facial recognition datasets that aims to unravel the stories behind these datasets. -Notes +[Mozilla[(https://mozilla.org)] has provided the funding to launch this site, research the datasets, and build tools to help you understand the role that these datasets have played in creating surveillance technolgoies. The MegaPixels site is developed by Jules LaPlace. -- critical but informative -- not anti-dataset -- pro-sharing, pro-public dataset -- w/o data -- not generally anti-researcher, their parent organization should have checks in place to prevent dubious dataset collection methods -- +## Team -![sideimage:Adam Harvey](assets/adam-harvey.jpg) **Adam Harvey** 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. +![sideimage:Adam Harvey](assets/adam-harvey.jpg) **Adam Harvey** is Berlin-based American artist and researcher. 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 a researcher in residence at Karlsruhe HfG. -![sideimage:Jules LaPlace](assets/jules-laplace.jpg)**Jules LaPlace** 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. - -## Partnership - -MegaPixels is produced in partnership with **Mozilla**, 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. +![sideimage:Jules LaPlace](assets/jules-laplace.jpg)**Jules LaPlace** is an American creative technologist also based in Berlin. He was previously the CTO of a digital agency in NYC and now also works at VFRAME, developing computer vision for human rights groups. Jules also builds creative software for artists and musicians. diff --git a/site/content/pages/about/press.md b/site/content/pages/about/press.md index abd4d823..9328f38f 100644 --- a/site/content/pages/about/press.md +++ b/site/content/pages/about/press.md @@ -2,7 +2,7 @@ status: published title: MegaPixels Press and News -desc: MegaPixels in The News +desc: MegaPixels Press and News slug: press cssclass: about published: 2018-12-04 @@ -15,6 +15,6 @@ authors: Adam Harvey {% include 'about_navigation.html' %} -(list of press articles and images will go here) +(list of press articles and images will go here. maybe setup a macro template to use for thumbnail image + press info?) - Aug 22, 2018: "Transgender YouTubers had their videos grabbed to train facial recognition software" by James Vincent \ No newline at end of file diff --git a/site/content/pages/datasets/brainwash/index.md b/site/content/pages/datasets/brainwash/index.md index 5fe0da4c..64f7e57d 100644 --- a/site/content/pages/datasets/brainwash/index.md +++ b/site/content/pages/datasets/brainwash/index.md @@ -45,11 +45,12 @@ Since it's publication by Stanford in 2015, the Brainwash dataset has appeared i {% include 'map.html' %} +{% include 'chart.html' %} + {% include 'supplementary_header.html' %} {% include 'citations.html' %} -{% include 'chart.html' %} ### Additional Information diff --git a/site/content/pages/datasets/lfw/index.md b/site/content/pages/datasets/lfw/index.md index 833c6963..cb326f0b 100644 --- a/site/content/pages/datasets/lfw/index.md +++ b/site/content/pages/datasets/lfw/index.md @@ -6,11 +6,8 @@ desc: Labeled Faces in The Wild (LFW) is a database of face photographs designed subdesc: It includes 13,456 images of 4,432 people's images copied from the Internet during 2002-2004. image: assets/background.jpg slug: lfw -<<<<<<< HEAD year: 2007 -======= color: #ff0000 ->>>>>>> e6c50e5550275b8e9d2245201c77c6f9fef7a11a published: 2019-2-23 updated: 2019-2-23 authors: Adam Harvey @@ -52,11 +49,12 @@ The *Names and Faces* dataset was the first face recognition dataset created ent {% include 'map.html' %} +{% include 'chart.html' %} + {% include 'supplementary_header.html' %} {% include 'citations.html' %} -{% include 'chart.html' %} ### Commercial Use diff --git a/site/content/pages/research/00_introduction/index.md b/site/content/pages/research/00_introduction/index.md index 6fec7ab5..9555ca9b 100644 --- a/site/content/pages/research/00_introduction/index.md +++ b/site/content/pages/research/00_introduction/index.md @@ -1,6 +1,6 @@ ------------ -status: published +status: draft title: 00: Introduction desc: Introduction to Megapixels slug: 00_introduction @@ -26,7 +26,7 @@ Algorithms learn from datasets. And we program algorithms by building datasets. Ignore content below these lines ----- - + It was the early 2000s. Face recognition was new and no one seemed sure exactly how well it was going to perform in practice. In theory, face recognition was poised to be a game changer, a force multiplier, a strategic military advantage, a way to make cities safer and to secure borders. This was the future John Ashcroft demanded with the Total Information Awareness act of the 2003 and that spooks had dreamed of for decades. It was a future that academics at Carnegie Mellon Universtiy and Colorado State University would help build. It was also a future that celebrities would play a significant role in building. And to the surprise of ordinary Internet users like myself and perhaps you, it was a future that millions of Internet users would unwittingly play role in creating. diff --git a/site/content/pages/research/01_from_1_to_100_pixels/index.md b/site/content/pages/research/01_from_1_to_100_pixels/index.md index 409dcf02..477bd1a1 100644 --- a/site/content/pages/research/01_from_1_to_100_pixels/index.md +++ b/site/content/pages/research/01_from_1_to_100_pixels/index.md @@ -1,6 +1,6 @@ ------------ -status: published +status: draft title: From 1 to 100 Pixels desc: High resolution insights from low resolution imagery tagline: A breif description of this post, appears in the index page overview diff --git a/site/content/pages/research/wider_sample.png b/site/content/pages/research/wider_sample.png deleted file mode 100644 index 214ad6bb..00000000 Binary files a/site/content/pages/research/wider_sample.png and /dev/null differ diff --git a/site/includes/citations.html b/site/includes/citations.html index a37cc43a..a6aed039 100644 --- a/site/includes/citations.html +++ b/site/includes/citations.html @@ -1,4 +1,5 @@
+

Citations

Citations were collected from Semantic Scholar, a website which aggregates diff --git a/site/includes/map.html b/site/includes/map.html index 6d4b43b4..5ff5bd38 100644 --- a/site/includes/map.html +++ b/site/includes/map.html @@ -12,7 +12,7 @@ -->

- To understand how this dataset has been used around the world... + To understand how {{ metadata.meta.dataset.name_display }} has been used around the world... affected global research on computer vision, surveillance, defense, and consumer technology, the and where this dataset has been used the locations of each organization that used or referenced the datast

diff --git a/site/public/about/disclaimer/index.html b/site/public/about/disclaimer/index.html index 2f915c48..b897cc34 100644 --- a/site/public/about/disclaimer/index.html +++ b/site/public/about/disclaimer/index.html @@ -21,16 +21,17 @@
Datasets - Research About

Disclaimer

+
-

MegaPixels is an art and research project by Adam Harvey about the origins and ethics of facial analysis datasets. Where do they come from? Who's included? Who created it and for what reason?

-

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.

-

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.

-

Notes

-
    -
  • critical but informative
    • -
  • not anti-dataset
    • -
  • pro-sharing, pro-public dataset
    • -
  • w/o data
    • -
  • not generally anti-researcher, their parent organization should have checks in place to prevent dubious dataset collection methods
    • -
  • -
-
Adam Harvey

Adam Harvey 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.

-
Jules LaPlace

Jules LaPlace 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.

-

Partnership

-

MegaPixels is produced in partnership with Mozilla, 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.

-
+

Ever since government agencies began developing face recognition in the early 1960's, datasets of face images have always been central to the development and evaluation of their algorithms. Today, these datasets no longer originate in labs, but instead from family photos albums posted on Flickr, CCTV cameras on college campuses, livestreams at cafes, search engine queries for celebrities, or videos on YouTube.

These datasets include many public figures, politicans, athletes, and actors; but also many non-public figures: digital activists, students, and pedestrians. Some of the images were originally used with creative commons licenses, but others were taken in unconstrained scenarios without anyone's awareness or consent. During the last year hundreds of these datasets have been collected to understand how they contribute to a global data supply chain powering surveillance.

+

MegaPixels is art and research by Adam Harvey about publicly available facial recognition datasets that aims to unravel the stories behind these datasets.

+

[Mozilla[(https://mozilla.org)] has provided the funding to launch this site, research the datasets, and build tools to help you understand the role that these datasets have played in creating surveillance technolgoies. The MegaPixels site is developed by Jules LaPlace.

+

Team

+
Adam Harvey

Adam Harvey is Berlin-based American artist and researcher. 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 a researcher in residence at Karlsruhe HfG.

+
Jules LaPlace

Jules LaPlace is an American creative technologist also based in Berlin. He was previously the CTO of a digital agency in NYC and now also works at VFRAME, developing computer vision for human rights groups. Jules also builds creative software for artists and musicians.

+