Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

WV-2193: Use monospace font everywhere we show a date (#3829)

Jason Kent40f7b54eb287
diff --git a/web/js/components/animation-widget/gif-panel-grid.js b/web/js/components/animation-widget/gif-panel-grid.js
index 6bf8f2f6a..cf18e3041 100644
--- a/web/js/components/animation-widget/gif-panel-grid.js
+++ b/web/js/components/animation-widget/gif-panel-grid.js
@@ -1,6 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import MonospaceDate from '../util/monospace-date';
/*
* A table that updates with image
@@ -42,16 +43,14 @@ export default class GifPanelGrid extends React.Component {
<span>Start Date: </span>
</div>
<div className="grid-child">
- <span>
- {startDate}
- {' '}
- </span>
+ <MonospaceDate date={startDate} />
+ {' '}
</div>
<div className="grid-child label">
<span>End Date: </span>
</div>
<div className="grid-child">
- <span>{endDate}</span>
+ <MonospaceDate date={endDate} />
</div>
<div className="grid-child label">
<span>Speed: </span>
diff --git a/web/js/components/animation-widget/gif-post-creation.js b/web/js/components/animation-widget/gif-post-creation.js
index 906b1bb11..4f05cc1ed 100644
--- a/web/js/components/animation-widget/gif-post-creation.js
+++ b/web/js/components/animation-widget/gif-post-creation.js
@@ -6,6 +6,7 @@ import googleTagManager from 'googleTagManager';
import { Modal, ModalBody, ModalHeader } from 'reactstrap';
import util from '../../util/util';
import Button from '../util/button';
+import MonospaceDate from '../util/monospace-date';
export default class GifResults extends Component {
getStyle(imgElWidth, imgElHeight) {
@@ -88,12 +89,10 @@ export default class GifResults extends Component {
<div>
<b>Date Range:</b>
</div>
- <div>{startDate}</div>
+ <MonospaceDate date={startDate} />
<div> - </div>
- <div>
- {endDate}
- {' '}
- </div>
+ <MonospaceDate date={endDate} />
+ {' '}
</div>
<div>
<div>
diff --git a/web/js/components/compare/opacity-slider.js b/web/js/components/compare/opacity-slider.js
index 24e5841f4..0bea677a7 100644
--- a/web/js/components/compare/opacity-slider.js
+++ b/web/js/components/compare/opacity-slider.js
@@ -2,6 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import Slider, { createSliderWithTooltip } from 'rc-slider';
import lodashDebounce from 'lodash/debounce';
+import MonospaceDate from '../util/monospace-date';
const SliderWithTooltip = createSliderWithTooltip(Slider);
const percentFormatter = function(v) {
@@ -50,7 +51,7 @@ class OpacitySlider extends React.Component {
dateBText += `: ${dateB}`;
}
const labelStyle = isSameDate ? {} : { width: '105px', paddingLeft: '3px' };
- const caseStyle = { width: isSameDate ? '178px' : '356px' };
+ const caseStyle = { width: isSameDate ? '178px' : '420px' };
return {
dateAText,
dateBText,
@@ -64,12 +65,13 @@ class OpacitySlider extends React.Component {
const {
dateAText, dateBText, caseStyle, labelStyle,
} = this.getDateTextOptions();
+
return (
<div id="ab-slider-case" className="ab-slider-case" style={caseStyle}>
<label className="wv-slider-label left" style={labelStyle}>
- <h4>
+ <h4 className="left">
<span>A</span>
- {dateAText}
+ <MonospaceDate date={dateAText} />
</h4>
</label>
<div className="input-range ">
@@ -81,9 +83,9 @@ class OpacitySlider extends React.Component {
/>
</div>
<label className="wv-slider-label right" style={labelStyle}>
- <h4>
+ <h4 className="right">
<span>B</span>
- {dateBText}
+ <MonospaceDate date={dateBText} />
</h4>
</label>
</div>
diff --git a/web/js/components/dateline/text.js b/web/js/components/dateline/text.js
index fb6beaa40..7b6751dd0 100644
--- a/web/js/components/dateline/text.js
+++ b/web/js/components/dateline/text.js
@@ -5,13 +5,13 @@ import util from '../../util/util';
import { memoizedDateMonthAbbrev } from '../../modules/compare/selectors';
const textStyles = {
- textOpacity: 0.7,
- rectOpacity: 1,
+ textOpacity: 1,
+ rectOpacity: 0.85,
width: '300',
color: 'white',
textY: 14,
fill: 'rgba(40,40,40,0.75)',
- textWidth: 80,
+ textWidth: 94,
textHeight: 20,
recRadius: 3,
};
@@ -66,13 +66,13 @@ class LineText extends React.Component {
}
render() {
- const { active } = this.props;
+ const { active, isCompareActive } = this.props;
const {
- textWidth, recRadius, fill, textY, color, width, textOpacity, textHeight, rectOpacity,
+ textWidth, recRadius, textY, width, textOpacity, textHeight, rectOpacity,
} = textStyles;
const { dateLeft, dateRight } = this.getDateText();
- const leftTextWidth = Math.round(util.getTextWidth(dateLeft, '13px Open Sans') * 100) / 100 || textWidth;
- const rightTextWidth = Math.round(util.getTextWidth(dateRight, '13px Open Sans') * 100) / 100 || textWidth;
+ const leftTextWidth = isCompareActive ? 60 : textWidth;
+ const rightTextWidth = isCompareActive ? 60 : textWidth;
const svgStyle = {
position: 'absolute',
transform: `translateX(${-(leftTextWidth + 25)}px)`,
@@ -92,7 +92,6 @@ class LineText extends React.Component {
{active && (
<>
<rect
- fill={fill}
width={leftTextWidth + 10}
height={textHeight}
x={0}
@@ -102,14 +101,12 @@ class LineText extends React.Component {
<text
y={textY}
x={6}
- fill={color}
width={width}
opacity={dateLeft ? textOpacity : '0'}
>
{dateLeft}
</text>
<rect
- fill={fill}
width={rightTextWidth + 10}
height={textHeight}
x={leftTextWidth + 40}
@@ -119,7 +116,6 @@ class LineText extends React.Component {
<text
y={textY}
x={leftTextWidth + 46}
- fill={color}
opacity={dateRight ? textOpacity : '0'}
>
{dateRight}
diff --git a/web/js/components/layer/info/date-ranges.js b/web/js/components/layer/info/date-ranges.js
index 57de7f675..e5bd55ebd 100644
--- a/web/js/components/layer/info/date-ranges.js
+++ b/web/js/components/layer/info/date-ranges.js
@@ -16,17 +16,14 @@ export default class DateRanges extends React.Component {
.slice(0)
.reverse()
.map((l) => {
- let listItemStartDate;
- let listItemEndDate;
- if (l.startDate) {
- listItemStartDate = coverageDateFormatter('START-DATE', l.startDate, layer.period);
- }
- if (l.endDate) {
- listItemEndDate = coverageDateFormatter('END-DATE', l.endDate, layer.period);
- }
+ const ListItemStartDate = () => coverageDateFormatter('START-DATE', l.startDate, layer.period);
+ const ListItemEndDate = () => coverageDateFormatter('END-DATE', l.endDate, layer.period);
+
return (
<ListGroupItem key={`${l.startDate} - ${l.endDate}`}>
- {`${listItemStartDate} - ${listItemEndDate}`}
+ <ListItemStartDate />
+ {' - '}
+ <ListItemEndDate />
</ListGroupItem>
);
})
@@ -56,7 +53,7 @@ export default class DateRanges extends React.Component {
<p>Date Ranges:</p>
</div>
<Scrollbar style={{ maxHeight: 400 }}>
- <ListGroup className="layer-date-ranges" id="layer-settings-date-range-list">
+ <ListGroup id="layer-settings-date-range-list" className="layer-date-ranges monospace">
{listItems}
</ListGroup>
</Scrollbar>
diff --git a/web/js/components/layer/info/info.js b/web/js/components/layer/info/info.js
index 89695f012..db35630f4 100644
--- a/web/js/components/layer/info/info.js
+++ b/web/js/components/layer/info/info.js
@@ -51,30 +51,34 @@ export default function LayerInfo ({ layer, measurementDescriptionPath }) {
};
const needDateRanges = getDateOverlapDateRanges();
+ const isRange = startDate && endDate;
+ const FormattedStartDate = () => coverageDateFormatter('START-DATE', startDate, period);
+ const FormattedEndDate = () => coverageDateFormatter('END-DATE', endDate, period);
return (
<div id="layer-description" className="layer-description">
- {startDate || endDate ? (
+ {(startDate || endDate) && (
<div id="layer-date-range" className="layer-date-range">
<span id={`${id}-startDate`} className="layer-date-start">
- {startDate
- ? `Temporal coverage: ${
- coverageDateFormatter('START-DATE', startDate, period)}`
- : ''}
+ {startDate && (
+ <>
+ Temporal Coverage:
+ {' '}
+ <FormattedStartDate />
+ </>
+ )}
</span>
<span id={`${id}-endDate`} className="layer-date-end">
- {startDate && endDate
- ? ` - ${
- coverageDateFormatter('END-DATE', endDate, period)}`
- : startDate
- ? ' - Present'
- : ''}
+ {isRange ? (
+ <>
+ -
+ <FormattedEndDate />
+ </>
+ ) : startDate && ' - Present'}
</span>
- {needDateRanges
- && <DateRanges layer={layer} />}
+ {needDateRanges && <DateRanges layer={layer} />}
</div>
- )
- : ''}
+ )}
{layerMetadata ? (
<div
id="layer-metadata"
diff --git a/web/js/components/layer/product-picker/browse/measurement-layer-row.js b/web/js/components/layer/product-picker/browse/measurement-layer-row.js
index d030b2db2..18ba2e16c 100644
--- a/web/js/components/layer/product-picker/browse/measurement-layer-row.js
+++ b/web/js/components/layer/product-picker/browse/measurement-layer-row.js
@@ -12,6 +12,7 @@ import {
import SelectedDate from '../../../selected-date';
import { getSelectedDate } from '../../../../modules/date/selectors';
import { getLayerNoticesForLayer } from '../../../../modules/notifications/util';
+import MonospaceDate from '../../../util/monospace-date';
/*
* A scrollable list of layers
@@ -73,10 +74,10 @@ function MeasurementLayerRow (props) {
{layerIsUnavailable && (
<div>
This layer has no visible content on the selected date:
- <br />
- <span style={{ fontFamily: 'monospace' }}>
+ {' '}
+ <MonospaceDate>
<SelectedDate />
- </span>
+ </MonospaceDate>
</div>
)}
{layerNotices && (<div dangerouslySetInnerHTML={{ __html: layerNotices }} />)}
diff --git a/web/js/components/sidebar/event.js b/web/js/components/sidebar/event.js
index 2aa1d67fd..c36ae29d8 100644
--- a/web/js/components/sidebar/event.js
+++ b/web/js/components/sidebar/event.js
@@ -7,6 +7,7 @@ import { getDefaultEventDate } from '../../modules/natural-events/util';
import util from '../../util/util';
import EventIcon from './event-icon';
import { formatDisplayDate } from '../../modules/date/util';
+import MonospaceDate from '../util/monospace-date';
function Event (props) {
const {
@@ -19,8 +20,8 @@ function Event (props) {
} = props;
const dateString = formatDisplayDate(event.geometry[0].date);
const itemClass = isSelected
- ? 'item-selected selectorItem item'
- : 'selectorItem item';
+ ? 'item-selected event item'
+ : 'event item';
const elRef = useRef();
useLayoutEffect(() => {
@@ -71,20 +72,28 @@ function Event (props) {
return `${magnitudeDisplay} ${magnitudeValue} ${magnitudeUnit}`;
}
return (
- <li key={`${event.id}-${date}`} className="dates">
- <a
- onClick={(e) => {
- e.stopPropagation();
- onEventSelect(date);
- }}
- className={
- selectedDate === date
- ? 'date item-selected active'
- : 'date item-selected '
- }
- >
- {formatDisplayDate(date)}
- </a>
+ <li key={`${event.id}-${date}`} className="date">
+
+ {selectedDate === date ? (
+ <span
+ className="active"
+ onClick={(e) => e.stopPropagation()}
+ >
+ {formatDisplayDate(date)}
+ </span>
+ )
+ : (
+ <a
+ className="'date item-selected"
+ onClick={(e) => {
+ e.stopPropagation();
+ onEventSelect(date);
+ }}
+ >
+ {formatDisplayDate(date)}
+ </a>
+ )}
+
<p className="magnitude">
{magnitudeOutput()}
</p>
@@ -100,8 +109,6 @@ function Event (props) {
* Return reference list for an event
*/
function renderReferenceList() {
- if (!isSelected) return;
-
const references = Array.isArray(event.sources)
? event.sources
: [event.sources];
@@ -145,10 +152,16 @@ function Event (props) {
<EventIcon id={`${event.id}-list`} category={event.categories[0].title} />
<h4
className="title"
- // eslint-disable-next-line react/no-danger
- dangerouslySetInnerHTML={{ __html: `${event.title}<br />${dateString}` }}
- />
- <p className="subtitle">{renderReferenceList()}</p>
+ >
+ {event.title}
+ {' '}
+ <br />
+ {' '}
+ {!isSelected && (
+ <MonospaceDate date={dateString} />
+ )}
+ </h4>
+ {isSelected && (<p className="subtitle">{renderReferenceList()}</p>)}
{renderDateLists()}
</li>
);
diff --git a/web/js/components/timeline/timeline-coverage/coverage-item-list.js b/web/js/components/timeline/timeline-coverage/coverage-item-list.js
index e5e82f55c..7bfc9ad49 100644
--- a/web/js/components/timeline/timeline-coverage/coverage-item-list.js
+++ b/web/js/components/timeline/timeline-coverage/coverage-item-list.js
@@ -9,6 +9,7 @@ import {
} from '../../../modules/date/constants';
import CoverageItemContainer from './coverage-item-container';
import { formatDisplayDate } from '../../../modules/date/util';
+import MonospaceDate from '../../util/monospace-date';
const { events } = util;
@@ -54,10 +55,21 @@ class CoverageItemList extends Component {
* @param {String} background color
* @returns {DOM Element} header
*/
- getHeaderDOMEl = (layer, visible, dateRange, layerItemBackground) => {
+ getHeaderDOMEl = (layer, visible, layerItemBackground, inactiveLayers) => {
const titleColor = visible ? '#000' : '#999';
const textColor = visible ? '#222' : '#999';
- const { subtitle, title } = layer;
+ const {
+ subtitle, title, startDate, endDate,
+ } = layer;
+ const formattedStartDate = startDate && formatDisplayDate(new Date(startDate));
+ const formattedEndDate = endDate && formatDisplayDate(new Date(endDate));
+ const baseStyle = { width: '110px', display: 'inline-block' };
+ const getStyle = (date) => (
+ date
+ ? { ...baseStyle, textAlign: 'center' }
+ : { ...baseStyle, paddingLeft: '2px' }
+ );
+
return (
<>
<div className="layer-coverage-item-header">
@@ -83,9 +95,13 @@ class CoverageItemList extends Component {
style={{
background: layerItemBackground,
color: textColor,
+ float: 'left',
+ width: inactiveLayers ? '205px' : '175px',
}}
>
- {dateRange}
+ <MonospaceDate style={getStyle(formattedStartDate)} date={formattedStartDate || ' Start '} />
+ {' - '}
+ <MonospaceDate style={getStyle(formattedEndDate)} date={formattedEndDate || ' Present '} />
</div>
</div>
</>
@@ -161,35 +177,6 @@ class CoverageItemList extends Component {
return new Date(rangeDateEnd).toISOString();
}
- /**
- * @desc get formatted, readable date range for header
- * @param {Object} layer
- * @returns {String} dateRangeText
- */
- getFormattedDateRange = (layer) => {
- // get start date -or- 'start'
- const {
- endDate, startDate,
- } = layer;
- let dateRangeStart;
- if (startDate) {
- dateRangeStart = formatDisplayDate(new Date(startDate));
- } else {
- dateRangeStart = 'Start';
- }
-
- // get end date -or- 'present'
- let dateRangeEnd;
- if (endDate) {
- dateRangeEnd = formatDisplayDate(new Date(endDate));
- } else {
- dateRangeEnd = 'Present';
- }
-
- const dateRangeText = `${dateRangeStart} to ${dateRangeEnd}`;
- return dateRangeText;
- }
-
/**
* @desc get endDateLimit based on axis and appNow
* @param {Object} layer def object
@@ -354,6 +341,7 @@ class CoverageItemList extends Component {
positionTransformX,
} = this.props;
const emptyLayers = activeLayers.length === 0;
+ const inactiveLayers = activeLayers.some(({ inactive }) => inactive);
return (
<div className="layer-coverage-layer-list">
{/* Empty layer coverage message */
@@ -396,7 +384,6 @@ class CoverageItemList extends Component {
} = this.getLayerItemStyles(visible, id);
// get date range
- const dateRange = this.getFormattedDateRange(layer);
const dateRangeIntervalZeroIndex = dateRanges
? Number(dateRanges[0].dateInterval)
: 1;
@@ -419,7 +406,7 @@ class CoverageItemList extends Component {
}}
>
{/* Layer Header DOM El */
- this.getHeaderDOMEl(layer, visible, dateRange, layerItemBackground)
+ this.getHeaderDOMEl(layer, visible, layerItemBackground, inactiveLayers)
}
<div
className="layer-coverage-line-container"
diff --git a/web/js/components/util/monospace-date.js b/web/js/components/util/monospace-date.js
new file mode 100644
index 000000000..50a02d9c9
--- /dev/null
+++ b/web/js/components/util/monospace-date.js
@@ -0,0 +1,15 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+export default function MonospaceDate({ date, children }) {
+ return (
+ <span className="monospace">
+ {children}
+ {date}
+ </span>
+ );
+}
+MonospaceDate.propTypes = {
+ children: PropTypes.object,
+ date: PropTypes.string,
+};
diff --git a/web/js/containers/sidebar/compare.js b/web/js/containers/sidebar/compare.js
index 66ae297c3..db1993952 100644
--- a/web/js/containers/sidebar/compare.js
+++ b/web/js/containers/sidebar/compare.js
@@ -7,6 +7,7 @@ import {
import LayersContainer from './layers-container';
import { toggleActiveCompareState as toggleActiveCompareStateAction } from '../../modules/compare/actions';
import { memoizedDateMonthAbbrev } from '../../modules/compare/selectors';
+import MonospaceDate from '../../components/util/monospace-date';
const tabHeight = 32;
const CompareCase = (props) => {
@@ -21,6 +22,7 @@ const CompareCase = (props) => {
const outerClass = 'layer-container sidebar-panel';
const tabClasses = 'ab-tab';
+
return (
<div className={isActive ? '' : 'hidden '}>
<div className={outerClass}>
@@ -36,7 +38,8 @@ const CompareCase = (props) => {
onClick={toggleActiveCompareState}
>
<i className="productsIcon selected icon-layers" />
- {` A: ${dateA}`}
+ {' A: '}
+ <MonospaceDate date={dateA} />
</NavLink>
</NavItem>
<NavItem>
@@ -49,7 +52,8 @@ const CompareCase = (props) => {
onClick={toggleActiveCompareState}
>
<i className="productsIcon selected icon-layers" />
- {` B: ${dateB}`}
+ {' B: '}
+ <MonospaceDate date={dateB} />
</NavLink>
</NavItem>
</Nav>
diff --git a/web/js/map/compare/spy.js b/web/js/map/compare/spy.js
index 6b3190058..402719076 100644
--- a/web/js/map/compare/spy.js
+++ b/web/js/map/compare/spy.js
@@ -38,8 +38,7 @@ export default class Spy {
const isBInside = isCompareA(state);
const { dateA, dateB } = memoizedDateMonthAbbrev(state)();
if (dateA !== this.dateA || dateB !== this.dateB || dateA === dateB) {
- const insideText = getDateText(state);
- label.innerText = insideText;
+ label.innerHTML = getDateText(state);
}
this.dateA = dateA;
this.dateB = dateB;
@@ -108,11 +107,10 @@ export default class Spy {
* @param {Boolean} isBInside | B is the spy value -- true|false
*/
addSpy(map, state) {
- const insideText = getDateText(state);
label = document.createElement('span');
label.className = 'ab-spy-span inside-label';
label.style.display = 'none';
- label.appendChild(document.createTextNode(insideText));
+ label.innerHTML = getDateText(state);
this.mapCase.appendChild(label);
this.mapCase.addEventListener('mousemove', this.updateSpy.bind(this));
@@ -123,6 +121,7 @@ export default class Spy {
return this.mapCase;
}
}
+
/**
* Layers need to be inversely clipped so that they can't be seen through
* the other layergroup in cases where the layergroups layer opacity is < 100%
@@ -133,6 +132,7 @@ const applyReverseLayerListeners = function(layer) {
layer.on('postrender', restore);
bottomLayers.push(layer);
};
+
/**
* Add listeners for layer clipping
* @param {Object} layer | Ol Layer object
@@ -142,6 +142,7 @@ const applyLayerListeners = function(layer) {
layer.on('postrender', restore);
topLayers.push(layer);
};
+
/**
* Clip everything but the circle
* @param {Object} event | Event object
@@ -163,6 +164,7 @@ const inverseClip = function(event) {
ctx.clearRect(0, 0, offset, offset);
}
};
+
/**
* Clip the circle of a layer so users can see through
*/
@@ -182,10 +184,12 @@ const clip = function(event) {
}
ctx.clip();
};
+
const restore = function(event) {
const ctx = event.context;
ctx.restore();
};
+
/**
* Remove all listeners from layer group
* @param {Array} layers | Layer group
@@ -196,6 +200,7 @@ const removeListenersFromLayers = function(layers) {
layer.un('postrender', restore);
});
};
+
/**
* Remove all listeners from layer group
* @param {Array} layers | Layer group
@@ -206,6 +211,7 @@ const removeInverseListenersFromLayers = function(layers) {
layer.un('postrender', restore);
});
};
+
/**
* Recursively apply listeners to layers
* @param {Object} layer | Layer or layer Group obj
@@ -225,14 +231,14 @@ const applyEventsToBaseLayers = function(layer, map, callback) {
const getDateText = function(state) {
const isBInside = isCompareA(state);
- let insideText = isBInside ? 'B' : 'A';
const { dateA, dateB } = memoizedDateMonthAbbrev(state)();
const isSameDate = dateA === dateB;
+ let innerHtml = isBInside ? 'B' : 'A';
if (!isSameDate) {
const dateText = isBInside ? dateB : dateA;
- insideText += `: ${dateText}`;
+ innerHtml += `: <span class="monospace">${dateText}</span>`;
}
- return insideText;
+ return innerHtml;
};
const isCompareA = (state) => state.compare.isCompareA;
diff --git a/web/js/map/compare/swipe.js b/web/js/map/compare/swipe.js
index f2674453e..d408e89f6 100644
--- a/web/js/map/compare/swipe.js
+++ b/web/js/map/compare/swipe.js
@@ -159,16 +159,25 @@ const addLineOverlay = function(map, dateA, dateB) {
firstLabel.className = 'ab-swipe-span left-label';
secondLabel.className = 'ab-swipe-span right-label';
const isSameDate = dateA === dateB;
- let dateAText = 'A';
- let dateBText = 'B';
+ const dateAText = 'A: ';
+ const dateBText = 'B: ';
if (!isSameDate) {
firstLabel.className += ' show-date-label';
secondLabel.className += ' show-date-label';
- dateAText += `: ${dateA}`;
- dateBText += `: ${dateB}`;
}
+ const dateElA = document.createElement('span');
+ const dateElB = document.createElement('span');
+ dateElA.className = 'monospace';
+ dateElB.className = 'monospace';
+
+ dateElA.appendChild(document.createTextNode(dateA));
+ dateElB.appendChild(document.createTextNode(dateB));
+
firstLabel.appendChild(document.createTextNode(dateAText));
+ firstLabel.appendChild(dateElA);
+
secondLabel.appendChild(document.createTextNode(dateBText));
+ secondLabel.appendChild(dateElB);
draggerEl.className = 'ab-swipe-dragger';
lineCaseEl.className = 'ab-swipe-line';
diff --git a/web/js/modules/date/util.js b/web/js/modules/date/util.js
index ffd40d49c..f2ac68e1c 100644
--- a/web/js/modules/date/util.js
+++ b/web/js/modules/date/util.js
@@ -1,3 +1,4 @@
+import React from 'react';
import { each as lodashEach, get } from 'lodash';
import update from 'immutability-helper';
import moment from 'moment';
@@ -7,6 +8,7 @@ import {
dateRange as getDateRange, getActiveLayers,
} from '../layers/selectors';
import { getSelectedDate, getDeltaIntervalUnit } from './selectors';
+import MonospaceDate from '../../components/util/monospace-date';
export const filterProjLayersWithStartDate = (layers, projId) => layers.filter((layer) => layer.startDate && layer.projections[projId]);
@@ -352,6 +354,7 @@ export const outOfStepChange = (state, newDate) => {
};
export const coverageDateFormatter = (dateType, date, period) => {
+ if (!date) return;
let dateString;
const parsedDate = parseDate(date);
switch (period) {
@@ -374,10 +377,11 @@ export const coverageDateFormatter = (dateType, date, period) => {
break;
}
- return dateString;
+ return (<MonospaceDate date={dateString} />);
};
export const formatDisplayDate = (date, subdaily) => {
+ if (!date) return;
const format = subdaily ? 'YYYY MMM DD HH:mm' : 'YYYY MMM DD';
const dateString = moment.utc(date).format(format);
return `${dateString.toUpperCase()}${subdaily ? 'Z' : ''}`;
diff --git a/web/scss/features/compare.scss b/web/scss/features/compare.scss
index 4a1d7a94e..083ee8953 100644
--- a/web/scss/features/compare.scss
+++ b/web/scss/features/compare.scss
@@ -10,14 +10,14 @@
user-select: none;
& .show-date-label {
- width: 109px;
+ width: 120px;
}
& .left-label {
left: -23px;
&.show-date-label {
- left: -118px;
+ left: -129px;
}
}
@@ -61,6 +61,8 @@
}
.ab-slider-case {
+ @include wv-date-chip;
+
position: absolute;
margin-left: auto;
margin-right: auto;
@@ -68,9 +70,6 @@
right: 0;
bottom: 195px;
text-align: center;
- background: $wv-transparent-black;
- border-radius: 3px;
- color: #fff;
height: 36px;
}
@@ -90,11 +89,19 @@
.ab-slider-case .wv-slider-label h4 {
font-weight: 400;
+ position: absolute;
+
+ &.left {
+ left: 8px;
+ }
+
+ &.right {
+ right: 8px;
+ }
}
.ab-slider-case .wv-slider-label span {
font-size: 15px;
- font-weight: 700;
vertical-align: top;
}
@@ -106,30 +113,32 @@
}
.ab-swipe-line .ab-swipe-span {
+ @include wv-date-chip;
+
+ font-family: $wv-base-font;
position: absolute;
bottom: 195px;
- padding: 2px;
- background: #fff;
- color: #000;
+ padding: 2px 4px;
display: block;
font-size: 14px;
margin-top: -7px;
- border-radius: 3px;
- border: 1px solid #000;
cursor: default;
}
.ab-spy-span {
+ @include wv-date-chip;
+
+ font-family: $wv-base-font;
position: absolute;
- background: $wv-transparent-black;
- color: #fff;
display: block;
white-space: nowrap;
font-size: 14px;
- border-radius: 3px;
- border: 1px solid #000;
padding: 2px;
margin-left: -4px;
+
+ // .monospace {
+ // font-family: $wv-monospace-font;
+ // }
}
.compare-dialog ul {
@@ -152,6 +161,16 @@
max-width: 100%;
}
+.ab-tab {
+ .icon-layers {
+ margin-right: 2px;
+ }
+
+ span {
+ padding-bottom: 2px;
+ }
+}
+
/* Mobile */
.comparison-mobile-select-toggle {
border-radius: 5px;
diff --git a/web/scss/features/events.scss b/web/scss/features/events.scss
index da958c7dd..704702c26 100644
--- a/web/scss/features/events.scss
+++ b/web/scss/features/events.scss
@@ -36,7 +36,7 @@
}
}
-.map-item-list li.item {
+.map-item-list li.item.event {
padding: 6px 0;
width: auto;
margin: 0;
@@ -44,15 +44,22 @@
overflow: hidden;
cursor: pointer;
background: transparent;
+
+ &.item-selected {
+ background: #eee;
+ padding: 6px;
+
+ h4.title {
+ color: #666;
+ }
+ }
}
.map-item-list li.item.hidden {
display: none;
}
-.map-item-list li.item h4 {
- font-size: 0.85em;
-
+.map-item-list li.item h4.title {
@media (max-width: 768px) {
font-size: 1em;
}
@@ -114,16 +121,20 @@
}
}
-.wv-eventslist li.item ul li.dates {
+.wv-eventslist li.item ul li.date {
margin: 4px 0;
a {
font-size: 14px;
+ font-family: $wv-monospace-font;
cursor: pointer;
+ }
- &.active {
- font-weight: 700;
- }
+ .active {
+ font-size: 14px;
+ font-family: $wv-monospace-font;
+ font-weight: 500;
+ color: #666;
}
}
diff --git a/web/scss/features/layer-coverage-panel.scss b/web/scss/features/layer-coverage-panel.scss
index ac2aa165d..3ee74a89f 100644
--- a/web/scss/features/layer-coverage-panel.scss
+++ b/web/scss/features/layer-coverage-panel.scss
@@ -104,7 +104,7 @@
.layer-coverage-item-date-range {
position: absolute;
- font-size: 0.9em;
+ font-size: 13px;
right: 0;
top: 0;
padding: 4px 10px;
diff --git a/web/scss/features/layers.scss b/web/scss/features/layers.scss
index 96f817d95..af31a42b1 100644
--- a/web/scss/features/layers.scss
+++ b/web/scss/features/layers.scss
@@ -317,6 +317,34 @@
margin-bottom: 15px;
}
+.layer-date-start .monospace,
+.layer-date-end .monospace {
+ @include wv-date-chip;
+
+ font-size: 14px;
+ font-weight: 500;
+ padding: 1px 4px;
+ margin: 0 4px;
+}
+
+.source-metadata .layer-description .layer-date-start .monospace,
+.source-metadata .layer-description .layer-date-end .monospace {
+ @include wv-date-chip;
+
+ border-color: #555;
+ background-color: #777;
+ font-size: 14px;
+}
+
+.layers-all-layer .source-metadata .layer-description .layer-date-ranges span.monospace {
+ font-family: $wv-monospace-font;
+ font-size: 14px;
+}
+
+.layer-description .layer-description {
+ margin-top: 5px;
+}
+
.layer-metadata li,
.source-metadata li {
line-height: 16px;
diff --git a/web/scss/features/map.scss b/web/scss/features/map.scss
index b71d9f4ca..87d709100 100644
--- a/web/scss/features/map.scss
+++ b/web/scss/features/map.scss
@@ -267,3 +267,18 @@
.distraction-free-active .wv-map-scale-metric {
display: none;
}
+
+.dateline-text {
+ rect {
+ fill: #444;
+ stroke: #222;
+ stroke-width: 1px;
+ }
+
+ text {
+ fill: #eee;
+ text-shadow: 1px 1px 0 #111;
+ font-size: 14px;
+ font-family: $wv-monospace-font;
+ }
+}
diff --git a/web/scss/util.scss b/web/scss/util.scss
index 56b93645d..74b2938b7 100644
--- a/web/scss/util.scss
+++ b/web/scss/util.scss
@@ -30,3 +30,7 @@
.cursor-crosshair {
cursor: crosshair;
}
+
+span.monospace {
+ font-family: $wv-monospace-font;
+}
diff --git a/web/scss/variables.scss b/web/scss/variables.scss
index 668bd5e7c..51cf7817f 100644
--- a/web/scss/variables.scss
+++ b/web/scss/variables.scss
@@ -19,7 +19,7 @@ $wv-menu-font-size: 16px;
$wv-menu-border-radius: 6px;
$wv-dark-menu-border: 1px solid #555;
-/* Mixin */
+/* Mixins */
@mixin wv-modal-dialog {
border-radius: $wv-menu-border-radius;
box-shadow: $wv-modal-shadow;
@@ -52,3 +52,12 @@ $wv-dark-menu-border: 1px solid #555;
color: $wv-white-font;
}
}
+
+@mixin wv-date-chip {
+ font-family: $wv-monospace-font;
+ background: #555;
+ color: #eee;
+ text-shadow: 1px 1px 0 #111;
+ border: 1px solid #000;
+ border-radius: 4px;
+}