Interactive interface for browsing global, full-resolution satellite imagery
Merge `feature-pwa` into `release-3.21.0` (#3850)
Jason Hurley233b3742afc5
diff --git a/.eslintignore b/.eslintignoreindex f52ad534d..b0288ef8b 100644--- a/.eslintignore+++ b/.eslintignore@@ -11,4 +11,3 @@ web/dist/*web/build/*test/*web/js/lib/*-diff --git a/tasks/dist.js b/tasks/dist.jsindex c79fbf98e..a82ad7216 100755--- a/tasks/dist.js+++ b/tasks/dist.js@@ -30,6 +30,7 @@ const applyTo = ['build/worldview/build/wv.js','build/worldview/brand/about/*.html','build/worldview/pages/*.html',+ 'build/worldview/manifest.webmanifest',];// Build date shown in the About boxdiff --git a/web/images/maskable_icon.png b/web/images/maskable_icon.pngnew file mode 100644index 000000000..5ed67dd31Binary files /dev/null and b/web/images/maskable_icon.png differdiff --git a/web/images/wv-logo-apple-icon.png b/web/images/wv-logo-apple-icon.pngnew file mode 100644index 000000000..bc7f0a6efBinary files /dev/null and b/web/images/wv-logo-apple-icon.png differdiff --git a/web/images/wv-logo-mobile.png b/web/images/wv-logo-mobile.pngnew file mode 100644index 000000000..d6d810f9aBinary files /dev/null and b/web/images/wv-logo-mobile.png differdiff --git a/web/index.html b/web/index.htmlindex 5b4fb65f0..dbca11e07 100644--- a/web/index.html+++ b/web/index.html@@ -63,6 +63,10 @@ Licensed under the NASA Open Source Agreement, Version 1.3 (https://opensource.g<link type="text/css" rel="Stylesheet" href="build/wv.css?v=@BUILD_NONCE@"><script type="text/javascript" src="build/wv.js?v=@BUILD_NONCE@"></script>++ <link rel="apple-touch-icon" href="images/wv-logo-apple-icon.png">+ <link rel="manifest" href="manifest.webmanifest">+ <meta name="theme-color" content="#FFFFFF"/></head><body>diff --git a/web/js/components/sidebar/collapsed-button.js b/web/js/components/sidebar/collapsed-button.jsindex b9172e3cf..eaec00df5 100644--- a/web/js/components/sidebar/collapsed-button.js+++ b/web/js/components/sidebar/collapsed-button.js@@ -6,28 +6,29 @@ import { UncontrolledTooltip } from 'reactstrap';class CollapsedButton extends PureComponent {render() {const {+ isEmbed,isMobile,numberOfLayers,onclick,} = this.props;const buttonId = 'accordion-toggler-button';const labelText = 'Expand sidebar';+ const classes = `sidebar-expand ${isMobile && !isEmbed ? 'mobile' : ''}`;return (<divid="productsHoldertoggleButtonHolder"- className="toggleButtonHolder"+ className={classes}><aid={buttonId}aria-label={labelText}- className="accordionToggler dateHolder staticLayers"onClick={onclick}><UncontrolledTooltip placement="right" target={buttonId}>{labelText}</UncontrolledTooltip>- <FontAwesomeIcon icon="layer-group" />+ <FontAwesomeIcon className="layer-icon" icon="layer-group" />{isMobile? (<span className="layer-count mobile">@@ -39,12 +40,14 @@ class CollapsedButton extends PureComponent {{`${numberOfLayers.toString()} Layers`}</span>)}+ {!isMobile && <FontAwesomeIcon className="expand-icon" icon="caret-down" />}</a></div>);}}CollapsedButton.propTypes = {+ isEmbed: PropTypes.bool,isMobile: PropTypes.bool,numberOfLayers: PropTypes.number,onclick: PropTypes.func,diff --git a/web/js/components/sidebar/nav/nav-case.js b/web/js/components/sidebar/nav/nav-case.jsindex d51e89f3f..93f4b17ea 100644--- a/web/js/components/sidebar/nav/nav-case.js+++ b/web/js/components/sidebar/nav/nav-case.js@@ -1,9 +1,9 @@import React from 'react';import PropTypes from 'prop-types';import { Nav, UncontrolledTooltip } from 'reactstrap';+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';import CustomNavItem from './nav-item';-const tabClasses = 'sidebar-tab';function NavCase (props) {@@ -87,16 +87,16 @@ function NavCase (props) {/>{!isEventsTabDisabledEmbed && renderEvents()}{renderDataDownload()}- <div className="toggleIconHolder">- <UncontrolledTooltip placement="right" target="accordion-toggler-button">- Hide sidebar- </UncontrolledTooltip>- <a++ <div id="toggleIconHolder" className="sidebar-collapse" onClick={toggleSidebar}>+ <FontAwesomeIconid="accordion-toggler-button"- className="accordionToggler atcollapse arrow"- onClick={toggleSidebar}+ icon="caret-up"aria-label="Hide sidebar"/>+ <UncontrolledTooltip placement="right" target="toggleIconHolder">+ Hide sidebar+ </UncontrolledTooltip></div></Nav>);diff --git a/web/js/containers/sidebar/compare.js b/web/js/containers/sidebar/compare.jsindex 2503e2825..784b6292a 100644--- a/web/js/containers/sidebar/compare.js+++ b/web/js/containers/sidebar/compare.js@@ -9,7 +9,6 @@ import { toggleActiveCompareState as toggleActiveCompareStateAction } from '../.import { getCompareDates } from '../../modules/compare/selectors';import MonospaceDate from '../../components/util/monospace-date';-const tabHeight = 32;const CompareCase = (props) => {const {isActive,@@ -62,14 +61,14 @@ const CompareCase = (props) => {<LayersContainerisActive={isCompareA}compareState="active"- height={height - tabHeight}+ height={height}/></TabPane><TabPane tabId="2"><LayersContainerisActive={!isCompareA}compareState="activeB"- height={height - tabHeight}+ height={height}/></TabPane></TabContent>diff --git a/web/js/containers/sidebar/events.js b/web/js/containers/sidebar/events.jsindex a2f55f053..652aa119a 100644--- a/web/js/containers/sidebar/events.js+++ b/web/js/containers/sidebar/events.js@@ -41,7 +41,7 @@ function Events(props) {selectedCategories,} = props;- const filterControlHeight = 72;+ const filterControlHeight = 115;const maxHeight = Math.max(height - filterControlHeight, 166);const scrollbarMaxHeight = isEmbedModeActive ? '50vh' : `${maxHeight}px`;diff --git a/web/js/containers/sidebar/layers-container.js b/web/js/containers/sidebar/layers-container.jsindex 76c2cc6a5..cba981958 100644--- a/web/js/containers/sidebar/layers-container.js+++ b/web/js/containers/sidebar/layers-container.js@@ -26,9 +26,7 @@ function LayersContainer (props) {groupOverlays,height,isActive,- isCompareActive,isEmbedModeActive,- isMobile,isAnimating,overlayGroups,overlays,@@ -111,11 +109,8 @@ function LayersContainer (props) {</DragDropContext>);- const mobileHeightCoeff = isCompareActive ? -30 : 20;let minHeight = '100px';- let maxHeight = isMobile- ? height + mobileHeightCoeff- : height;+ let maxHeight = height;if (isEmbedModeActive) {minHeight = '25px';diff --git a/web/js/containers/sidebar/sidebar.js b/web/js/containers/sidebar/sidebar.jsindex 7e3aae024..2c3203cb1 100644--- a/web/js/containers/sidebar/sidebar.js+++ b/web/js/containers/sidebar/sidebar.js@@ -100,19 +100,20 @@ class Sidebar extends React.Component {updateDimensions() {const { subComponentHeight } = this.state;- const { isMobile, screenHeight } = this.props;+ const { isMobile, screenHeight, isCompareMode } = this.props;const footerHeight = lodashGet(this, 'footerElement.clientHeight') || 20;- const tabHeight = 32;+ const tabHeight = isMobile ? isCompareMode ? 80 : 40 : 32;+ const groupCheckboxHeight = 35;let newHeight;if (!isMobile) {const iconHeight = 53;const topOffset = 10;const basePadding = 130;newHeight = screenHeight- - (iconHeight + topOffset + tabHeight + basePadding + footerHeight)+ - (iconHeight + topOffset + tabHeight + groupCheckboxHeight + basePadding + footerHeight)- 10;} else {- newHeight = screenHeight - (tabHeight + footerHeight);+ newHeight = screenHeight - (tabHeight + groupCheckboxHeight + footerHeight);}// Issue #1415: This was checking for subComponentHeight !== newHeight.// Sometimes it would get stuck in a loop in which the newHeight@@ -155,7 +156,7 @@ class Sidebar extends React.Component {} if (!isCompareMode) {return (<LayersContainer- height={subComponentHeight - 48}+ height={subComponentHeight}isActive={activeTab === 'layers'}compareState={activeString}/>@@ -248,11 +249,12 @@ class Sidebar extends React.Component {{this.renderSidebarLogo()}<>{!isDistractionFreeModeActive && isCollapsed && (- <CollapsedButton- isMobile={isMobile}- onclick={this.toggleSidebar}- numberOfLayers={numberOfLayers}- />+ <CollapsedButton+ isMobile={isMobile}+ isEmbed={isEmbedModeActive}+ onclick={this.toggleSidebar}+ numberOfLayers={numberOfLayers}+ />)}<divid="products-holder"diff --git a/web/js/containers/timeline/timeline.js b/web/js/containers/timeline/timeline.jsindex 2050bd313..faff4b260 100644--- a/web/js/containers/timeline/timeline.js+++ b/web/js/containers/timeline/timeline.js@@ -872,10 +872,10 @@ class Timeline extends React.Component {// default positioninglet mobileLeft = 190;- let mobileBottom = 10;+ let mobileBottom = 20;if (isEmbedModeActive) {mobileLeft = 145;- mobileBottom = 10;+ mobileBottom = 20;}// positioning will change depending on a combination of:// 1) subdaily (mobile date picker width);@@ -888,10 +888,10 @@ class Timeline extends React.Component {}} else if (isScreenWidthLessThan484) {mobileLeft = isCompareModeActive ? 112 : 10;- mobileBottom = 65;+ mobileBottom = 75;if (isEmbedModeActive) {mobileLeft = isCompareModeActive ? 90 : 10;- mobileBottom = 50;+ mobileBottom = 60;}}diff --git a/web/js/main.js b/web/js/main.jsindex 342644ee2..d2e2262e7 100644--- a/web/js/main.js+++ b/web/js/main.js@@ -205,6 +205,10 @@ window.onload = () => {};render(config, parameters, legacyState);});++ if ('serviceWorker' in navigator) {+ navigator.serviceWorker.register('service-worker.js');+ }}).catch((error) => console.error(error));};diff --git a/web/js/map/ui.js b/web/js/map/ui.jsindex 2e861d352..dc2469594 100644--- a/web/js/map/ui.js+++ b/web/js/map/ui.js@@ -233,7 +233,7 @@ export default function mapui(models, config, store, ui) {events.on('redux:action-dispatched', subscribeToStore);events.on('map:reload-layers', reloadLayers);window.addEventListener('orientationchange', () => {- updateProjection(true);+ setTimeout(() => { updateProjection(true); }, 200);});updateProjection(true);};diff --git a/web/manifest.webmanifest b/web/manifest.webmanifestnew file mode 100644index 000000000..e0c4ef326--- /dev/null+++ b/web/manifest.webmanifest@@ -0,0 +1,31 @@+{+ "short_name": "@NAME@",+ "name": "@LONG_NAME@",+ "icons": [+ {+ "src": "images/wv-logo-mobile.png",+ "type": "image/png",+ "sizes": "512x512"+ },+ {+ "src": "images/maskable_icon.png",+ "type": "image/png",+ "sizes": "512x512",+ "purpose": "any maskable"+ }+ ],+ "start_url": ".",+ "scope": ".",+ "id":"/",+ "background_color": "#FFFFFF",+ "display": "fullscreen",+ "theme_color": "#FFFFFF",+ "description": "@DESCRIPTION@",+ "screenshots": [+ {+ "src": "images/readme-preview.jpg",+ "type": "image/jpg",+ "sizes": "1200x800"+ }+ ]+}\ No newline at end of filediff --git a/web/scss/components/alert.scss b/web/scss/components/alert.scssindex 302a2bb9b..52eb6562e 100644--- a/web/scss/components/alert.scss+++ b/web/scss/components/alert.scss@@ -72,7 +72,7 @@margin-top: 10px;}-@media (max-width: 768px) {+@media (max-width: $mobile-max-width) {.wv-alert {min-height: 50px;font-size: 12px;diff --git a/web/scss/components/facets.scss b/web/scss/components/facets.scssindex c448411cd..7d5d1c9ea 100644--- a/web/scss/components/facets.scss+++ b/web/scss/components/facets.scss@@ -95,7 +95,7 @@}}-@media (max-width: 768px) {+@media (max-width: $mobile-max-width) {.facet-container {max-width: 100%;display: flex;diff --git a/web/scss/components/tooltip.scss b/web/scss/components/tooltip.scssindex 69cb397bd..696d12756 100644--- a/web/scss/components/tooltip.scss+++ b/web/scss/components/tooltip.scss@@ -205,7 +205,7 @@}}-@media (max-width: 768px) {+@media (max-width: $mobile-max-width) {.tooltip-custom-black {&.tooltip-coordinates-container {max-width: 320px;diff --git a/web/scss/features/about.scss b/web/scss/features/about.scssindex 9e9c9ba58..274e5c680 100644--- a/web/scss/features/about.scss+++ b/web/scss/features/about.scss@@ -157,7 +157,7 @@}}-@media (min-width: 769px) {+@media (min-width: $tablet-min-width) {.about-page .keyboard-shortcuts-section {display: block;}diff --git a/web/scss/features/anim-widget.scss b/web/scss/features/anim-widget.scssindex edcf008f9..8a4c8c44d 100644--- a/web/scss/features/anim-widget.scss+++ b/web/scss/features/anim-widget.scss@@ -3,7 +3,7 @@z-index: 100;}-@media (min-width: 769px) {+@media (min-width: $tablet-min-width) {.wv-animation-widget-wrapper {bottom: 88px;@@ -19,7 +19,7 @@bottom: 0;&.minimized {- bottom: 10px;+ bottom: 20px;left: 188px;&.landscape {@@ -32,7 +32,7 @@left: 165px;&.landscape {- bottom: 10px;+ bottom: 20px;left: 420px;}}@@ -182,7 +182,7 @@}/* No hover styles on mobile */- @media (min-width: 769px) {+ @media (min-width: $tablet-min-width) {&:hover {color: #999;cursor: pointer;@@ -203,7 +203,7 @@ a .wv-animation-widget-icon {left: 50%;top: 50%;- @media (min-width: 769px) {+ @media (min-width: $tablet-min-width) {&:hover {color: #fff;opacity: 0.5;diff --git a/web/scss/features/compare.scss b/web/scss/features/compare.scssindex 5cf4c9e7c..bf84ae9f5 100644--- a/web/scss/features/compare.scss+++ b/web/scss/features/compare.scss@@ -178,7 +178,7 @@border: thin solid #333;background-color: $wv-transparent-black;position: absolute;- bottom: 65px;+ bottom: 75px;left: 10px;display: flex;overflow: hidden;diff --git a/web/scss/features/event-filter.scss b/web/scss/features/event-filter.scssindex bc96b8838..1fd2bbab5 100644--- a/web/scss/features/event-filter.scss+++ b/web/scss/features/event-filter.scss@@ -3,6 +3,7 @@padding: 5px;max-width: 290px;margin: 0 auto;+ height: $wv-sidebar-event-filter-height;.filter-dates-icons {display: inline-block;@@ -84,7 +85,7 @@padding: 10px 0;width: 100%;margin: 0 auto;- min-height: 35px;+ min-height: $wv-sidebar-event-footer-height;font-size: 15px;svg {diff --git a/web/scss/features/events.scss b/web/scss/features/events.scssindex 0de521e27..9b87d58f9 100644--- a/web/scss/features/events.scss+++ b/web/scss/features/events.scss@@ -20,8 +20,8 @@min-height: 166px;- @media (max-width: 768px) {- height: calc(var(--vh, 1vh) * 100 - 75px);+ @media (max-width: $mobile-max-width) {+ height: calc(var(--vh, 1vh) * 100 - 85px);}.event-scroll-list {@@ -30,8 +30,8 @@background: #222;min-height: 260px;- @media (max-width: 768px) {- min-height: calc(var(--vh, 1vh) * 100 - 140px);+ @media (max-width: $mobile-max-width) {+ min-height: calc(var(--vh, 1vh) * 100 - $wv-mobile-event-list-offset);}}}@@ -60,7 +60,7 @@}.map-item-list li.item h4.title {- @media (max-width: 768px) {+ @media (max-width: $mobile-max-width) {font-size: 1em;}diff --git a/web/scss/features/layers.scss b/web/scss/features/layers.scssindex af31a42b1..c1e1979df 100644--- a/web/scss/features/layers.scss+++ b/web/scss/features/layers.scss@@ -673,7 +673,7 @@}}-@media (min-width: 1024px) {+@media (min-width: $desktop-min-width) {.search-layers-container {& div.layer-list-detail-container {flex-direction: row;@@ -692,7 +692,7 @@}/* Need at least 1024px to fit three category boxes inline */-@media (max-width: 1023px) {+@media (max-width: $tablet-max-width) {.custom-layer-dialog.category-width {width: 658px;@@ -717,7 +717,7 @@}}-@media (min-width: 769px) {+@media (min-width: $tablet-min-width) {.category-width .layer-modal-content {height: calc(var(--vh, 1vh) * 100 - 135px);}@@ -740,7 +740,7 @@}/* Mobile Styles Begin Here */-@media (max-width: 768px) {+@media (max-width: $mobile-max-width) {.category-width .layer-modal-content {padding: 0;height: calc(var(--vh, 1vh) * 100 - 40px);diff --git a/web/scss/features/location-search.scss b/web/scss/features/location-search.scssindex 187caa4ba..aee20deb7 100644--- a/web/scss/features/location-search.scss+++ b/web/scss/features/location-search.scss@@ -179,7 +179,7 @@}/* Mobile Styling */-@media only screen and (max-width: 768px) {+@media only screen and (max-width: $mobile-max-width) {.location-search-expanded {position: static;width: 100%;diff --git a/web/scss/features/map.scss b/web/scss/features/map.scssindex 14ec3cfb0..841676247 100644--- a/web/scss/features/map.scss+++ b/web/scss/features/map.scss@@ -68,7 +68,7 @@display: block;width: 36px;padding: 12px;- height: 37px;+ height: 38px;}.wv-map-zoom-in {@@ -95,12 +95,12 @@}.wv-map-rotate-right {- top: 91px;+ top: 90px;border-bottom-left-radius: 10px;border-bottom-right-radius: 10px;}-@media (max-width: 768px) {+@media (max-width: $mobile-max-width) {.wv-zoom-buttons {display: none;}@@ -109,9 +109,9 @@top: 96px;}- .wv-map-rotate-left svg.svg-inline--fa,- .wv-map-rotate-right svg.svg-inline--fa {- width: 47px;+ .wv-map-rotate-left,+ .wv-map-rotate-right {+ width: 49px;padding: 8px;}diff --git a/web/scss/features/measure.scss b/web/scss/features/measure.scssindex f8535d98c..f07818654 100644--- a/web/scss/features/measure.scss+++ b/web/scss/features/measure.scss@@ -39,13 +39,13 @@}}-@media (max-width: 768px) {+@media (max-width: $mobile-max-width) {.wv-measure-button {- bottom: 10px;+ bottom: 20px;}.modal-dialog.measure-tool-modal {- bottom: 55px;+ bottom: 60px;margin: 0;}}diff --git a/web/scss/features/palettes.scss b/web/scss/features/palettes.scssindex 5bf60d87d..83e3a0df5 100644--- a/web/scss/features/palettes.scss+++ b/web/scss/features/palettes.scss@@ -175,7 +175,7 @@margin-left: 0;}-@media (max-width: 768px) {+@media (max-width: $mobile-max-width) {.wv-palettes-colorbar {width: 100%;max-width: 100%;diff --git a/web/scss/features/products.scss b/web/scss/features/products.scssindex fb013b826..261cb8dcf 100644--- a/web/scss/features/products.scss+++ b/web/scss/features/products.scss@@ -69,18 +69,13 @@color: #fff;}-.cats {- float: right;- margin-right: 20px;-}-.productsIcon {display: inline-block;width: 20px;height: 20px;vertical-align: text-bottom;background: url("../images/icon-sprite.svg") transparent 0 -10px;- margin: 0 4px 0 0;+ margin: 0 8px 0 0;}.ab-tab.active .productsIcon {diff --git a/web/scss/features/recent-layers.scss b/web/scss/features/recent-layers.scssindex b6444319e..9a79dc12d 100644--- a/web/scss/features/recent-layers.scss+++ b/web/scss/features/recent-layers.scss@@ -53,7 +53,7 @@ button.recent-layer-delete {top: 8px;}-@media (min-width: 1024px) {+@media (min-width: $desktop-min-width) {.recent-layers-header {width: 50%;}diff --git a/web/scss/features/sidebar-panel.scss b/web/scss/features/sidebar-panel.scssindex f0889c92c..acae8fd94 100644--- a/web/scss/features/sidebar-panel.scss+++ b/web/scss/features/sidebar-panel.scss@@ -1,85 +1,107 @@-.toggleButtonHolder {+.sidebar-expand {position: relative;-}-.accordionToggler {- overflow: hidden;- z-index: 1;- height: 28px;- width: 28px;- background: none no-repeat scroll left;+ > a {+ float: left;+ left: 10px;+ position: absolute;+ top: 67px;+ height: 30px;+ padding-top: 8px;+ background: $wv-transparent-black;+ border-radius: 0;+ box-sizing: border-box;+ width: 286px;+ margin: 0;+ border: 1px solid #333;+ cursor: pointer;+ text-align: center;+ color: #fff;+ overflow: hidden;+ z-index: 1;- & .layer-count {- margin-left: 5px;- }-}+ & .layer-count {+ margin: 0 5px;+ }-.toggleIconHolder {- position: absolute;- right: 6px;- height: 30px;- width: 30px;- border: 1px solid transparent;- border-top-left-radius: 3px;- border-top-right-radius: 3px;-}+ .expand-icon {+ height: 25px;+ width: 25px;+ float: right;+ margin-right: 5px;+ position: relative;+ top: -7px;+ }-.atcollapse {- position: absolute;- background: url("../images/icon-sprite.svg") -206px -3px;- border-radius: 0;- box-sizing: border-box;- border-right: 0;-}+ &:hover {+ background-color: #ccc;+ color: rgb(40 40 40);+ }+ }-.toggleIconHolder:hover {- background: rgb(220 220 220 / 100%);-}+ &.mobile > a {+ height: 45px;+ width: 56px;+ background-image: none;+ border-radius: 5px;+ top: 58px;-.toggleIconHolder:hover .atcollapse {- background-position: -206px -63px;+ & svg.svg-inline--fa {+ font-size: 33px;+ position: absolute;+ left: 10px;+ top: 5px;+ color: #fff;+ }++ & span.layer-count {+ color: #fff;+ position: relative;+ top: 8px;+ font-size: 18px;+ font-weight: 600;+ background: #333;+ border-radius: 50%;+ padding: 0 5px;+ text-align: center;+ margin: 8px;+ }+ }}-a.staticLayers:not([href]):not([tabindex]) {- float: left;- left: 10px;+.sidebar-collapse {position: absolute;- top: 67px;- height: auto;- background: $wv-transparent-black;- border-radius: 0;- box-sizing: border-box;- width: 286px;- margin: 0;- border: 1px solid #333;+ right: 2px;+ height: 30px;+ width: 30px;+ border: 1px solid transparent;cursor: pointer;- padding: 7px 0;- text-align: center;- color: #fff;-}-a.staticLayers:not([href]):not([tabindex]):hover {- background-color: #ccc;- color: rgb(40 40 40);-}+ svg {+ height: 22px;+ width: 22px;+ padding: 3px;+ color: #fff;+ }-a.staticLayers::after {- position: absolute;- content: "";- height: 20px;- width: 20px;- background: url("../images/icon-sprite.svg") -180px -10px;- display: block;- right: 10px;- top: 6px;-}+ &:hover {+ background: #ccc;-a.staticLayers:hover::after {- background-position: -180px -70px;-}+ svg {+ color: #333;+ }+ }++ @media (max-width: $mobile-max-width) {+ height: 48px;+ width: 45px;-a.atexpand {- background: url("../images/icon-sprite.svg") -175px 0;+ svg {+ height: 35px;+ width: 35px;+ color: #fff;+ }+ }}.sidebar-panel {@@ -563,7 +585,18 @@ li.item.productsitem.inmotion,color: #c5c5c8;}-@media (max-width: 768px) {+@media (max-width: $mobile-max-width) {+ .toggleIconHolder {+ height: 50px;+ width: 50px;++ svg {+ width: 45px;+ height: 45px;+ color: #fff;+ }+ }+.sidebar-panel li.item {h4 {font-size: 16px;diff --git a/web/scss/features/sidebar.scss b/web/scss/features/sidebar.scssindex 978dae46d..43f09398b 100644--- a/web/scss/features/sidebar.scss+++ b/web/scss/features/sidebar.scss@@ -19,6 +19,75 @@border-top: none;overflow: hidden;+ ul#overlays {+ margin-bottom: 10px;+ }++ .main-nav {+ background: $wv-transparent-black;+ border-right: 1px solid #333;+ border-left: 1px solid #333;++ @media (max-width: $mobile-max-width) {+ &.nav-tabs {+ height: $wv-mob-sb-tabs-height;++ .nav-item {+ width: 120px;+ margin-right: 15px;++ a.nav-link {+ height: $wv-mob-sb-tabs-height - 2;+ font-size: 18px;+ padding: 16px 10px 8px;+ text-align: center;+ }+ }+ }+ }++ &.nav-tabs {+ border-bottom: 3px solid #00457b;++ .disabled {+ color: #fff;+ opacity: 0.5;+ cursor: default;+ }++ .nav-link {+ padding: 4px 8px;++ &.disabled {+ pointer-events: auto;+ }+ }+ }++ .nav-link {+ margin: 1px 0;+ }+ }++ .nav-item .sidebar-tab.active {+ background: #00457b;+ border-color: #00457b;+ color: #fff;+ }++ .layer-list-placeholder {+ height: 0;+ }++ .tab-content .nav-tabs {+ border-bottom: 3px solid #dee2e6;+ }++ .nav-item {+ color: #fff;+ cursor: pointer;+ }+.layer-container {box-sizing: border-box;position: relative;@@ -33,12 +102,6 @@padding-right: 10px;}- .main-nav {- background: $wv-transparent-black;- border-right: 1px solid #333;- border-left: 1px solid #333;- }-> .tab-content {background: $wv-transparent-black;border: 1px solid #333;@@ -80,45 +143,6 @@opacity: 1;}-#products-holder ul#overlays {- margin-bottom: 10px;-}--.products-holder-case .nav-tabs {- border-bottom: 3px solid #00457b;-}--.products-holder-case .nav-tabs .nav-link {- padding: 4px 8px;-- &.disabled {- pointer-events: auto;- }-}--.products-holder-case .main-nav .nav-link {- margin: 1px 0;-}--#products-holder .nav-tabs .disabled {- color: #fff;- opacity: 0.5;- cursor: default;-}--#products-holder .layer-list-placeholder {- height: 0;-}--.products-holder-case .tab-content .nav-tabs {- border-bottom: 3px solid #dee2e6;-}--.products-holder-case .nav-item {- color: #fff;- cursor: pointer;-}-.nav-item .active {cursor: pointer;}@@ -143,12 +167,6 @@}}-.nav-item .sidebar-tab.active {- background: #00457b;- border-color: #00457b;- color: #fff;-}-/*** IE Scrollbar hack* For strange ui when@@ -241,7 +259,7 @@ footer .compare-toggle-button {font-size: 14px;padding: 6px 12px;- @media (max-width: 768px) {+ @media (max-width: $mobile-max-width) {font-size: 18px;padding: 12px 14px;}@@ -301,7 +319,7 @@ footer .compare-toggle-button {}}-@media (max-width: 739px) {+@media (max-width: $mobile-max-width) {.layer-group-case .layer-group-header {min-height: 32px;margin-top: 10px;@@ -474,7 +492,7 @@ footer .compare-toggle-button {position: absolute;max-width: 100vw;- @media (max-width: 768px) {+ @media (max-width: $mobile-max-width) {left: 0;width: 100%;height: calc(var(--vh, 1vh) * 100);@@ -529,7 +547,7 @@ footer .compare-toggle-button {max-height: calc(100vh - 200px);}- @media (max-width: 768px) {+ @media (max-width: $mobile-max-width) {width: 100%;.modal-body {@@ -542,7 +560,7 @@ footer .compare-toggle-button {.layer-settings-modal {width: 300px;- @media (max-width: 768px) {+ @media (max-width: $mobile-max-width) {width: 100%;}diff --git a/web/scss/features/timeline.scss b/web/scss/features/timeline.scssindex 8ab743d0b..a8b7dcd8f 100644--- a/web/scss/features/timeline.scss+++ b/web/scss/features/timeline.scss@@ -724,7 +724,7 @@ button:focus {user-select: none;position: absolute;left: 10px;- bottom: 10px;+ bottom: 20px;background: $wv-transparent-black;color: #fff;border: thin solid #333;@@ -749,6 +749,10 @@ button:focus {font-size: 18px;}+ .datepicker-navbar-btn {+ height: 55px;+ }+.datepicker .datepicker-navbar-btn:hover {background: #ccc;color: #333;@@ -759,7 +763,7 @@ button:focus {#timeline-header .mobile-date-change-arrows-btn {position: absolute;left: 120px;- bottom: 10px;+ bottom: 20px;background: $wv-transparent-black;border: thin solid #333;border-radius: 5px;diff --git a/web/scss/features/toolbar.scss b/web/scss/features/toolbar.scssindex 13ea44650..15b3b1af8 100644--- a/web/scss/features/toolbar.scss+++ b/web/scss/features/toolbar.scss@@ -54,7 +54,7 @@.toolbar-list-modal.modal-dialog {width: 160px;- @media (max-width: 768px) {+ @media (max-width: $mobile-max-width) {width: 180px;}}@@ -161,7 +161,7 @@}}-@media (min-width: 769px) {+@media (min-width: $tablet-min-width) {.wv-toolbar-button,[data-whatintent="mouse"] .wv-toolbar-button:focus {font-size: 20px;diff --git a/web/scss/features/tour.scss b/web/scss/features/tour.scssindex a40bd8870..285ef0725 100644--- a/web/scss/features/tour.scss+++ b/web/scss/features/tour.scss@@ -763,7 +763,7 @@}}-@media (min-width: 769px) {+@media (min-width: $tablet-min-width) {.tour {display: block;}diff --git a/web/scss/mobile.scss b/web/scss/mobile.scssindex 93ba2c0a9..d66360b16 100644--- a/web/scss/mobile.scss+++ b/web/scss/mobile.scss@@ -1,4 +1,4 @@-@media only screen and (max-width: 768px) {+@media only screen and (max-width: $mobile-max-width) {div.olControlScaleLineCustom {bottom: 10px;}@@ -69,43 +69,6 @@border: 1px solid #333;}- a.staticLayers:not([href]):not([tabindex]) {- height: 45px;- width: 56px;- background-image: none;- border-radius: 5px;- top: 58px;-- & svg.svg-inline--fa {- font-size: 33px;- position: absolute;- left: 10px;- top: 5px;- color: #fff;- }-- & span.layer-count {- color: #fff;- position: relative;- top: 9px;- font-size: 18px;- font-weight: 600;- background: #333;- border-radius: 50%;- padding: 0 5px;- text-align: center;- margin-left: 0;- }- }-- a.staticLayers:not([href]):not([tabindex]):hover {- background-image: none;- }-- a.staticLayers::after {- display: none;- }-#wv-toolbar li {display: block;float: left;diff --git a/web/scss/overrides/react-search-ui.scss b/web/scss/overrides/react-search-ui.scssindex ccac8c170..aba0b9bc4 100644--- a/web/scss/overrides/react-search-ui.scss+++ b/web/scss/overrides/react-search-ui.scss@@ -79,7 +79,7 @@}}-@media (max-width: 768px) {+@media (max-width: $mobile-max-width) {.facet-container .inner-container {div.no-matches {font-size: 20px;diff --git a/web/scss/variables.scss b/web/scss/variables.scssindex 51cf7817f..a13389996 100644--- a/web/scss/variables.scss+++ b/web/scss/variables.scss@@ -19,6 +19,19 @@ $wv-menu-font-size: 16px;$wv-menu-border-radius: 6px;$wv-dark-menu-border: 1px solid #555;+/* Sidbar Heights */+$wv-mob-sb-tabs-height: 50px;+$wv-sidebar-event-filter-height: 65px;+$wv-sidebar-event-footer-height: 35px;+/* stylelint-disable-next-line max-line-length */+$wv-mobile-event-list-offset: $wv-mob-sb-tabs-height + $wv-sidebar-event-filter-height + $wv-sidebar-event-footer-height;++/* Responsive Breakpoints */+$mobile-max-width: 768px;+$tablet-min-width: 769px;+$tablet-max-width: 1023px;+$desktop-min-width: 1024px;+/* Mixins */@mixin wv-modal-dialog {border-radius: $wv-menu-border-radius;diff --git a/web/service-worker.js b/web/service-worker.jsnew file mode 100644index 000000000..cd64e7ef3--- /dev/null+++ b/web/service-worker.js@@ -0,0 +1,4 @@+/* eslint-disable no-restricted-globals */+self.addEventListener('fetch', (event) => {+ // Ignore+});