diff --git a/.gitignore b/.gitignore
index f893449..6ada18b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ tags.lock
tags.temp
src/\.DS_Store
+src/assets/fonts
\.DS_Store
diff --git a/package.json b/package.json
index 9df3824..3974c47 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
"lint:fix": "npm run lint -- --fix"
},
"dependencies": {
- "@forensic-architecture/design-system": "0.6.0",
+ "@forensic-architecture/design-system": "0.6.1",
"d3": "^5.7.0",
"joi": "^14.0.1",
"leaflet": "^1.0.3",
diff --git a/src/assets/fonts/timemapfont.woff b/src/assets/fonts/timemapfont.woff
new file mode 100644
index 0000000..dbda72a
Binary files /dev/null and b/src/assets/fonts/timemapfont.woff differ
diff --git a/src/common/data/copy.json b/src/common/data/copy.json
index 7ee89dd..48f6a4d 100644
--- a/src/common/data/copy.json
+++ b/src/common/data/copy.json
@@ -126,9 +126,9 @@
"filters": "Filters",
"filters_label": "Filters",
"explore_by_filter__title": "Explore by filter",
- "explore_by_filter__description": "‘Filters’ refer to the types of incident. Select multiple filters to introduce colour-coding, up to a maximum of six filters. If no filters are selected, all datapoints are displayed.",
+ "explore_by_filter__description": "'Filters' refer to the types of incident. Select multiple filters to introduce colour-coding, up to a maximum of four filters. If no filters are selected, all datapoints are displayed.",
"explore_by_category__title": "Explore events by category",
- "explore_by_category__description": "‘Categories’ refer to the victims of a given incident. If no categories are selected, all datapoints are displayed."
+ "explore_by_category__description": "‘Categories’ refer to the victims of a given incident. If no categories are selected, all datapoints are displayed."
},
"timeline": {
"zooms": [
diff --git a/src/components/CardStack.jsx b/src/components/CardStack.jsx
index 4629e75..eda420e 100644
--- a/src/components/CardStack.jsx
+++ b/src/components/CardStack.jsx
@@ -109,7 +109,8 @@ class CardStack extends React.Component {
title: 'Type of Violation',
value: event.associations.slice(0, -1).map(association => ({
text: association,
- color: getFilterIdxFromColorSet(association, this.props.coloringSet) >= 0 ? this.props.colors[getFilterIdxFromColorSet(association, this.props.coloringSet)] : null
+ color: getFilterIdxFromColorSet(association, this.props.coloringSet) >= 0 ? this.props.colors[getFilterIdxFromColorSet(association, this.props.coloringSet)] : null,
+ normalCursor: true
}))
},
{
@@ -117,7 +118,8 @@ class CardStack extends React.Component {
title: 'Against',
value: event.associations.slice(-1).map(category => ({
text: category,
- color: null
+ color: null,
+ normalCursor: true
}))
}
],
diff --git a/src/components/Layout.js b/src/components/Layout.js
index 86c26e5..b759b3b 100644
--- a/src/components/Layout.js
+++ b/src/components/Layout.js
@@ -239,13 +239,48 @@ class Dashboard extends React.Component {
}
}
+ renderIntroPopup (isMobile, styles) {
+ const { app, actions } = this.props
+
+ const extraContent = isMobile ?
-
+
{title}
{content.map(t =>
)}
+ {children}
)
diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss
index dc18a11..08318e3 100644
--- a/src/scss/_variables.scss
+++ b/src/scss/_variables.scss
@@ -1,3 +1,8 @@
+@font-face {
+ font-family: 'GT-Zirkon';
+ src: url(../assets/fonts/timemapfont.woff); // a Lato woff by default
+}
+
$event_default: red;
$offwhite: #efefef;
@@ -24,6 +29,7 @@ $other: yellow;
.alpha { background: $alpha; }
.beta { background: $beta; }
+$mainfont: 'GT-Zirkon', 'Lato', Helvetica, sans-serif;
// Font sizes
$xsmall: 10px;//0.7em;
@@ -54,7 +60,7 @@ $card-width: 386px;
$card-right: 9px;
$narrative-info-height: 205px;
$narrative-info-desc-height: 153px;
-$timeline-height: 170px;
+$timeline-height: 250px;
$toolbar-width: 110px;
$panel-width: 1000px;
@@ -68,4 +74,5 @@ $header-inset: 10px;
// CSS variables (for React access)
:root {
--toolbar-width: 110px;
-}
\ No newline at end of file
+ --error-red: #eb443e;
+}
diff --git a/src/scss/card.scss b/src/scss/card.scss
index a2462bf..f7e7698 100644
--- a/src/scss/card.scss
+++ b/src/scss/card.scss
@@ -170,7 +170,6 @@
}
.timestamp {
- font-family: 'Lato', Helvetica, sans-serif;
margin-top: 0;
.estimated-timestamp {
@@ -196,10 +195,6 @@
}
}
- .location {
- font-family: 'Lato', Helvetica, sans-serif;
- }
-
.summary {
overflow: auto;
margin-top: 0;
diff --git a/src/scss/common.scss b/src/scss/common.scss
index c828313..6713b97 100644
--- a/src/scss/common.scss
+++ b/src/scss/common.scss
@@ -15,7 +15,7 @@ body {
}
h1 {
- font-family: 'Lato', Helvetica, serif;
+ font-family: $mainfont;
}
h2 {
@@ -44,7 +44,7 @@ h2 {
box-sizing: border-box;
padding: 0 5px;
outline: none;
- font-family: 'Lato', sans-serif;
+ font-family: $mainfont;
&:focus {
border: 3px solid $yellow;
@@ -74,7 +74,7 @@ h2 {
}
.page {
- font-family: 'Lato', Helvetica sans-serif;
+ font-family: $mainfont;
box-sizing: border-box;
height: 100%;
width: 100%;
diff --git a/src/scss/cover.scss b/src/scss/cover.scss
index cc12f2d..208891c 100644
--- a/src/scss/cover.scss
+++ b/src/scss/cover.scss
@@ -43,17 +43,18 @@
}
&.minimized {
- top: 0;
+ bottom: 150px;
max-width: $toolbar-width;
max-height: 30px;
justify-content: center;
align-items: center;
+ flex-direction: column;
.cover-logo-container {
padding: 5px;
}
.cover-logo {
- width: 15px;
- height: 15px;
+ width: 60px;
+ height: 60px;
}
}
}
diff --git a/src/scss/header.scss b/src/scss/header.scss
index e295bde..23918f2 100644
--- a/src/scss/header.scss
+++ b/src/scss/header.scss
@@ -14,7 +14,6 @@
.header-title {
a {
- font-family: 'Lato', Helvetica, serif;
color: darken($offwhite, 5%);
font-size: $xlarge;
letter-spacing: 0.1em;
diff --git a/src/scss/infopopup.scss b/src/scss/infopopup.scss
index de70327..e35cd80 100644
--- a/src/scss/infopopup.scss
+++ b/src/scss/infopopup.scss
@@ -12,7 +12,6 @@
border-radius: 1px;
padding: 20px;
box-sizing: border-box;
- font-family: 'Lato', 'Helvetica', sans-serif;
font-size: $large;
transition: opacity 0.5s ease 0.1s, z-index 0.1s ease 0s;
opacity: 1;
@@ -53,6 +52,14 @@
}
}
+ &.mobile {
+ border: none;
+ padding: 5vmin;
+ .side-menu-burg {
+ display: none;
+ }
+ }
+
.legend {
display: flex;
diff --git a/src/scss/loading.scss b/src/scss/loading.scss
index 1a24544..e582ad1 100644
--- a/src/scss/loading.scss
+++ b/src/scss/loading.scss
@@ -1,5 +1,4 @@
.loading-overlay {
- font-family: 'Lato', Helvetica, sans-serif;
font-weight: 300;
width: 100%;
height: 100%;
diff --git a/src/scss/main.scss b/src/scss/main.scss
index aba2c0c..5af7bd3 100644
--- a/src/scss/main.scss
+++ b/src/scss/main.scss
@@ -13,3 +13,5 @@
@import 'mediaplayer';
@import 'cover';
@import 'stateoptions';
+
+
diff --git a/src/scss/map.scss b/src/scss/map.scss
index ab0f04f..8fa06b5 100644
--- a/src/scss/map.scss
+++ b/src/scss/map.scss
@@ -46,7 +46,6 @@
padding: 5px;
font-weight: 500;
font-size: 11px;
- font-family: 'Lato', Helvetica, sans-serif;
border: rgba($black,0.6);
letter-spacing: 0.05em;
diff --git a/src/scss/narrativecard.scss b/src/scss/narrativecard.scss
index 76c070e..3ac2e69 100644
--- a/src/scss/narrativecard.scss
+++ b/src/scss/narrativecard.scss
@@ -12,7 +12,6 @@ NARRATIVE INFO
box-shadow: 0 19px 38px rgba($black, 0.3), 0 15px 12px rgba($black, 0.22);
background: $black;
color: $offwhite;
- font-family: Helvetica, 'Georgia', serif;
.narrative-info-header {
display: flex;
@@ -50,7 +49,6 @@ NARRATIVE INFO
h3 {
font-size: $large;
- font-family: Helvetica, 'Georgia', serif;
letter-spacing: 0.1em;
text-transform: uppercase;
font-weight: 100;
@@ -64,7 +62,6 @@ NARRATIVE INFO
}
p {
- font-family: 'Lato', 'Helvetica', sans-serif;
font-size: $normal;
line-height: 1.4em;
}
@@ -76,7 +73,6 @@ NARRATIVE INFO
height: 40px;
box-sizing: border-box;
line-height: 40px;
- font-family: 'Lato', 'Helvetica', sans-serif;
text-align: center;
display: inline-block;
diff --git a/src/scss/notification.scss b/src/scss/notification.scss
index 49a8280..d14dad5 100644
--- a/src/scss/notification.scss
+++ b/src/scss/notification.scss
@@ -21,7 +21,6 @@
padding: 20px;
margin-bottom: 10px;
box-sizing: border-box;
- font-family: 'Lato', 'Helvetica', sans-serif;
font-size: $large;
transition: opacity 0.5s ease 0.1s, z-index 0.1s ease 0s;
opacity: 1;
diff --git a/src/scss/overlay.scss b/src/scss/overlay.scss
index d3ca303..02abb7f 100644
--- a/src/scss/overlay.scss
+++ b/src/scss/overlay.scss
@@ -168,7 +168,6 @@ $overlay-bg: rgba(239,239,239,0.9);
box-sizing: border-box;
width: 100%;
max-height: calc(#{$panel-height} - 100px);
- font-family: "Lato", Helvetica, sans-serif;
.media-content {
display: flex;
@@ -219,7 +218,6 @@ $overlay-bg: rgba(239,239,239,0.9);
max-width: $panel-width;
padding: $padding 0;
border-top: 1px solid rgb(189,189,189);
- font-family: "Lato", Helvetica, sans-serif;
font-size: $normal;
h4 {
@@ -291,7 +289,6 @@ $overlay-bg: rgba(239,239,239,0.9);
box-sizing: border-box;
padding: 0 calc(50% - 400px);
overflow-y: scroll;
- font-family: Helvetica, Georgia, serif;
line-height: 1.5em;
min-width: 100%;
margin-bottom: 120px;
@@ -327,15 +324,10 @@ $overlay-bg: rgba(239,239,239,0.9);
height: 100%;
min-height: 100%;
display: block;
- // align-self: center;
- // display: flex;
- // flex-direction: column;
}
.source-image, .source-video {
padding: 1px;
- font-family: 'Lato', Helvetica, sans-serif;
- // max-width: calc(#{$panel-width} - 100px);
max-height: 100%;
margin: auto;
width: auto;
diff --git a/src/scss/popup.scss b/src/scss/popup.scss
index 9ac27ec..ede7886 100644
--- a/src/scss/popup.scss
+++ b/src/scss/popup.scss
@@ -48,14 +48,12 @@
}
.timestamp {
- font-family: 'Lato', Helvetica, sans-serif;
text-transform: uppercase;
font-size: $xlarge;
margin-top: 0;
}
.location {
- font-family: 'Lato', Helvetica, sans-serif;
font-size: $normal;
color: $offwhite;
}
diff --git a/src/scss/tabs.scss b/src/scss/tabs.scss
index e4eb769..2c81b17 100644
--- a/src/scss/tabs.scss
+++ b/src/scss/tabs.scss
@@ -9,7 +9,6 @@
[role=tab] {
- font-family: 'Lato', Helvetica, sans-serif;
font-size: $xlarge;
width: 33%;
background: none;
diff --git a/src/scss/timeline.scss b/src/scss/timeline.scss
index 058c7a6..a5d235f 100644
--- a/src/scss/timeline.scss
+++ b/src/scss/timeline.scss
@@ -1,5 +1,3 @@
-$timeline-height: 170px;
-
.timeline-wrapper {
position: fixed;
box-sizing: border-box;
@@ -160,7 +158,6 @@ $timeline-height: 170px;
}
text {
- font-family: 'Lato', Helvetica, sans-serif;
fill: $midwhite;
text-transform: capitalize;
}
@@ -181,7 +178,6 @@ $timeline-height: 170px;
.tick text {
font-size: 10px;
- font-family: 'Lato';
text-anchor: end;
}
}
diff --git a/src/scss/toolbar.scss b/src/scss/toolbar.scss
index f9ae077..22f23d2 100644
--- a/src/scss/toolbar.scss
+++ b/src/scss/toolbar.scss
@@ -38,7 +38,6 @@
transition: 0.2s ease;
border-bottom: 2px solid $midwhite;
text-transform: uppercase;
- font-family: Helvetica, serif;
cursor: pointer;
p {
@@ -82,7 +81,6 @@
margin-top: 10px;
display: block;
outline: none;
- font-family: 'Lato';
font-size: $xsmall;
cursor: pointer;
transition: 0.2s ease;
@@ -250,7 +248,6 @@
box-sizing: border-box;
padding: 30px 10px 10px 30px;
font-size: $normal;
- font-family: 'Lato', Helvetica, sans-serif;
background: $black;
color: $offwhite;
position: fixed;
@@ -259,7 +256,6 @@
box-shadow: 10px -10px 38px rgba(0, 0, 0, 0.3), 10px 15px 12px rgba(0, 0, 0, 0.22);
h2 {
- font-family: Helvetica, 'Georgia', 'serif';
font-size: $large;
text-transform: none;
letter-spacing: normal;
@@ -267,7 +263,6 @@
p {
font-size: $normal;
- font-family: Helvetica, 'Georgia', 'serif';
line-height: 1.4em;
};
@@ -365,7 +360,6 @@
margin: 20px 0;
padding: 5px 10px;
font-size: 18px;
- font-family: 'Lato', sans-serif;
letter-spacing: 0.1em;
transition: 0.2s ease;
border-color: $midwhite;
@@ -382,7 +376,6 @@
height: 36px;
line-height: 36px;
background: none;
- font-family: 'Lato', Helvetica, sans-serif;
font-size: $large;
button {
@@ -416,7 +409,6 @@
float: left;
color: $offwhite;
font-size: $normal;
- font-family: Helvetica, 'Georgia', 'serif';
overflow: hidden;
}
@@ -461,7 +453,6 @@
color: $offwhite;
cursor: pointer;
outline: none;
- font-family: 'Lato', Helvetica, sans-serif;
text-transform: uppercase;
margin-bottom: 10px;
transition: 0.2s ease;
diff --git a/src/scss/video.scss b/src/scss/video.scss
index a77bf13..945f5d2 100644
--- a/src/scss/video.scss
+++ b/src/scss/video.scss
@@ -5,7 +5,6 @@
height: 420px;
transition: opacity 500ms;
background-color: black;
- font-family: 'Lato', Helvetica, sans-serif;
overflow: hidden;
}
diff --git a/src/store/initial.js b/src/store/initial.js
index 26e306c..88f1cc5 100644
--- a/src/store/initial.js
+++ b/src/store/initial.js
@@ -1,6 +1,7 @@
import { mergeDeepLeft } from 'ramda'
import global, { colors } from '../common/global'
+const isSmallLaptop = window.innerHeight < 800
const initial = {
/*
* The Domain or 'domain' of this state refers to the tree of data
@@ -62,12 +63,12 @@ const initial = {
},
timeline: {
dimensions: {
- height: 250,
+ height: isSmallLaptop ? 170 : 250,
width: 0,
marginLeft: 70,
- marginTop: 10, // the padding used for the day/month labels inside the timeline
+ marginTop: isSmallLaptop ? 5 : 10, // the padding used for the day/month labels inside the timeline
marginBottom: 60,
- contentHeight: 200,
+ contentHeight: isSmallLaptop ? 160 : 200,
width_controls: 100
},
range: [