diff options
51 files changed, 372 insertions, 210 deletions
diff --git a/client/chart/pie.charts.js b/client/chart/pie.charts.js index c3b94b7b..939e9262 100644 --- a/client/chart/pie.charts.js +++ b/client/chart/pie.charts.js @@ -17,7 +17,7 @@ class PieCharts extends Component { render() { const { payload } = this.props const { paper, citations } = payload.data - console.log(this.props) + // console.log(this.props) if (!citations.length) return null const countries = {} diff --git a/client/datasetList/datasetList.container.js b/client/datasetList/datasetList.container.js index f9b2c3b4..37749f11 100644 --- a/client/datasetList/datasetList.container.js +++ b/client/datasetList/datasetList.container.js @@ -17,7 +17,7 @@ const sortOptions = [ { field: 'title', title: 'Name', type: 'string' }, { field: 'year', title: 'Year', type: 'number' }, { field: 'purpose', title: 'Purpose', type: 'string' }, - { field: 'images', title: 'Images', type: 'number', reversed: true }, + // { field: 'images', title: 'Images', type: 'number', reversed: true }, ] class DatasetListContainer extends Component { diff --git a/client/index.js b/client/index.js index c003a8b3..1a80e74f 100644 --- a/client/index.js +++ b/client/index.js @@ -2,7 +2,7 @@ import React from 'react' import ReactDOM from 'react-dom' import { AppContainer } from 'react-hot-loader' import { Provider } from 'react-redux' -import 'waypoints/lib/noframework.waypoints.min.js'; +import 'waypoints/lib/noframework.waypoints.min.js' import { toArray } from './util' import Applet from './applet' @@ -62,7 +62,7 @@ function runApplets() { let payload try { payload = JSON.parse(el.dataset.payload) - console.log(payload) + // console.log(payload) } catch (e) { return null } @@ -106,7 +106,7 @@ function runApplets() { } payload.dataset = dataset payload.url = url - console.log(payload) + // console.log(payload) return [el, payload] }).filter(a => !!a) const withDataset = applets.map(a => a[1].dataset ? a[1] : null).filter(a => !!a) @@ -122,20 +122,20 @@ function runApplets() { function buildWaypoints() { const element = document.querySelector('.content section:nth-child(2)') - if (element) { - var waypoint = new Waypoint({ - element, - handler: function(direction) { - if (direction === 'down') { - document.body.classList.add('scrolled') - } else { - document.body.classList.remove('scrolled') - } - // console.log(direction) - // console.log('Scrolled to waypoint!') + if (!element) return null + let waypoint = new Waypoint({ + element, + handler: function(direction) { + if (direction === 'down') { + document.body.classList.add('scrolled') + } else { + document.body.classList.remove('scrolled') } - }) - } + // console.log(direction) + // console.log('Scrolled to waypoint!') + } + }) + return waypoint } function main() { diff --git a/client/map/index.js b/client/map/index.js index 29fc2286..af1c504e 100644 --- a/client/map/index.js +++ b/client/map/index.js @@ -28,7 +28,9 @@ const arcStyles = { }, } +const buttonOrder = ['edu', 'company', 'gov'] const sortOrder = ['edu', 'company', 'gov', 'mil'] +const typeScores = { all: 0, edu: 1, company: 2, gov: 3, mil: 3 } const redDot = L.icon({ iconUrl: '/assets/img/reddot.png', @@ -37,145 +39,200 @@ const redDot = L.icon({ popupAnchor: [0, -5] // point from which the popup should open relative to the iconAnchor }) -function addMarker(map, latlng, citations) { - const marker = L.marker(latlng, { icon: redDot }).addTo(map) - let message = citations.map(citation => { - const { title, addresses, year, pdf, doi } = citation - let rec = [ - "<b>", title, "</b>", - ] - if (pdf && pdf.length) { - rec.unshift("<a href='" + pdf[0] + "' target='_blank'>") - rec.push("</a>") - } - else if (doi && doi.length) { - rec.unshift("<a href='" + doi[0] + "' target='_blank'>") - rec.push("</a>") +class Map { + constructor(el, data) { + let { paper, citations } = data + this.el = el + this.paper = paper + this.markers = [] + this.arcs = [] + this.filter = typeScores.all + + if (paper.addresses && paper.addresses.length) { + this.source = [ + paper.addresses[0].lat, + paper.addresses[0].lng + ].map(n => (parseFloat(n) || 0)) + } else { + console.error("No address found for root paper") + this.source = [0, 0] + // console.log(data) } - if (year) { - rec.push(" (" + year + ")") + + // group papers by address + this.citationsByAddress = {} + this.citations = citations + this.citations.forEach(citation => { + if (!citation.addresses) { + return + } + citation.addresses.forEach(address => { + if (!(address.name in this.citationsByAddress)) { + this.citationsByAddress[address.name] = { address, citations: [] } + } + this.citationsByAddress[address.name].citations.push(citation) + }) + }) + this.build() + this.bind() + this.buildMarkers() + this.rootMarker.openPopup() + } + + build() { + this.map = L.map(this.el).setView([25, 0], 2) + L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={accessToken}', { + attribution: 'Map data © <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, ' + + '<a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, ' + + 'Imagery © <a href="https://www.mapbox.com/">Mapbox</a>', + maxZoom: 18, + id: 'mapbox.dark', + style: 'mapbox://styles/mapbox/dark-v9', + accessToken: 'pk.eyJ1IjoiZmFuc2FsY3kiLCJhIjoiY2pvN3I1czJwMHF5NDNrbWRoMWpteHlrdCJ9.kMpM5syQUhVjKkn1iVx9fg' + }).addTo(this.map) + } + + bind() { + // a transparent div to cover the map, so normal scroll events will not be eaten by leaflet + const mapCover = document.createElement("div") + mapCover.classList.add("map_cover") + mapCover.innerHTML = "<div class='cover_message'>Click here to explore the map</div>" + mapCover.querySelector('div').addEventListener('click', () => { + this.map.scrollWheelZoom.enable() + if (mapCover.parentNode === this.el) { + this.el.removeChild(mapCover) + } + }) + mapCover.querySelector('div').addEventListener('touchstart', e => { + e.stopPropagation() + }) + mapCover.querySelector('div').addEventListener('tap', e => { + e.stopPropagation() + this.map.scrollWheelZoom.enable() + if (mapCover.parentNode === this.el) { + this.el.removeChild(mapCover) + } + }) + function stopPropagation(e) { + e.stopPropagation() } - const addressString = addresses.map(addr => addr.name).join('<br/>') - rec.push("<br>") - rec.push(addressString) - return rec.join("") - }) + mapCover.addEventListener('mousewheel', stopPropagation, true) + mapCover.addEventListener('DOMMouseScroll', stopPropagation, true) - marker.bindPopup(message.join('<br><br>')) - return marker -} + this.map.scrollWheelZoom.disable() + this.map.on('focus', () => { + this.map.scrollWheelZoom.enable() + if (mapCover.parentNode === this.el) { + this.el.removeChild(mapCover) + } + }) + this.map.on('blur', () => { + this.map.scrollWheelZoom.disable() + // el.appendChild(mapCover) + }) -function addArc(map, src, dest, arcStyle) { - L.bezier({ - path: [ - [ - { lat: src[0], lng: src[1] }, - { lat: dest[0], lng: dest[1] }, - ], - ] - }, arcStyle).addTo(map) -} + this.el.appendChild(mapCover) -export default function append(el, payload) { - const { data } = payload - if (!data) return - let { paper, citations } = data - let source = [0, 0] + buttonOrder.forEach(type => { + const typeClass = type.substr(0, 3) + const el = document.querySelector('.map-legend .' + typeClass) + el.addEventListener('click', () => { + console.log(el) + this.filterMarkers(el, type) + }) + }) + } - let map = L.map(el).setView([25, 0], 2) - L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={accessToken}', { - attribution: 'Map data © <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, ' + - '<a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, ' + - 'Imagery © <a href="https://www.mapbox.com/">Mapbox</a>', - maxZoom: 18, - id: 'mapbox.dark', - style: 'mapbox://styles/mapbox/dark-v9', - accessToken: 'pk.eyJ1IjoiZmFuc2FsY3kiLCJhIjoiY2pvN3I1czJwMHF5NDNrbWRoMWpteHlrdCJ9.kMpM5syQUhVjKkn1iVx9fg' - }).addTo(map) + filterMarkers(el, type) { + const active = document.querySelector('.map-legend .active') + if (active) active.classList.remove('active') + const newFilter = typeScores[type] + if (this.filter === newFilter) { + this.filter = typeScores.all + } else { + this.filter = newFilter + el.classList.add('active') + } + this.buildMarkers() + } - if (paper.addresses && paper.addresses.length) { - source = [paper.addresses[0].lat, paper.addresses[0].lng].map(n => (parseFloat(n) || 0)) - } else { - console.error("No address found for root paper") - // console.log(data) + resetMarkers() { + this.arcs.forEach(arc => arc.remove()) + this.markers.forEach(marker => marker.remove()) + this.markers = [] + this.arcs = [] } - // group papers by address - let citationsByAddress = {} - citations.forEach(citation => { - if (!citation.addresses) { + buildMarkers() { + this.resetMarkers() + Object.keys(this.citationsByAddress).map(name => { + const { citations: citationList, address } = this.citationsByAddress[name] + if (this.filter && typeScores[address.type] !== this.filter) return + // console.log(name, citationsByAddress[name]) // console.log(citation) - return - } - // console.log(citation) - citation.addresses.forEach(address => { - if (!(address.name in citationsByAddress)) { - citationsByAddress[address.name] = { address, citations: []} + const latlng = [address.lat, address.lng].map(n => parseFloat(n)) + if (Number.isNaN(latlng[0]) || Number.isNaN(latlng[1])) return + this.addMarker(latlng, citationList) + const style = { ...arcStyles[address.type] } + let weight = Math.min(citationList.length, 5) + let opacity = 0.5 + Math.min(citationList.length / 5, 0.5) + if (address.type !== 'edu') { + weight += 1 + opacity = 1 } - citationsByAddress[address.name].citations.push(citation) + style.weight = String(weight) + style.opacity = opacity + this.addArc(this.source, latlng, style) }) - }) - Object.keys(citationsByAddress).map(name => { - const { citations: citationList, address: citationAddress } = 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 - addMarker(map, latlng, citationList) - const style = { ...arcStyles[citationAddress.type] } - let weight = Math.min(citationList.length, 5) - let opacity = 0.5 + Math.min(citationList.length / 5, 0.5) - if (citationAddress.type !== 'edu') { - weight += 1 - opacity = 1 - } - style.weight = String(weight) - style.opacity = opacity - addArc(map, source, latlng, style) - }) - - // console.log(paper) + this.rootMarker = this.addMarker(this.source, [this.paper]) + } - const rootMarker = addMarker(map, source, [paper]) - rootMarker.openPopup() + addMarker(latlng, citations) { + const marker = L.marker(latlng, { icon: redDot }).addTo(this.map) + let message = citations.map(citation => { + const { title, addresses, year, pdf, doi } = citation + let rec = [ + "<b>", title, "</b>", + ] + if (pdf && pdf.length) { + rec.unshift("<a href='" + pdf[0] + "' target='_blank'>") + rec.push("</a>") + } + else if (doi && doi.length) { + rec.unshift("<a href='" + doi[0] + "' target='_blank'>") + rec.push("</a>") + } + if (year) { + rec.push(" (" + year + ")") + } + const addressString = addresses.map(addr => addr.name).join('<br/>') + rec.push("<br>") + rec.push(addressString) + return rec.join("") + }) - // a transparent div to cover the map, so normal scroll events will not be eaten by leaflet - const mapCover = document.createElement("div") - mapCover.classList.add("map_cover") - mapCover.innerHTML = "<div class='cover_message'>Click here to explore the map</div>" - mapCover.querySelector('div').addEventListener('click', () => { - map.scrollWheelZoom.enable() - if (mapCover.parentNode === el) { - el.removeChild(mapCover) - } - }) - mapCover.querySelector('div').addEventListener('touchstart', (e) => { - e.preventDefault() - }) - mapCover.querySelector('div').addEventListener('tap', () => { - map.scrollWheelZoom.enable() - if (mapCover.parentNode === el) { - el.removeChild(mapCover) - } - }) - function stopPropagation(e) { - e.stopPropagation() + marker.bindPopup(message.join('<br><br>')) + this.markers.push(marker) + return marker } - mapCover.addEventListener('mousewheel', stopPropagation, true) - mapCover.addEventListener('DOMMouseScroll', stopPropagation, true) - map.scrollWheelZoom.disable() - map.on('focus', () => { - map.scrollWheelZoom.enable() - if (mapCover.parentNode === el) { - el.removeChild(mapCover) - } - }) - map.on('blur', () => { - map.scrollWheelZoom.disable() - // el.appendChild(mapCover) - }) + addArc(src, dest, arcStyle) { + const arc = L.bezier({ + path: [ + [ + { lat: src[0], lng: src[1] }, + { lat: dest[0], lng: dest[1] }, + ], + ] + }, arcStyle).addTo(this.map) + this.arcs.push(arc) + } +} - el.appendChild(mapCover) +export default function append(el, payload) { + const { data } = payload + if (!data) return + let mapContainer = new Map(el, data) + return mapContainer } diff --git a/client/table/citations.table.js b/client/table/citations.table.js index 178cc65b..8fe46b69 100644 --- a/client/table/citations.table.js +++ b/client/table/citations.table.js @@ -24,18 +24,20 @@ class CitationsTable extends Component { filteredCitations: [], } - componentDidMount(){ + componentDidMount() { this.updateCitations() } - componentDidUpdate(oldProps){ + + componentDidUpdate(oldProps) { if (this.props.payload.data.citations !== oldProps.payload.data.citations) { this.updateCitations() } } - updateCitations(){ + + updateCitations() { const { paper, citations } = this.props.payload.data if (!citations.length) this.setState({ formattedCitations: [] }) - console.log(citations.filter(a => a.title.match('Coarse'))) + // console.log(citations.filter(a => a.title.match('Coarse'))) const formattedCitations = citations.sort((a,b) => a.title.localeCompare(b.title)).map(citation => { const pdf_link = (citation.pdf && citation.pdf.length) ? citation.pdf[0] diff --git a/site/assets/css/css.css b/site/assets/css/css.css index 7a1d881a..e21b46ea 100644 --- a/site/assets/css/css.css +++ b/site/assets/css/css.css @@ -72,23 +72,25 @@ header .site_name { line-height: 11px; letter-spacing: 3px; } -header .splash{ +header .page_name { font-size: 22px; font-weight: 400; color: #eee; - /*padding-left: 8px;*/ opacity: 0; transition: 0.3s opacity cubic-bezier(0,0,1,1); margin-left:18px; - /*line-height: 22px;*/ } -.scrolled header .splash { +.scrolled header .page_name { opacity: 1; } -header .links{ +header .links { font-size: 18px; line-height: 18px; } +.home header .links a { + background-color: rgba(0,0,0,0.9); + padding: 3px; +} header .sub { margin-left: 4px; margin-top: 2px; @@ -123,18 +125,18 @@ header .links a { } header .links a.active { color: #fff; - border-bottom: 2px solid rgba(255,255,255,255); + border-bottom: 2px solid rgba(255,255,255,1); } .desktop header .links a:hover { color: #fff; - border-bottom: 2px solid rgba(255,255,255,255); + border-bottom: 2px solid rgba(255,255,255,1); } .desktop header .links a.active:hover { color: #fff; - border-bottom: 2px solid rgba(255,255,255,255); + border-bottom: 2px solid rgba(255,255,255,1); } -header .links.splash{ - font-size:22px; +header .links.splash { + font-size: 22px; font-weight: 400; } @@ -165,39 +167,32 @@ footer > div:nth-child(2) { footer a { display: inline-block; color: #ccc; - transition: color 0.1s cubic-bezier(0,0,1,1); - border-bottom:1px solid #555; + transition: all 0.1s cubic-bezier(0,0,1,1); + border-bottom: 1px solid #555; padding-bottom: 1px; text-decoration: none; } - -footer a:hover{ - color: #ccc; +.desktop footer a:hover { + color: #fff; border-bottom:1px solid #999; } -footer ul{ - margin:0; +footer ul { + margin: 0; } -footer ul li{ - color: #bbb; - margin: 0 5px 0 0; +footer div { + color: #888; font-size: 12px; - display: inline-block; -} -footer ul li:last-child{ - margin-right:0px; } -footer ul.footer-left{ - float:left; - margin-left:40px; +footer ul li:last-child { + margin-right: 0px; } -footer ul.footer-right{ - float:right; - margin-right:40px; +footer div:first-child > a { + margin-right: 5px; } .desktop footer a:hover { - color: #ddd; + color: #fff; } + /* headings */ h1 { @@ -273,6 +268,36 @@ th, .gray { font-size: 9pt; } +/* splash teaser */ + +.teaser { + position: absolute; + top: 50%; + left: 25%; + transform: translateY(-50%); +} +.teaser b { + font-family: 'Roboto', sans-serif; + font-weight: 500; + color: #fff; + font-size: 40px; + display: block; +} +.teaser tt { + font-family: 'Roboto Mono', monospace; + color: #ddd; + font-size: 16px; + display: block; + max-width: 400px; +} +.teaser .btn { + color: #ddd; + background: #444; + padding: 5px 10px; + font-size: 20px; + border-radius: 4px; +} + /* content */ .content { @@ -874,6 +899,9 @@ section.fullwidth .image { .desktop .dataset-list .sort-options li:hover { background: #888; } +.desktop .dataset-list .sort-options li.active:hover { + background: #fff; +} .dataset_list .applet { margin-bottom: 15px; } @@ -967,13 +995,17 @@ page-specific formatting ul.map-legend{ display: inline-block; - margin:0; - font-size:14px; + margin: 0; + font-size: 14px; } -ul.map-legend li{ +ul.map-legend li { margin-right: 10px; - padding-top:4px; + padding-top: 4px; display: inline-block; + cursor: pointer; +} +.desktop ul.map-legend li:hover { + text-decoration: underline; } ul.map-legend li:before { content: ''; @@ -982,6 +1014,10 @@ ul.map-legend li:before { height: 10px; margin-right: 6px; } +ul.map-legend li.active { + text-decoration: underline; + color: #fff; +} ul.map-legend li.edu:before { background-color: #f2f293; } diff --git a/site/assets/css/mobile.css b/site/assets/css/mobile.css index 6a742277..d6ded8d6 100644 --- a/site/assets/css/mobile.css +++ b/site/assets/css/mobile.css @@ -1,7 +1,17 @@ /* MOBILE - iphone/ipad css */ +softbr { + display: none; +} + @media all and (max-device-width: 1024px) { + softbr { + display: block; + height: 10px; + } + /* header / footer */ + .slogan { padding-left: 10px; } @@ -59,7 +69,13 @@ height: 360px; } - /* MOBILE datasets page */ + + .content td a { + text-overflow: ellipsis; + max-width: 100%; + overflow: hidden; + display: inline-block; + } } /* iphone-specific */ diff --git a/site/public/about/assets/LICENSE/index.html b/site/public/about/assets/LICENSE/index.html index 66d8b3ac..97c55000 100644 --- a/site/public/about/assets/LICENSE/index.html +++ b/site/public/about/assets/LICENSE/index.html @@ -11,6 +11,7 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> diff --git a/site/public/about/attribution/index.html b/site/public/about/attribution/index.html index aaeb1624..dfc5f5c9 100644 --- a/site/public/about/attribution/index.html +++ b/site/public/about/attribution/index.html @@ -11,6 +11,7 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> diff --git a/site/public/about/index.html b/site/public/about/index.html index fd64735f..28e29d44 100644 --- a/site/public/about/index.html +++ b/site/public/about/index.html @@ -11,6 +11,7 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> diff --git a/site/public/about/legal/index.html b/site/public/about/legal/index.html index dbcaa187..e86b59e7 100644 --- a/site/public/about/legal/index.html +++ b/site/public/about/legal/index.html @@ -11,6 +11,7 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> diff --git a/site/public/about/press/index.html b/site/public/about/press/index.html index 5a0fad1f..d3844c08 100644 --- a/site/public/about/press/index.html +++ b/site/public/about/press/index.html @@ -11,6 +11,7 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> diff --git a/site/public/datasets/50_people_one_question/index.html b/site/public/datasets/50_people_one_question/index.html index 76d5b92f..bc879799 100644 --- a/site/public/datasets/50_people_one_question/index.html +++ b/site/public/datasets/50_people_one_question/index.html @@ -11,13 +11,14 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <div class='splash'>50 People One Question Dataset</div> + <div class='page_name'>50 People One Question Dataset</div> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/datasets/afad/index.html b/site/public/datasets/afad/index.html index a3ff00cf..f5a04251 100644 --- a/site/public/datasets/afad/index.html +++ b/site/public/datasets/afad/index.html @@ -11,13 +11,14 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <div class='splash'>Asian Face Age Dataset</div> + <div class='page_name'>Asian Face Age Dataset</div> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/datasets/brainwash/index.html b/site/public/datasets/brainwash/index.html index 453e4956..19f1f55a 100644 --- a/site/public/datasets/brainwash/index.html +++ b/site/public/datasets/brainwash/index.html @@ -11,13 +11,14 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <div class='splash'>Brainwash Dataset</div> + <div class='page_name'>Brainwash Dataset</div> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/datasets/caltech_10k/index.html b/site/public/datasets/caltech_10k/index.html index e86c5ca3..5848b804 100644 --- a/site/public/datasets/caltech_10k/index.html +++ b/site/public/datasets/caltech_10k/index.html @@ -11,13 +11,14 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <div class='splash'>Brainwash Dataset</div> + <div class='page_name'>Brainwash Dataset</div> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/datasets/celeba/index.html b/site/public/datasets/celeba/index.html index 0236b91c..92c0e334 100644 --- a/site/public/datasets/celeba/index.html +++ b/site/public/datasets/celeba/index.html @@ -11,13 +11,14 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <div class='splash'>CelebA Dataset</div> + <div class='page_name'>CelebA Dataset</div> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/datasets/cofw/index.html b/site/public/datasets/cofw/index.html index b0e73dac..fd6d86ae 100644 --- a/site/public/datasets/cofw/index.html +++ b/site/public/datasets/cofw/index.html @@ -11,13 +11,14 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <div class='splash'>COFW Dataset</div> + <div class='page_name'>COFW Dataset</div> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/datasets/duke_mtmc/index.html b/site/public/datasets/duke_mtmc/index.html index 116fe770..359d83da 100644 --- a/site/public/datasets/duke_mtmc/index.html +++ b/site/public/datasets/duke_mtmc/index.html @@ -11,13 +11,14 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <div class='splash'>Duke MTMC Dataset</div> + <div class='page_name'>Duke MTMC Dataset</div> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/datasets/feret/index.html b/site/public/datasets/feret/index.html index 09abaee2..88b025ae 100644 --- a/site/public/datasets/feret/index.html +++ b/site/public/datasets/feret/index.html @@ -11,13 +11,14 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <div class='splash'>LFW</div> + <div class='page_name'>LFW</div> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/datasets/hrt_transgender/index.html b/site/public/datasets/hrt_transgender/index.html index 4e566a4a..51f5bdeb 100644 --- a/site/public/datasets/hrt_transgender/index.html +++ b/site/public/datasets/hrt_transgender/index.html @@ -11,13 +11,14 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <div class='splash'>HRT Transgender</div> + <div class='page_name'>HRT Transgender</div> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/datasets/index.html b/site/public/datasets/index.html index 21acb15b..6691e582 100644 --- a/site/public/datasets/index.html +++ b/site/public/datasets/index.html @@ -11,6 +11,7 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> diff --git a/site/public/datasets/lfpw/index.html b/site/public/datasets/lfpw/index.html index 1238c8d3..68c3e033 100644 --- a/site/public/datasets/lfpw/index.html +++ b/site/public/datasets/lfpw/index.html @@ -11,13 +11,14 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <div class='splash'>LFWP</div> + <div class='page_name'>LFWP</div> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/datasets/lfw/index.html b/site/public/datasets/lfw/index.html index 68021e93..7ae440a8 100644 --- a/site/public/datasets/lfw/index.html +++ b/site/public/datasets/lfw/index.html @@ -11,13 +11,14 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <div class='splash'>LFW</div> + <div class='page_name'>LFW</div> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/datasets/market_1501/index.html b/site/public/datasets/market_1501/index.html index a72cb6cf..0415f969 100644 --- a/site/public/datasets/market_1501/index.html +++ b/site/public/datasets/market_1501/index.html @@ -11,13 +11,14 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <div class='splash'>Market 1501</div> + <div class='page_name'>Market 1501</div> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/datasets/msceleb/index.html b/site/public/datasets/msceleb/index.html index 63f314bb..8aee1659 100644 --- a/site/public/datasets/msceleb/index.html +++ b/site/public/datasets/msceleb/index.html @@ -11,13 +11,14 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <div class='splash'>Microsoft Celeb</div> + <div class='page_name'>Microsoft Celeb</div> </a> <div class='links'> <a href="/datasets/">Datasets</a> @@ -33,13 +34,13 @@ <div>2016</div> </div><div class='meta'> <div class='gray'>Images</div> - <div>1,000,000 </div> + <div>10,000,000 </div> </div><div class='meta'> <div class='gray'>Identities</div> <div>100,000 </div> </div><div class='meta'> <div class='gray'>Purpose</div> - <div>Large-scale face recognition</div> + <div>Face recognition</div> </div><div class='meta'> <div class='gray'>Created by</div> <div>Microsoft Research</div> diff --git a/site/public/datasets/oxford_town_centre/index.html b/site/public/datasets/oxford_town_centre/index.html index fabcae6b..4d0cb6cd 100644 --- a/site/public/datasets/oxford_town_centre/index.html +++ b/site/public/datasets/oxford_town_centre/index.html @@ -11,13 +11,14 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <div class='splash'>TownCentre</div> + <div class='page_name'>TownCentre</div> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/datasets/pipa/index.html b/site/public/datasets/pipa/index.html index 297f4d45..065f3e47 100644 --- a/site/public/datasets/pipa/index.html +++ b/site/public/datasets/pipa/index.html @@ -11,13 +11,14 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <div class='splash'>PIPA Dataset</div> + <div class='page_name'>PIPA Dataset</div> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/datasets/pubfig/index.html b/site/public/datasets/pubfig/index.html index 5feed748..79644e40 100644 --- a/site/public/datasets/pubfig/index.html +++ b/site/public/datasets/pubfig/index.html @@ -11,13 +11,14 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <div class='splash'>PubFig</div> + <div class='page_name'>PubFig</div> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/datasets/uccs/index.html b/site/public/datasets/uccs/index.html index 3296cabc..a174c698 100644 --- a/site/public/datasets/uccs/index.html +++ b/site/public/datasets/uccs/index.html @@ -11,13 +11,14 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <div class='splash'>UCCS</div> + <div class='page_name'>UCCS</div> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/datasets/vgg_face2/index.html b/site/public/datasets/vgg_face2/index.html index 5f314d9e..7844f5f4 100644 --- a/site/public/datasets/vgg_face2/index.html +++ b/site/public/datasets/vgg_face2/index.html @@ -11,13 +11,14 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <div class='splash'>Brainwash Dataset</div> + <div class='page_name'>Brainwash Dataset</div> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/datasets/viper/index.html b/site/public/datasets/viper/index.html index 4d2abbe1..320899ea 100644 --- a/site/public/datasets/viper/index.html +++ b/site/public/datasets/viper/index.html @@ -11,13 +11,14 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <div class='splash'>VIPeR</div> + <div class='page_name'>VIPeR</div> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/datasets/youtube_celebrities/index.html b/site/public/datasets/youtube_celebrities/index.html index d0a7a172..b871ab18 100644 --- a/site/public/datasets/youtube_celebrities/index.html +++ b/site/public/datasets/youtube_celebrities/index.html @@ -11,13 +11,14 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - <div class='splash'>YouTube Celebrities</div> + <div class='page_name'>YouTube Celebrities</div> </a> <div class='links'> <a href="/datasets/">Datasets</a> diff --git a/site/public/index.html b/site/public/index.html index 118814be..9eff00f2 100644 --- a/site/public/index.html +++ b/site/public/index.html @@ -11,23 +11,32 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/splash.css' /> </head> -<body> +<body class='home'> <header> <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> </a> - <div class='links splash'> + <div class='links'> <a href="/datasets/" class='aboutLink'>DATASETS</a> <a href="/about/" class='aboutLink'>ABOUT</a> </div> </header> <div class="splash"> <div id="three_container"></div> + <div class="teaser"> + <b>MegaPixels</b> + <tt>is an art and research project + investigating the ethics, origins, + and individual privacy implications + of face recognition datasets + created "in the wild."</tt> + <a href="/datasets/" class='btn'>View Datasets</a> + </div> </div> <footer> <div> - MegaPixels is a research project by Adam Harvey about facial recognition datasets, developed in partnership with Mozilla. + <span><a href="/about/">MegaPixels</a> is a research project by Adam Harvey about <a href="/datasets/">facial recognition datasets</a>, developed in partnership with Mozilla.</span> </div> <div> MegaPixels ©2017-19 Adam R. Harvey / diff --git a/site/public/info/index.html b/site/public/info/index.html index 7e7ecf80..c94daf99 100644 --- a/site/public/info/index.html +++ b/site/public/info/index.html @@ -11,6 +11,7 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> diff --git a/site/public/research/00_introduction/index.html b/site/public/research/00_introduction/index.html index ef8a5316..59f14da3 100644 --- a/site/public/research/00_introduction/index.html +++ b/site/public/research/00_introduction/index.html @@ -11,6 +11,7 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> diff --git a/site/public/research/01_from_1_to_100_pixels/index.html b/site/public/research/01_from_1_to_100_pixels/index.html index fe49e998..9e723a46 100644 --- a/site/public/research/01_from_1_to_100_pixels/index.html +++ b/site/public/research/01_from_1_to_100_pixels/index.html @@ -11,6 +11,7 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> diff --git a/site/public/research/02_what_computers_can_see/index.html b/site/public/research/02_what_computers_can_see/index.html index aac0b723..2bfc12cc 100644 --- a/site/public/research/02_what_computers_can_see/index.html +++ b/site/public/research/02_what_computers_can_see/index.html @@ -11,6 +11,7 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> diff --git a/site/public/research/index.html b/site/public/research/index.html index 0386fa99..a3995c7b 100644 --- a/site/public/research/index.html +++ b/site/public/research/index.html @@ -11,6 +11,7 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> diff --git a/site/public/test/chart/index.html b/site/public/test/chart/index.html index 05081cf5..10a6bb0b 100644 --- a/site/public/test/chart/index.html +++ b/site/public/test/chart/index.html @@ -11,6 +11,7 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> diff --git a/site/public/test/citations/index.html b/site/public/test/citations/index.html index 36021752..581eda7e 100644 --- a/site/public/test/citations/index.html +++ b/site/public/test/citations/index.html @@ -11,6 +11,7 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> diff --git a/site/public/test/csv/index.html b/site/public/test/csv/index.html index 301ed718..a984328f 100644 --- a/site/public/test/csv/index.html +++ b/site/public/test/csv/index.html @@ -11,6 +11,7 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> diff --git a/site/public/test/datasets/index.html b/site/public/test/datasets/index.html index 58555895..c16575d8 100644 --- a/site/public/test/datasets/index.html +++ b/site/public/test/datasets/index.html @@ -11,6 +11,7 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> diff --git a/site/public/test/face_search/index.html b/site/public/test/face_search/index.html index e2db70df..c40fcab4 100644 --- a/site/public/test/face_search/index.html +++ b/site/public/test/face_search/index.html @@ -11,6 +11,7 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> diff --git a/site/public/test/gallery/index.html b/site/public/test/gallery/index.html index 869c3aaa..364f7e9a 100644 --- a/site/public/test/gallery/index.html +++ b/site/public/test/gallery/index.html @@ -11,6 +11,7 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> diff --git a/site/public/test/index.html b/site/public/test/index.html index 9c15d431..09178a3d 100644 --- a/site/public/test/index.html +++ b/site/public/test/index.html @@ -11,6 +11,7 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> diff --git a/site/public/test/map/index.html b/site/public/test/map/index.html index ba2756ae..66210bd3 100644 --- a/site/public/test/map/index.html +++ b/site/public/test/map/index.html @@ -11,6 +11,7 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> diff --git a/site/public/test/name_search/index.html b/site/public/test/name_search/index.html index c956ff0b..0901fce1 100644 --- a/site/public/test/name_search/index.html +++ b/site/public/test/name_search/index.html @@ -11,6 +11,7 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> diff --git a/site/public/test/pie_chart/index.html b/site/public/test/pie_chart/index.html index 2e3ba39c..9c55bf09 100644 --- a/site/public/test/pie_chart/index.html +++ b/site/public/test/pie_chart/index.html @@ -11,6 +11,7 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> diff --git a/site/templates/home.html b/site/templates/home.html index 118814be..4a7a5027 100644 --- a/site/templates/home.html +++ b/site/templates/home.html @@ -11,13 +11,13 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/splash.css' /> </head> -<body> +<body class='home'> <header> <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> </a> - <div class='links splash'> + <div class='links'> <a href="/datasets/" class='aboutLink'>DATASETS</a> <a href="/about/" class='aboutLink'>ABOUT</a> </div> @@ -27,7 +27,7 @@ </div> <footer> <div> - MegaPixels is a research project by Adam Harvey about facial recognition datasets, developed in partnership with Mozilla. + <span><a href="/about/">MegaPixels</a> is a research project by Adam Harvey about <a href="/datasets/">facial recognition datasets</a>, developed in partnership with Mozilla.</span> </div> <div> MegaPixels ©2017-19 Adam R. Harvey / diff --git a/site/templates/layout.html b/site/templates/layout.html index cfef0bca..e894513e 100644 --- a/site/templates/layout.html +++ b/site/templates/layout.html @@ -11,13 +11,14 @@ <link rel='stylesheet' href='/assets/css/css.css' /> <link rel='stylesheet' href='/assets/css/leaflet.css' /> <link rel='stylesheet' href='/assets/css/applets.css' /> + <link rel='stylesheet' href='/assets/css/mobile .css' /> </head> <body> <header> <a class='slogan' href="/"> <div class='logo'></div> <div class='site_name'>MegaPixels</div> - {% if metadata.meta.dataset %}<div class='splash'>{{ metadata.meta.dataset.name_display }}</div>{% endif %} + {% if metadata.meta.dataset %}<div class='page_name'>{{ metadata.meta.dataset.name_display }}</div>{% endif %} </a> <div class='links'> <a href="/datasets/">Datasets</a> |