From 9d1915af786379446ac7465215b6f3679f270e19 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sat, 30 Mar 2019 18:50:32 +0100 Subject: map scroll --- site/assets/css/applets.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'site/assets/css') diff --git a/site/assets/css/applets.css b/site/assets/css/applets.css index e5c427b2..10c0e786 100644 --- a/site/assets/css/applets.css +++ b/site/assets/css/applets.css @@ -168,6 +168,10 @@ .desktop .map_cover:hover { opacity: 1; } +.leaflet-popup-content-wrapper { + max-height: 230px; + overflow-y: auto; +} .leaflet-popup-content a { color: #0078A8; border-bottom: 1px solid rgba(0, 128, 160, 0.4); -- cgit v1.2.3-70-g09d2 From 84508d90fd53c938de4839d72b02f42d271cb489 Mon Sep 17 00:00:00 2001 From: adamhrv Date: Sun, 31 Mar 2019 16:01:13 +0200 Subject: css for about page --- site/assets/css/css.css | 131 +++++++++++++++++++++++++----------------- site/assets/css/tabulator.css | 17 ++++-- 2 files changed, 88 insertions(+), 60 deletions(-) (limited to 'site/assets/css') diff --git a/site/assets/css/css.css b/site/assets/css/css.css index 47fc0652..0244b86b 100644 --- a/site/assets/css/css.css +++ b/site/assets/css/css.css @@ -464,10 +464,10 @@ section.fullwidth .image { text-align: center; } .image .caption.intro-caption{ - text-align: left; + text-align: center; } .caption { - text-align: left; + text-align: center; font-size: 10pt; color: #999; max-width: 960px; @@ -484,50 +484,6 @@ section.fullwidth .image { } -/* 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-photos-container{ - margin-top:40px; -} -.team-member { - height: auto; - margin-top: 10px; - color: white; - width: 400px; - font-weight: bold; - flex-grow: 1; - margin:0 40px 0 0; - padding:20px; - border-radius:6px; - background: #202020; -} -.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; @@ -771,7 +727,7 @@ section.intro_section { background-size: cover; background-position: center left; padding: 50px 0; - /*min-height: 40vh;*/ + min-height: 40vh; display: flex; justify-content: center; align-items: center; @@ -829,7 +785,7 @@ page-specific formatting position: relative; width: 100%; height: 50px; - margin-top:100px; + margin-top:50px; } .hr-wave-line1 { @@ -848,34 +804,54 @@ page-specific formatting /* map */ -.map-legend-item{ +ul.map-legend{ display: inline-block; + margin:0; +} +ul.map-legend li{ margin-right: 10px; padding-top:4px; + display: inline-block; } -.map-legend-item:before { +ul.map-legend li:before { content: ''; display: inline-block; width: 10px; height: 10px; - /*margin-bottom: 2px;*/ margin-right: 6px; } -.map-legend-item.edu:before { +ul.map-legend li.edu:before { background-color: #f2f293; } -.map-legend-item.com:before { +ul.map-legend li.com:before { background-color: #3264f6; } -.map-legend-item.gov:before { +ul.map-legend li.gov:before { background-color: #f30000; } +ul.map-legend li.source:before { + content: none; + display: inline-block; + width: 0px; + margin-right: 10px; +} /* about */ .content-about { color: #fff; } +.content-about p { + font-size:16px; +} +.content-about ul{ + font-size:14px; + font-weight: 300; +} +.content-about section > p:first-of-type{ + font-size:23px; + line-height:39px; +} .content-about .about-menu ul li { display: inline-block; font-size: 14px; @@ -894,6 +870,53 @@ page-specific formatting border-bottom: 1px solid #ddd; color: #ddd; } +/* 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; +} + +.content-about .team-photos-container{ + margin:40px 0; +} +.content-about .team-member { + height: auto; + margin-top: 10px; + color: white; + width: 400px; + font-weight: bold; + flex-grow: 1; + margin:0 40px 0 0; + padding:20px; + border-radius:6px; + background: #202020; +} +.content-about .team-member&:last-child{ + margin:0 0 0 40px; +} +.content-about .team-member p{ + font-size:14px; +} +.content-about .team-member img{ + margin:0; + display: block; +} +.content-about .team-member h3{ + font-size:18px; +} + /* footnotes */ diff --git a/site/assets/css/tabulator.css b/site/assets/css/tabulator.css index 41c7ffa4..d26b5cfc 100755 --- a/site/assets/css/tabulator.css +++ b/site/assets/css/tabulator.css @@ -1,7 +1,7 @@ /* Tabulator v4.1.3 (c) Oliver Folkerd */ .tabulator { position: relative; - font-size: 14px; + font-size: 13px; text-align: left; overflow: hidden; -ms-transform: translatez(0); @@ -23,7 +23,7 @@ position: relative; box-sizing: border-box; width: 100%; - border-bottom: 1px solid #999; + border-bottom: 1px solid #333; color: #ddd; white-space: nowrap; overflow: hidden; @@ -41,6 +41,7 @@ text-align: left; vertical-align: bottom; overflow: hidden; + padding: 5px 0; } .tabulator .tabulator-header .tabulator-col.tabulator-moving { @@ -63,6 +64,9 @@ overflow: hidden; text-overflow: ellipsis; vertical-align: bottom; + /* AH */ + font-weight: 500; + font-size:14px; } .tabulator .tabulator-header .tabulator-col .tabulator-col-content .tabulator-col-title .tabulator-title-editor { @@ -76,13 +80,13 @@ .tabulator .tabulator-header .tabulator-col .tabulator-col-content .tabulator-arrow { display: inline-block; position: absolute; - top: 9px; + top: 11px; right: 8px; width: 0; height: 0; border-left: 6px solid transparent; border-right: 6px solid transparent; - border-bottom: 6px solid #bbb; + border-bottom: 6px solid #666; } .tabulator .tabulator-header .tabulator-col.tabulator-col-group .tabulator-col-group-cols { @@ -129,6 +133,7 @@ .tabulator .tabulator-header .tabulator-col.tabulator-sortable .tabulator-col-title { padding-right: 25px; + padding-left: 6px; } .tabulator .tabulator-header .tabulator-col.tabulator-sortable:hover { @@ -137,7 +142,7 @@ .tabulator .tabulator-header .tabulator-col.tabulator-sortable[aria-sort="none"] .tabulator-col-content .tabulator-arrow { border-top: none; - border-bottom: 6px solid #bbb; + border-bottom: 6px solid #666; } .tabulator .tabulator-header .tabulator-col.tabulator-sortable[aria-sort="asc"] .tabulator-col-content .tabulator-arrow { @@ -723,7 +728,7 @@ max-height: 200px; background: #fff; border: 1px solid #333; - font-size: 14px; + font-size: 13px; overflow-y: auto; -webkit-overflow-scrolling: touch; z-index: 10000; -- cgit v1.2.3-70-g09d2 From 6366b90b7e124a0059e2ebebe0f813b2e35e2f66 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sun, 31 Mar 2019 16:54:38 +0200 Subject: columns --- megapixels/app/site/parser.py | 22 ++++++++++++++++++++++ site/assets/css/css.css | 26 ++++++++++++++++++++------ site/content/pages/about/index.md | 16 ++++++++++++---- site/public/about/index.html | 16 ++++++++-------- 4 files changed, 62 insertions(+), 18 deletions(-) (limited to 'site/assets/css') diff --git a/megapixels/app/site/parser.py b/megapixels/app/site/parser.py index 00470e4b..06c45f41 100644 --- a/megapixels/app/site/parser.py +++ b/megapixels/app/site/parser.py @@ -27,6 +27,7 @@ def parse_markdown(metadata, sections, s3_path, skip_h1=False): current_group = [] footnotes = [] in_stats = False + in_columns = False in_footnotes = False ignoring = False @@ -50,6 +51,7 @@ def parse_markdown(metadata, sections, s3_path, skip_h1=False): footnotes.append(section) elif ignoring: continue + elif '### statistics' in section.lower() or '### sidebar' in section.lower(): if len(current_group): groups.append(format_section(current_group, s3_path)) @@ -64,6 +66,26 @@ def parse_markdown(metadata, sections, s3_path, skip_h1=False): if 'end sidebar' not in section.lower(): current_group.append(section) in_stats = False + + elif '=== columns' in section.lower(): + if len(current_group): + groups.append(format_section(current_group, s3_path)) + current_group = [] + in_columns = True + column_partz = section.split(' ') + if len(column_partz) == 3: + column_count = column_partz[2] + else: + column_count = "N" + groups.append("
".format(column_count)) + elif in_columns is True and '===' in section: + groups.append(format_section(current_group, s3_path, type='column', tag='div')) + current_group = [] + if 'end columns' in section: + groups.append("
") + in_columns = False + current_group = [] + elif section.strip().startswith('{% include'): groups.append(format_section(current_group, s3_path)) current_group = [] diff --git a/site/assets/css/css.css b/site/assets/css/css.css index 0244b86b..b9e99efe 100644 --- a/site/assets/css/css.css +++ b/site/assets/css/css.css @@ -842,21 +842,20 @@ ul.map-legend li.source:before { color: #fff; } .content-about p { - font-size:16px; + font-size: 16px; } .content-about ul{ - font-size:14px; + font-size: 14px; font-weight: 300; } -.content-about section > p:first-of-type{ - font-size:23px; - line-height:39px; +.content-about section:first-of-type > p:first-of-type { + font-size: 23px; + line-height: 39px; } .content-about .about-menu ul li { display: inline-block; font-size: 14px; font-weight: 400; - margin-right: 8px; text-transform: uppercase; margin-right: 15px; font-family: 'Roboto'; @@ -870,6 +869,21 @@ ul.map-legend li.source:before { border-bottom: 1px solid #ddd; color: #ddd; } + +/* columns */ + +.columns { + display: flex; + flex-direction: row; + justify-content: flex-start; +} +.columns-3 .column { + width: 33%; + padding-right: 20px; + font-family: Roboto, sans-serif; + font-weight: 400; +} + /* about page */ diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md index c2d67f16..5fc147c9 100644 --- a/site/content/pages/about/index.md +++ b/site/content/pages/about/index.md @@ -29,7 +29,7 @@ The MegaPixels site is made possible with support from
-

Adam Harvey

+

Adam Harvey

is Berlin-based American artist and researcher. His previous projects (CV Dazzle, Stealth Wear, and SkyLift) explore the potential for counter-surveillance as artwork. He is the founder of VFRAME (visual forensics software for human rights groups) and is a currently researcher in residence at Karlsruhe HfG.

ahprojects.com

@@ -42,29 +42,37 @@ The MegaPixels site is made possible with support from Mozilla

-

Adam Harvey

+

Adam Harvey

is Berlin-based American artist and researcher. His previous projects (CV Dazzle, Stealth Wear, and SkyLift) explore the potential for counter-surveillance as artwork. He is the founder of VFRAME (visual forensics software for human rights groups) and is a currently researcher in residence at Karlsruhe HfG.

ahprojects.com

@@ -50,29 +50,29 @@

asdf.us

-

MegaPixels.cc is an independent research project about publicly available face recognition datasets. This website is based, in part, on earlier installations and research project about facial recognition datasets in 2016-2018, in particular the MegaFace dataset. Since then it has evolved into a large-scale survey and analysis of publicly available face and person analysis dataset usage, geographies, and ethics.

-

An academic report and presentation on the findings is forthcoming. This site is published to make the research more accessible to a wider audience and to include visualizations and interactive features not possible in PDF publications. Continued research on MegaPixles is supported by a 1 year Researcher-in-Residence grant from Karlsruhe HfG.

+

MegaPixels.cc is an independent research project about publicly available face recognition datasets. This website is based, in part, on earlier installations and research projects about facial recognition datasets in 2016-2018, which focused particularly on the MegaFace dataset. Since then it has evolved into a large-scale survey of publicly-available face and person analysis datasets, covering their usage, geographies, and ethics.

+

An academic report and presentation on the findings is forthcoming. This site is published to make the research more accessible to a wider audience and to include visualizations and interactive features not possible in PDF publications. Continued research on MegaPixels is supported by a 1 year Researcher-in-Residence grant from Karlsruhe HfG.

When possible, and once thoroughly verified, data generated for MegaPixels will be made available for download on github.com/adamhrv/megapixels

-

Team

+

Team

  • Adam Harvey: Concept, research, design, computer vision
  • Jules LaPlace: Information and systems architecture, data retrieval, web applications
-

Contributing Researchers

+

Contributing Researchers

  • Berit Gilma: Dataset statistics and discovery
  • Beth (aka Ms. Celeb): Dataset usage verification and research
  • Mathana Stender: Commercial usage verification and research on LFW
-

Code and Libraries

+

Code and Libraries

  • Semantic Scholar for citation aggregation
  • Leaflet.js for maps
  • C3.js for charts
    • -
  • D3.js and ThreeJS for 3D visualizations
    • +
  • ThreeJS for 3D visualizations
  • PDFMiner.Six and Pandas for research paper data analysis
-

Please direct questions, comments, or feedback to mastodon.social/@adamhrv

+

Please direct questions, comments, or feedback to mastodon.social/@adamhrv

-- cgit v1.2.3-70-g09d2 From 0f2aa955e880dbcb8a1526c09ca9271740ed14f7 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sun, 31 Mar 2019 16:57:12 +0200 Subject: columns --- site/assets/css/css.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'site/assets/css') diff --git a/site/assets/css/css.css b/site/assets/css/css.css index b9e99efe..260a495f 100644 --- a/site/assets/css/css.css +++ b/site/assets/css/css.css @@ -879,9 +879,11 @@ ul.map-legend li.source:before { } .columns-3 .column { width: 33%; - padding-right: 20px; font-family: Roboto, sans-serif; font-weight: 400; + background: #202020; + padding: 15px; + margin: 10px; } /* about page */ -- cgit v1.2.3-70-g09d2 From 189095364daf877f63ce075dc7d98edd7036572d Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sun, 31 Mar 2019 16:57:58 +0200 Subject: columns --- site/assets/css/css.css | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'site/assets/css') diff --git a/site/assets/css/css.css b/site/assets/css/css.css index 260a495f..0bb1f885 100644 --- a/site/assets/css/css.css +++ b/site/assets/css/css.css @@ -877,14 +877,22 @@ ul.map-legend li.source:before { flex-direction: row; justify-content: flex-start; } -.columns-3 .column { - width: 33%; +.columns .column { font-family: Roboto, sans-serif; font-weight: 400; background: #202020; padding: 15px; margin: 10px; } +.columns-2 .column { + width: 50%; +} +.columns-3 .column { + width: 33%; +} +.columns-4 .column { + width: 25%; +} /* about page */ -- cgit v1.2.3-70-g09d2 From 5a9fd63a7efc9b416ba4e5ce4ef9170a4be761ca Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sun, 31 Mar 2019 16:58:27 +0200 Subject: columns --- site/assets/css/css.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'site/assets/css') diff --git a/site/assets/css/css.css b/site/assets/css/css.css index 0bb1f885..c3800315 100644 --- a/site/assets/css/css.css +++ b/site/assets/css/css.css @@ -884,6 +884,9 @@ ul.map-legend li.source:before { padding: 15px; margin: 10px; } +.columns .column:first-of-type { + margin-left: 0; +} .columns-2 .column { width: 50%; } -- cgit v1.2.3-70-g09d2 From 438cde0ab82cf9fdbdcbb45e0ad8e43efc3525bb Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sun, 31 Mar 2019 17:40:44 +0200 Subject: hide pdf --- client/chart/pie.charts.js | 5 ++++- client/index.js | 4 ++-- client/map/index.js | 8 ++++---- scraper/client/paper/paper.verify.js | 14 ++++++++++---- site/assets/css/applets.css | 12 +++++++++++- site/public/about/faq/index.html | 11 +++++------ site/public/about/press/index.html | 7 +++---- site/public/about/privacy/index.html | 7 +++---- site/public/about/terms/index.html | 7 +++---- 9 files changed, 45 insertions(+), 30 deletions(-) (limited to 'site/assets/css') diff --git a/client/chart/pie.charts.js b/client/chart/pie.charts.js index 6e579537..84e85c3a 100644 --- a/client/chart/pie.charts.js +++ b/client/chart/pie.charts.js @@ -17,6 +17,7 @@ class PieCharts extends Component { render() { const { payload } = this.props const { paper, citations } = payload.data + console.log(this.props) if (!citations.length) return null const countries = {} @@ -83,9 +84,10 @@ class PieCharts extends Component { } }} size={{ - height: 336, + height: countryRows.length < 4 ? 316 : 336, }} /> + {paper.name}{' dataset citations by country'}
+ {paper.name}{' dataset citations by organization type'}
) diff --git a/client/index.js b/client/index.js index 5c8bc880..5a7315b5 100644 --- a/client/index.js +++ b/client/index.js @@ -87,9 +87,9 @@ function runApplets() { if (dataset === 'index.html') { dataset = path.pop() } - console.log('dataset from path:', dataset) + // console.log('dataset from path:', dataset) } else { - console.log('not on a dataset page') + // console.log('not on a dataset page') return [el, payload] } } diff --git a/client/map/index.js b/client/map/index.js index 9ca43867..475ba3c6 100644 --- a/client/map/index.js +++ b/client/map/index.js @@ -104,10 +104,10 @@ export default function append(el, payload) { let citationsByAddress = {} citations.forEach(citation => { if (!citation.addresses) { - console.log(citation) + // console.log(citation) return } - console.log(citation) + // console.log(citation) citation.addresses.forEach(address => { if (!(address.name in citationsByAddress)) { citationsByAddress[address.name] = { address, citations: []} @@ -118,7 +118,7 @@ export default function append(el, payload) { Object.keys(citationsByAddress).map(name => { const { citations: citationList, address: citationAddress } = citationsByAddress[name] - console.log(name, citationsByAddress[name]) + // console.log(name, citationsByAddress[name]) // console.log(citation) const latlng = [citationAddress.lat, citationAddress.lng].map(n => parseFloat(n)) if (Number.isNaN(latlng[0]) || Number.isNaN(latlng[1])) return @@ -135,7 +135,7 @@ export default function append(el, payload) { addArc(map, source, latlng, style) }) - console.log(paper) + // console.log(paper) const rootMarker = addMarker(map, source, [paper]) rootMarker.openPopup() diff --git a/scraper/client/paper/paper.verify.js b/scraper/client/paper/paper.verify.js index 83eb5b44..fcebac02 100644 --- a/scraper/client/paper/paper.verify.js +++ b/scraper/client/paper/paper.verify.js @@ -60,6 +60,7 @@ class PaperVerify extends Component { ...initialState, ...citationState, ...address.paper, + pdfIndex: citationState.citations.pdf.findIndex(el => el.pdf.match(/^http:/)), } this.setState(newState) } else if (verify && !verify.loading && verify.paper && (!oldPaper || oldPaper !== verify.paper)) { @@ -70,6 +71,7 @@ class PaperVerify extends Component { ...initialState, ...citationState, ...address.paper, + pdfIndex: citationState.citations.pdf.findIndex(el => el.pdf.match(/^http:/)), } this.setState(newState) } else { @@ -79,6 +81,7 @@ class PaperVerify extends Component { newState = { ...citationState, ...address.paper, + pdfIndex: citationState.citations.pdf.findIndex(el => el.pdf.match(/^http:/)), uses_dataset: paper.uses_dataset, images_in_paper: paper.images_in_paper, verified_by: paper.verified_by, @@ -156,7 +159,7 @@ class PaperVerify extends Component { if (citationIndex < 0) { history.push('/paper/' + key + '/info/') } else { - let nextId = citations[citationIndex].id + let nextId = sortedCitations[citationIndex].id history.push('/paper/' + key + '/verify/' + nextId) } } @@ -172,10 +175,10 @@ class PaperVerify extends Component { history.push('/paper/' + key + '/info/') } else { citationIndex += 1 - if (citationIndex >= citations.length) { + if (citationIndex >= sortedCitations.length) { history.push('/paper/' + key + '/info/') } else { - let nextId = citations[citationIndex].id + let nextId = sortedCitations[citationIndex].id history.push('/paper/' + key + '/verify/' + nextId) } } @@ -414,7 +417,10 @@ class PaperVerify extends Component { >{'Next >'} -