From 49aacc3d3f1cb9dba89dbc7296e8b63378883425 Mon Sep 17 00:00:00 2001 From: adamhrv Date: Sat, 2 Mar 2019 11:41:54 +0100 Subject: css tweaks --- site/assets/css/css.css | 23 +++++++++- site/content/pages/about/credits.md | 24 ---------- site/content/pages/about/disclaimer.md | 6 +-- site/content/pages/about/index.md | 40 +++++++++-------- site/content/pages/about/press.md | 14 +++--- site/content/pages/about/privacy.md | 6 +-- site/content/pages/about/terms.md | 4 +- site/content/pages/datasets/brainwash/index.md | 5 ++- site/content/pages/datasets/index.md | 7 --- site/public/about/credits/index.html | 9 +--- site/public/about/disclaimer/index.html | 7 ++- site/public/about/index.html | 19 ++++---- site/public/about/press/index.html | 11 ++--- site/public/about/privacy/index.html | 7 ++- site/public/about/terms/index.html | 5 ++- site/public/datasets/index.html | 13 +++--- site/public/datasets/lfw/index.html | 2 +- site/public/datasets/vgg_face2/index.html | 2 +- site/public/datasets_v0/index.html | 2 +- site/public/datasets_v0/lfw/index.html | 2 +- .../datasets_v0/lfw/right-to-removal/index.html | 2 +- site/public/datasets_v0/lfw/tables/index.html | 2 +- site/public/datasets_v0/vgg_face2/index.html | 2 +- site/public/info/index.html | 2 +- site/public/research/00_introduction/index.html | 2 +- .../research/01_from_1_to_100_pixels/index.html | 21 ++++++--- site/public/research/index.html | 5 +-- site/public/test/citations/index.html | 2 +- site/public/test/csv/index.html | 2 +- site/public/test/datasets/index.html | 2 +- site/public/test/face_search/index.html | 2 +- site/public/test/gallery/index.html | 2 +- site/public/test/index.html | 2 +- site/public/test/map/index.html | 2 +- site/public/test/name_search/index.html | 2 +- site/public/test/search_face/index.html | 51 ---------------------- site/public/test/search_name/index.html | 51 ---------------------- site/templates/datasets.html | 3 -- site/templates/layout.html | 2 +- 39 files changed, 126 insertions(+), 241 deletions(-) delete mode 100644 site/content/pages/about/credits.md delete mode 100644 site/public/test/search_face/index.html delete mode 100644 site/public/test/search_name/index.html diff --git a/site/assets/css/css.css b/site/assets/css/css.css index 1d3ff805..6c609b0d 100644 --- a/site/assets/css/css.css +++ b/site/assets/css/css.css @@ -401,7 +401,7 @@ section.fullwidth .image { font-family: 'Roboto'; } .sideimage { - margin: 0px 0; + margin: 0px 0 40px 0; display: flex; flex-direction: row; justify-content: flex-start; @@ -412,7 +412,7 @@ section.fullwidth .image { padding-top:0px; } .sideimage img { - margin-right: 30px; + margin-right: 40px; width: 200px; height: 200px; } @@ -613,6 +613,25 @@ section.intro_section { box-decoration-break: clone; } +/* ----------------------------------------------------- +page-specific formatting +----------------------------------------------------- */ + + +/* about */ + +.content-about{ + font-color:#ff0; +} +.content-about > section > ul li{ + display:inline-block; + font-size: 12px; + margin-right: 10px; +} +.content-about > section > ul li a{ + border-bottom: none: +} + /* footnotes */ a.footnote { diff --git a/site/content/pages/about/credits.md b/site/content/pages/about/credits.md deleted file mode 100644 index 64c024c6..00000000 --- a/site/content/pages/about/credits.md +++ /dev/null @@ -1,24 +0,0 @@ ------------- - -status: published -title: MegaPixels Credits -desc: MegaPixels Project Team Credits -slug: credits -published: 2018-12-04 -updated: 2018-12-04 -authors: Adam Harvey - ------------- - -# Credits - -### Sidebar - -- [About](/about/) -- [Press](/about/press/) -- [Credits](/about/credits/) -- [Disclaimer](/about/disclaimer/) -- [Terms and Conditions](/about/terms/) -- [Privacy Policy](/about/privacy/) - -## End Sidebar \ No newline at end of file diff --git a/site/content/pages/about/disclaimer.md b/site/content/pages/about/disclaimer.md index 27cf6760..c0baad71 100644 --- a/site/content/pages/about/disclaimer.md +++ b/site/content/pages/about/disclaimer.md @@ -4,6 +4,7 @@ status: published title: Disclaimer desc: MegaPixels Disclaimer slug: disclaimer +cssclass: about published: 2018-12-04 updated: 2018-12-04 authors: Adam Harvey @@ -12,15 +13,14 @@ authors: Adam Harvey # Disclaimer -### Sidebar - - [About](/about/) - [Press](/about/press/) -- [Credits](/about/credits/) - [Disclaimer](/about/disclaimer/) - [Terms and Conditions](/about/terms/) - [Privacy Policy](/about/privacy/) +### Sidebar + ## End Sidebar Last updated: December 04, 2018 diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md index ecae299a..676ef294 100644 --- a/site/content/pages/about/index.md +++ b/site/content/pages/about/index.md @@ -3,43 +3,47 @@ status: published title: About MegaPixels desc: About MegaPixels -slug: credits +slug: about +cssclass: about published: 2018-12-04 updated: 2018-12-04 authors: Adam Harvey ------------ -# About MegaPixels - -### Sidebar +# About This Project +- [About](/about/) - [Press](/about/press/) -- [Credits](/about/credits/) - [Disclaimer](/about/disclaimer/) - [Terms and Conditions](/about/terms/) - [Privacy Policy](/about/privacy/) -+ Years: 2002-2019 -+ Datasets Analyzed: 325 +### Sidebar + +### Project Statistics + ++ Project Started: 2012 ++ Datasets Discovered: 325 ++ Analyzed So Far: 10 + +### Credits + + Author: Adam Harvey + Development: Jules LaPlace + Research Assistance: Berit Gilma - ++ Supported by: Mozilla + ## End Sidebar -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. - -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. - -### Adam Harvey +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? -![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. +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. -### Jules LaPlace +![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: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. +![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. -### Mozilla +## Partnership -![sideimage:Mozilla](assets/mozilla.png) Mozilla 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. +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. diff --git a/site/content/pages/about/press.md b/site/content/pages/about/press.md index 0e3124d0..1c80d020 100644 --- a/site/content/pages/about/press.md +++ b/site/content/pages/about/press.md @@ -4,29 +4,25 @@ status: published title: MegaPixels Press and News desc: MegaPixels in The News slug: press +cssclass: about published: 2018-12-04 updated: 2018-12-04 authors: Adam Harvey ------------ - # Press -### Sidebar - - [About](/about/) - [Press](/about/press/) -- [Credits](/about/credits/) - [Disclaimer](/about/disclaimer/) - [Terms and Conditions](/about/terms/) - [Privacy Policy](/about/privacy/) +### Sidebar + ## End Sidebar -![alt text](assets/test.jpg) +(list of press articles and images will go here) -- Aug 22, 2018: "Transgender YouTubers had their videos grabbed to train facial recognition software" by James Vincent -- Aug 22, 2018: "Transgender YouTubers had their videos grabbed to train facial recognition software" by James Vincent -- Aug 22, 2018: "Transgender YouTubers had their videos grabbed to train facial recognition software" by James Vincent -lfw \ No newline at end of file +- 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/about/privacy.md b/site/content/pages/about/privacy.md index 9685a189..43db5032 100644 --- a/site/content/pages/about/privacy.md +++ b/site/content/pages/about/privacy.md @@ -4,6 +4,7 @@ status: published title: Privacy Policy desc: MegaPixels Privacy Policy slug: privacy-policy +cssclass: about published: 2018-12-04 updated: 2018-12-04 authors: Adam Harvey @@ -12,17 +13,12 @@ authors: Adam Harvey # Privacy Policy -### Sidebar - - [About](/about/) - [Press](/about/press/) -- [Credits](/about/credits/) - [Disclaimer](/about/disclaimer/) - [Terms and Conditions](/about/terms/) - [Privacy Policy](/about/privacy/) -## End Sidebar - A summary of our privacy policy is as follows: 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. diff --git a/site/content/pages/about/terms.md b/site/content/pages/about/terms.md index 6ad03bc1..62e3b17a 100644 --- a/site/content/pages/about/terms.md +++ b/site/content/pages/about/terms.md @@ -4,6 +4,7 @@ status: published title: Terms of Use desc: MegaPixels Terms of Use and Privacy Policy slug: terms +cssclass: about published: 2018-12-04 updated: 2018-12-04 authors: Adam Harvey @@ -24,8 +25,9 @@ authors: Adam Harvey ## End Sidebar -Last updated: December 04, 2018 +(FPO: this is only example text) +Last updated: December 04, 2018 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"). diff --git a/site/content/pages/datasets/brainwash/index.md b/site/content/pages/datasets/brainwash/index.md index d1dbd581..04747729 100644 --- a/site/content/pages/datasets/brainwash/index.md +++ b/site/content/pages/datasets/brainwash/index.md @@ -2,9 +2,10 @@ status: published title: Brainwash -desc: Brainwash +desc: Brainwash is a dataset of people appearing in a publicy exposed Dropcam footage at a cafe in +caption: A pixelated image of slug: Brainwash -color: #ff0000 +color: #ffff00 image: assets/background.jpg published: 2019-2-23 updated: 2019-2-23 diff --git a/site/content/pages/datasets/index.md b/site/content/pages/datasets/index.md index fa012758..47d0bce2 100644 --- a/site/content/pages/datasets/index.md +++ b/site/content/pages/datasets/index.md @@ -13,10 +13,3 @@ sync: false # Facial Recognition Datasets -+ Found: 275 datasets -+ Created between: 1993-2018 -+ Smallest dataset: 20 images -+ Largest dataset: 10,000,000 images - -+ Highest resolution faces: 450x500 (Unconstrained College Students) -+ Lowest resolution faces: 16x20 pixels (QMUL SurvFace) 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 @@
  • Terms and Conditions
  • Privacy Policy
    • -
      -
    • MegaPixels by Adam Harvey
      • -
    • Made with support from Mozilla
      • -
    • Site developed by Jules Laplace
      • -
    • Design and graphics: Adam Harvey
      • -
    • Research assistants: Berit Gilma
      • -
    - +