From c07ee775f0ae32fe13d950787c178e84d9bd2bcd Mon Sep 17 00:00:00 2001 From: adamhrv Date: Mon, 11 Mar 2019 00:27:14 +0100 Subject: ars update, preview --- site/public/about/privacy/index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'site/public/about/privacy') diff --git a/site/public/about/privacy/index.html b/site/public/about/privacy/index.html index 12e78bae..35bda6c6 100644 --- a/site/public/about/privacy/index.html +++ b/site/public/about/privacy/index.html @@ -35,7 +35,8 @@
  • Terms and Conditions
  • Privacy Policy
  • -

    A summary of our privacy policy is as follows:

    +

    (TEMPORARY PAGE)

    +

    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.

    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.

    A more complete legal version is below:

    -- cgit v1.2.3-70-g09d2 From 1fe0e5c79c3cbc4b13083116980e62b449866100 Mon Sep 17 00:00:00 2001 From: adamhrv Date: Tue, 12 Mar 2019 01:18:12 +0100 Subject: add credits, 2col about --- site/assets/css/css.css | 40 ++++++++++++ site/content/pages/about/credits.md | 43 ++++++++++++ site/content/pages/about/disclaimer.md | 1 + site/content/pages/about/index.md | 48 +++++++------- site/content/pages/about/press.md | 1 + site/content/pages/about/privacy.md | 1 + site/content/pages/about/terms.md | 1 + .../pages/research/00_introduction/index.md | 16 +++++ site/public/about/credits/index.html | 76 ++++++++++++++++++++++ site/public/about/disclaimer/index.html | 1 + site/public/about/index.html | 32 +++++---- site/public/about/press/index.html | 1 + site/public/about/privacy/index.html | 1 + site/public/about/terms/index.html | 1 + site/public/research/00_introduction/index.html | 12 +++- 15 files changed, 237 insertions(+), 38 deletions(-) create mode 100644 site/content/pages/about/credits.md create mode 100644 site/public/about/credits/index.html (limited to 'site/public/about/privacy') diff --git a/site/assets/css/css.css b/site/assets/css/css.css index a0f9519b..69302409 100644 --- a/site/assets/css/css.css +++ b/site/assets/css/css.css @@ -481,6 +481,46 @@ section.fullwidth .image { color:#fff; border: 0; } + + +/* about page */ + +.flex-container { + padding: 0; + margin: 0; + list-style: none; + + display: -webkit-box; + display: -moz-box; + display: -ms-flexbox; + display: -webkit-flex; + display: flex; + + -webkit-flex-flow: row wrap; + justify-content: space-around; +} + +.team-member { + height: auto; + margin-top: 10px; + color: white; + width: 400px; + font-weight: bold; + flex-grow: 1; + margin:0 40px 0 0; +} +.team-member&:last-child{ + margin:0 0 0 40px; +} +.team-member p{ + font-size:14px; +} +.team-member img{ + margin:0; + display: block; +} + + .sideimage { margin: 0px 0 40px 0; display: flex; diff --git a/site/content/pages/about/credits.md b/site/content/pages/about/credits.md new file mode 100644 index 00000000..3ad962df --- /dev/null +++ b/site/content/pages/about/credits.md @@ -0,0 +1,43 @@ +------------ + +status: published +title: MegaPixels Press and News +desc: MegaPixels Press and News +slug: press +cssclass: about +published: 2018-12-04 +updated: 2018-12-04 +authors: Adam Harvey + +------------ + +# Credits + +
    + +
    + + +#### Team + +- Research, concept: Adam Harvey +- Site development, visualizations: Jules LaPlace +- Assistant researcher: Berit Gilma +- Produced in Partnership with Mozilla + +#### Code + +- This site uses D3 and C2 for visuzations. +- Add more here + +#### Data + +- link to github +- how it was gathered \ No newline at end of file diff --git a/site/content/pages/about/disclaimer.md b/site/content/pages/about/disclaimer.md index 314675ee..f82a09a0 100644 --- a/site/content/pages/about/disclaimer.md +++ b/site/content/pages/about/disclaimer.md @@ -17,6 +17,7 @@ authors: Adam Harvey