Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

WV-2810 ESLint Cleanup: Accessibility Part 2 (#5654)

Patrick Mouldena15ec6c897de
diff --git a/e2e/features/animation/animation-test.spec.js b/e2e/features/animation/animation-test.spec.js
index 1f2d778f6..ea43c1150 100644
--- a/e2e/features/animation/animation-test.spec.js
+++ b/e2e/features/animation/animation-test.spec.js
@@ -64,8 +64,8 @@ test('Disable playback when max frames exceeded', async () => {
const { playButton, yearStartInput } = selectors
await page.goto(animationGeostationary)
await closeModal(page)
- const animateYearDown = page.locator('.wv-date-range-selector > div > div > div:nth-child(3) > svg.downarrow').first()
- const animateYearUp = page.locator('.wv-date-range-selector > div > div > div > svg.uparrow').first()
+ const animateYearDown = page.locator('.wv-date-range-selector > div > div > button:nth-child(3) > svg.downarrow').first()
+ const animateYearUp = page.locator('.wv-date-range-selector > div > div > button > svg.uparrow').first()
await animateYearDown.click()
await expect(playButton).toHaveClass(/disabled/)
// Playback re-enabled when frames within the max
diff --git a/e2e/features/compare/compare-mobile-test.spec.js b/e2e/features/compare/compare-mobile-test.spec.js
index ebd8e92ad..698bf2ea7 100644
--- a/e2e/features/compare/compare-mobile-test.spec.js
+++ b/e2e/features/compare/compare-mobile-test.spec.js
@@ -23,8 +23,8 @@ test.afterAll(async () => {
test('Mobile comparison A|B toggle buttons are visible and only A is selected by default', async () => {
await page.goto(swipeAndAIsActive)
await closeModal(page)
- const aMobileCompareButton = page.locator('.comparison-mobile-select-toggle > div:nth-child(1)')
- const bMobileCompareButton = page.locator('.comparison-mobile-select-toggle > div:nth-child(2)')
+ const aMobileCompareButton = page.locator('#compare-toggle-selected-A')
+ const bMobileCompareButton = page.locator('#compare-toggle-selected-B')
await expect(aMobileCompareButton).toHaveClass(/compare-btn-selected/)
await expect(bMobileCompareButton).not.toHaveClass(/compare-btn-selected/)
})
@@ -32,7 +32,7 @@ test('Mobile comparison A|B toggle buttons are visible and only A is selected by
// toggle select B change compare mode date to B
test('Toggling to B compare side changes mobile date picker date', async () => {
const { mobileDatePickerSelectButton } = selectors
- const bMobileCompareButton = page.locator('.comparison-mobile-select-toggle > div:nth-child(2)')
+ const bMobileCompareButton = page.locator('#compare-toggle-selected-B')
// confirm initial A mobile date picker date
await expect(mobileDatePickerSelectButton).toHaveText('2018 AUG 17')
// click B compare toggle button and confirm B mobile date picker date
@@ -63,8 +63,8 @@ test('Expand mobile layer list and confirm comparison mode button is present and
// B compare button toggle is selected on B permalink load and A is not selected
test('B compare button toggle is only selected on B permalink load', async () => {
await page.goto(spyAndBIsActive)
- const aMobileCompareButton = page.locator('.comparison-mobile-select-toggle > div:nth-child(1)')
- const bMobileCompareButton = page.locator('.comparison-mobile-select-toggle > div:nth-child(2)')
+ const aMobileCompareButton = page.locator('#compare-toggle-selected-A')
+ const bMobileCompareButton = page.locator('#compare-toggle-selected-B')
await expect(aMobileCompareButton).not.toHaveClass(/compare-btn-selected/)
await expect(bMobileCompareButton).toHaveClass(/compare-btn-selected/)
})
diff --git a/e2e/features/timeline/timeline-test.spec.js b/e2e/features/timeline/timeline-test.spec.js
index 872ee6cce..8647081c9 100644
--- a/e2e/features/timeline/timeline-test.spec.js
+++ b/e2e/features/timeline/timeline-test.spec.js
@@ -51,7 +51,7 @@ test('Interval defaults to 1 DAY', async () => {
})
test('Change to month zoom level and axis changes', async () => {
- await page.locator('.zoom-level-change div.date-arrows.date-arrow-up').click()
+ await page.locator('.zoom-level-change button.date-arrows.date-arrow-up').click()
const axisGridDay = await page.locator('.axis-grid-text-day').first()
const axisGridMonth = await page.locator('.axis-grid-text-month').first()
const currentZoom = await page.locator('#current-zoom')
@@ -61,8 +61,8 @@ test('Change to month zoom level and axis changes', async () => {
})
test('Change to year zoom level and axis changes', async () => {
- await page.locator('.zoom-level-change div.date-arrows.date-arrow-up').click()
- await page.locator('.zoom-level-change div.date-arrows.date-arrow-up').click()
+ await page.locator('.zoom-level-change button.date-arrows.date-arrow-up').click()
+ await page.locator('.zoom-level-change button.date-arrows.date-arrow-up').click()
const axisGridDay = await page.locator('.axis-grid-text-day').first()
const axisGridYear = await page.locator('.axis-grid-text-year').first()
const currentZoom = await page.locator('#current-zoom')
diff --git a/e2e/test-utils/global-variables/selectors.js b/e2e/test-utils/global-variables/selectors.js
index 659a20c44..8c56f25ab 100644
--- a/e2e/test-utils/global-variables/selectors.js
+++ b/e2e/test-utils/global-variables/selectors.js
@@ -15,8 +15,8 @@ module.exports = (page) => ({
animationButtonCase: page.locator('#timeline-header .animate-button'),
animationButton: page.locator('.animate-button'),
playButton: page.locator('#play-button'),
- animateYearUp: page.locator('.wv-date-range-selector > div > div:nth-child(2) > div > svg.uparrow'),
- animateYearDown: page.locator('.wv-date-range-selector > div > div > div:nth-child(3) > svg.downarrow'),
+ animateYearUp: page.locator('.wv-date-range-selector > div > div:nth-child(2) > button > svg.uparrow'),
+ animateYearDown: page.locator('.wv-date-range-selector > div > div > button:nth-child(3) > svg.downarrow'),
yearStartInput: page.locator('#year-animation-widget-start'),
monthStartInput: page.locator('#month-animation-widget-start'),
dayStartInput: page.locator('#day-animation-widget-start'),
@@ -112,12 +112,12 @@ module.exports = (page) => ({
dragger: page.locator('.timeline-dragger'),
draggerA: page.locator('.timeline-dragger.draggerA'),
draggerB: page.locator('.timeline-dragger.draggerB'),
- dayDown: page.locator('.input-wrapper-day > div.date-arrows.date-arrow-down'),
- dayUp: page.locator('.input-wrapper-day > div.date-arrows.date-arrow-up'),
- monthDown: page.locator('.input-wrapper-month > div.date-arrows.date-arrow-down'),
- monthUp: page.locator('.input-wrapper-month > div.date-arrows.date-arrow-up'),
- yearDown: page.locator('.input-wrapper-year > div.date-arrows.date-arrow-down'),
- yearUp: page.locator('.input-wrapper-year > div.date-arrows.date-arrow-up'),
+ dayDown: page.locator('.input-wrapper-day > button.date-arrows.date-arrow-down'),
+ dayUp: page.locator('.input-wrapper-day > button.date-arrows.date-arrow-up'),
+ monthDown: page.locator('.input-wrapper-month > button.date-arrows.date-arrow-down'),
+ monthUp: page.locator('.input-wrapper-month > button.date-arrows.date-arrow-up'),
+ yearDown: page.locator('.input-wrapper-year > button.date-arrows.date-arrow-down'),
+ yearUp: page.locator('.input-wrapper-year > button.date-arrows.date-arrow-up'),
datePickerWheel: page.locator('.datepicker-modal .datepicker-wheel'),
dateSelectorDayInput: page.locator('#date-selector-main .input-wrapper-day input'),
dateSelectorMonthInput: page.locator('#date-selector-main .input-wrapper-month input'),
diff --git a/web/.eslintrc b/web/.eslintrc
index f28cdc85e..4dff861b7 100644
--- a/web/.eslintrc
+++ b/web/.eslintrc
@@ -100,7 +100,6 @@
"import/no-cycle": "warn",
// Accesibility rules overrides
"jsx-a11y/no-static-element-interactions": "off", // 71 errors across 39 files
- "jsx-a11y/click-events-have-key-events": "off", // 70 errors across 39 files
// React rules overrides
"react/jsx-props-no-spreading": "warn", // 6 errors across 2 files
"react/jsx-filename-extension": "off", // 206 errors across 206 files
diff --git a/web/js/components/compare/mobile-toggle.js b/web/js/components/compare/mobile-toggle.js
index ae2e206c2..c4407eaca 100644
--- a/web/js/components/compare/mobile-toggle.js
+++ b/web/js/components/compare/mobile-toggle.js
@@ -10,39 +10,50 @@ function MobileComparisonToggle (props) {
toggleActiveCompareState,
} = props;
- const [isCompareASelected, toggleCompareASelected] = useState(isCompareA);
+ const [isCompareASelected, setCompareASelected] = useState(isCompareA);
useEffect(() => {
if (isCompareASelected !== isCompareA) {
- toggleCompareASelected(isCompareA);
+ setCompareASelected(isCompareA);
}
}, [isCompareA]);
- useEffect(() => {
- if (isCompareASelected !== isCompareA) {
- toggleActiveCompareState();
- }
- }, [isCompareASelected]);
+
+ if (isCompareASelected !== isCompareA) {
+ toggleActiveCompareState();
+ }
if (!active) {
return null;
}
+ const handleClick = (evt) => {
+ if (evt.target.id === 'compare-toggle-selected-A') {
+ setCompareASelected(true);
+ } else {
+ setCompareASelected(false);
+ }
+ };
+
const classA = isCompareASelected ? 'compare-btn-selected' : '';
const classB = !isCompareASelected ? 'compare-btn-selected' : '';
return (
<div className="comparison-mobile-select-toggle">
- <div
+ <button
+ type="button"
+ id="compare-toggle-selected-A"
className={`compare-toggle-selected-btn ${classA}`}
- onClick={() => toggleCompareASelected(true)}
+ onClick={handleClick}
>
A
- </div>
- <div
+ </button>
+ <button
+ type="button"
+ id="compare-toggle-selected-B"
className={`compare-toggle-selected-btn ${classB}`}
- onClick={() => toggleCompareASelected(false)}
+ onClick={handleClick}
>
B
- </div>
+ </button>
</div>
);
}
diff --git a/web/js/components/image-download/lat-long-inputs.js b/web/js/components/image-download/lat-long-inputs.js
index 9779675c7..fcd9daae1 100644
--- a/web/js/components/image-download/lat-long-inputs.js
+++ b/web/js/components/image-download/lat-long-inputs.js
@@ -98,7 +98,11 @@ function LatLongSelect(props) {
return (
<div className="wv-image-input-case">
- <div className="wv-image-input-title" onClick={() => { setShowCoordinates(!showCoordinates); }}>
+ <button
+ type="button"
+ className="wv-image-input-title"
+ onClick={() => { setShowCoordinates(!showCoordinates); }}
+ >
<span>{coordText}</span>
<span
title="Hide coordinates"
@@ -106,7 +110,7 @@ function LatLongSelect(props) {
>
<FontAwesomeIcon icon="caret-right" size="lg" rotation={showCoordinates ? 90 : 0} />
</span>
- </div>
+ </button>
{showCoordinates && (
<>
<div className="row">
diff --git a/web/js/components/layer/info/date-ranges.js b/web/js/components/layer/info/date-ranges.js
index b5bbd55b3..90bc08191 100644
--- a/web/js/components/layer/info/date-ranges.js
+++ b/web/js/components/layer/info/date-ranges.js
@@ -67,7 +67,7 @@ export default function DateRanges ({ layer }) {
>
<button
type="button"
- style={{ background: 'none', border: 'none', color: 'white' }}
+ style={{ background: 'none', border: 'none', color: 'inherit' }}
onClick={() => {
getDateRanges();
setShowRanges(!showRanges);
diff --git a/web/js/components/layer/product-picker/browse/category-layer-row.js b/web/js/components/layer/product-picker/browse/category-layer-row.js
index 591e5a2eb..8bd3a6f71 100644
--- a/web/js/components/layer/product-picker/browse/category-layer-row.js
+++ b/web/js/components/layer/product-picker/browse/category-layer-row.js
@@ -210,7 +210,8 @@ class CategoryLayerRow extends React.Component {
id={`accordion-${category.id}-${measurement.id}`}
key={`${category.id}-${measurement.id}`}
>
- <div
+ <button
+ type="button"
onClick={() => selectMeasurement(id)}
className="measurement-row-header"
>
@@ -219,7 +220,7 @@ class CategoryLayerRow extends React.Component {
{isSelected
? <FontAwesomeIcon icon="chevron-circle-down" className="arrow-icon" />
: <FontAwesomeIcon icon="chevron-circle-right" className="arrow-icon" />}
- </div>
+ </button>
{isSelected ? this.renderContent() : ''}
</div>
);
diff --git a/web/js/components/layer/product-picker/browse/measurement-metadata-detail.js b/web/js/components/layer/product-picker/browse/measurement-metadata-detail.js
index 9d1c3e8db..db88e2491 100644
--- a/web/js/components/layer/product-picker/browse/measurement-metadata-detail.js
+++ b/web/js/components/layer/product-picker/browse/measurement-metadata-detail.js
@@ -87,14 +87,15 @@ function MeasurementMetadataDetail (props) {
{renderMetadataForLayers()}
</div>
{doesMetaDataNeedExpander && (
- <div
+ <button
+ type="button"
className="metadata-more"
onClick={() => setMetadataExpansion(!isMetadataExpanded)}
>
<span className={isMetadataExpanded ? 'ellipsis up' : 'ellipsis'}>
{isMetadataExpanded ? '^' : '...'}
</span>
- </div>
+ </button>
)}
</div>
);
diff --git a/web/js/components/layer/product-picker/search/filter-chips.js b/web/js/components/layer/product-picker/search/filter-chips.js
index 33b716558..06f9f3670 100644
--- a/web/js/components/layer/product-picker/search/filter-chips.js
+++ b/web/js/components/layer/product-picker/search/filter-chips.js
@@ -23,7 +23,8 @@ export default function FilterChips(props) {
{filterValues.map(({
field, displayValue, value,
}) => (
- <div
+ <button
+ type="button"
key={field + value}
className="filter-chip"
onClick={() => removeFilter(field, value)}
@@ -33,7 +34,7 @@ export default function FilterChips(props) {
icon="times"
fixedWidth
/>
- </div>
+ </button>
))}
</div>
);
diff --git a/web/js/components/layer/product-picker/search/search-layer-row.js b/web/js/components/layer/product-picker/search/search-layer-row.js
index e3cf77e96..08834e5c9 100644
--- a/web/js/components/layer/product-picker/search/search-layer-row.js
+++ b/web/js/components/layer/product-picker/search/search-layer-row.js
@@ -162,7 +162,7 @@ class SearchLayerRow extends React.Component {
</UncontrolledTooltip>
</div>
)}
- <div className={headerClassName} onClick={this.onRowClick}>
+ <button type="button" className={headerClassName} onClick={this.onRowClick}>
<RenderSplitLayerTitle layer={layer} />
{recentLayerMode && showDeleteIcon && (
<Button
@@ -174,7 +174,7 @@ class SearchLayerRow extends React.Component {
<FontAwesomeIcon icon="trash" />
</Button>
)}
- </div>
+ </button>
</div>
);
}
diff --git a/web/js/components/location-search/coordinates-dialog.js b/web/js/components/location-search/coordinates-dialog.js
index 7706b5714..2639c2968 100644
--- a/web/js/components/location-search/coordinates-dialog.js
+++ b/web/js/components/location-search/coordinates-dialog.js
@@ -152,7 +152,8 @@ class CoordinatesDialog extends Component {
const tooltipVisibilityCondition = !isMobile && !isCopyToClipboardTooltipVisible && showTooltips;
return (
- <div
+ <button
+ type="button"
id={buttonId}
className={buttonId}
onClick={() => this.copyToClipboard(formattedCoordinates)}
@@ -169,7 +170,7 @@ class CoordinatesDialog extends Component {
</UncontrolledTooltip>
)}
<FontAwesomeIcon icon="copy" fixedWidth />
- </div>
+ </button>
);
};
diff --git a/web/js/components/map/__snapshots__/coordinates.test.js.snap b/web/js/components/map/__snapshots__/coordinates.test.js.snap
index d33df11cc..b7cb7e732 100644
--- a/web/js/components/map/__snapshots__/coordinates.test.js.snap
+++ b/web/js/components/map/__snapshots__/coordinates.test.js.snap
@@ -1,7 +1,7 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`formats coordinate in latlon-dd format 1`] = `"<div id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">0.0000°, 0.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></div>"`;
+exports[`formats coordinate in latlon-dd format 1`] = `"<button type="button" id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">0.0000°, 0.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></button>"`;
-exports[`formats coordinate in latlon-dm format 1`] = `"<div id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord"> 0°00.000'N, 0°00.000'E</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></div>"`;
+exports[`formats coordinate in latlon-dm format 1`] = `"<button type="button" id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord"> 0°00.000'N, 0°00.000'E</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></button>"`;
-exports[`formats coordinate in latlon-dms format 1`] = `"<div id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord"> 0°00'00"N, 0°00'00"E</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></div>"`;
+exports[`formats coordinate in latlon-dms format 1`] = `"<button type="button" id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord"> 0°00'00"N, 0°00'00"E</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></button>"`;
diff --git a/web/js/components/map/__snapshots__/ol-coordinates.test.js.snap b/web/js/components/map/__snapshots__/ol-coordinates.test.js.snap
index 60ad40681..9c1d54cf1 100644
--- a/web/js/components/map/__snapshots__/ol-coordinates.test.js.snap
+++ b/web/js/components/map/__snapshots__/ol-coordinates.test.js.snap
@@ -2,10 +2,10 @@
exports[`clears coordinates when mouse moves off the map 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"></div>"`;
-exports[`reprojects (0,0) to (-45, 90) for EPSG:3413 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><div id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">90.0000°, -45.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:3413</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></div></div>"`;
+exports[`reprojects (0,0) to (-45, 90) for EPSG:3413 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><button type="button" id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">90.0000°, -45.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:3413</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></button></div>"`;
-exports[`shows 20°00.000'N, 10°00.000'E when set to degrees and minutes format 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><div id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">20.0000°, 10.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></div></div>"`;
+exports[`shows 20°00.000'N, 10°00.000'E when set to degrees and minutes format 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><button type="button" id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">20.0000°, 10.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></button></div>"`;
-exports[`shows coordinates of (-160, 20) when moving the mouse over wrapped 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><div id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">20.0000°, -160.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></div></div>"`;
+exports[`shows coordinates of (-160, 20) when moving the mouse over wrapped 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><button type="button" id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">20.0000°, -160.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></button></div>"`;
-exports[`shows coordinates of (10, 20) when moving the mouse 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><div id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">20.0000°, 10.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></div></div>"`;
+exports[`shows coordinates of (10, 20) when moving the mouse 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><button type="button" id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">20.0000°, 10.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></button></div>"`;
diff --git a/web/js/components/map/coordinates.js b/web/js/components/map/coordinates.js
index 2c9a37085..b33d98232 100644
--- a/web/js/components/map/coordinates.js
+++ b/web/js/components/map/coordinates.js
@@ -38,7 +38,8 @@ export default class Coordinates extends React.Component {
);
return (
- <div
+ <button
+ type="button"
id="coords-panel"
className="wv-coords-map wv-coords-map-btn"
onClick={this.changeFormat}
@@ -54,7 +55,7 @@ export default class Coordinates extends React.Component {
<i className="coord-switch" />
</div>
</div>
- </div>
+ </button>
);
}
}
diff --git a/web/js/components/measure-tool/measure-tooltip.js b/web/js/components/measure-tool/measure-tooltip.js
index d16dadc3f..8555c4bd5 100644
--- a/web/js/components/measure-tool/measure-tooltip.js
+++ b/web/js/components/measure-tool/measure-tooltip.js
@@ -125,9 +125,9 @@ export default function MeasureTooltip(props) {
<div className={`tooltip-measure tooltip-custom-black ${activeStaticClass}`}>
<span dangerouslySetInnerHTML={{ __html: tooltipValue }} />
{!active && (
- <span className="close-tooltip" onClick={onRemove} onTouchEnd={onRemove}>
+ <button type="button" className="close-tooltip" onClick={onRemove} onTouchEnd={onRemove}>
<FontAwesomeIcon icon="times" fixedWidth />
- </span>
+ </button>
)}
</div>
);
diff --git a/web/js/components/sidebar/event.js b/web/js/components/sidebar/event.js
index 70a15613b..43f5a1321 100644
--- a/web/js/components/sidebar/event.js
+++ b/web/js/components/sidebar/event.js
@@ -126,6 +126,7 @@ function Event (props) {
<span
className="active"
onClick={(e) => e.stopPropagation()}
+ onKeyDown={(e) => e.stopPropagation()}
>
{formatDisplayDate(date)}
</span>
diff --git a/web/js/components/sidebar/nav/nav-case.js b/web/js/components/sidebar/nav/nav-case.js
index d86df3f41..7df025297 100644
--- a/web/js/components/sidebar/nav/nav-case.js
+++ b/web/js/components/sidebar/nav/nav-case.js
@@ -98,7 +98,8 @@ function NavCase (props) {
{!isEventsTabDisabledEmbed && renderEvents()}
{renderDataDownload()}
- <div
+ <button
+ type="button"
id="toggleIconHolder"
className="sidebar-collapse"
onClick={toggleSidebar}
@@ -113,7 +114,7 @@ function NavCase (props) {
<UncontrolledTooltip id="center-align-tooltip" placement="right" target="toggleIconHolder">
Hide sidebar
</UncontrolledTooltip>
- </div>
+ </button>
</Nav>
);
}
diff --git a/web/js/components/smart-handoffs/granule-count.js b/web/js/components/smart-handoffs/granule-count.js
index 8cf75b8c4..84c233c9a 100644
--- a/web/js/components/smart-handoffs/granule-count.js
+++ b/web/js/components/smart-handoffs/granule-count.js
@@ -121,9 +121,9 @@ export default function GranuleCount (props) {
{ granulesExist && (
<span className="granule-size fade-in">{`(${sizeText})`}</span>
)}
- <span className="help-link" onClick={showGranuleHelpModal}>
+ <button type="button" className="help-link" onClick={showGranuleHelpModal}>
<FontAwesomeIcon icon="question-circle" />
- </span>
+ </button>
</>
);
};
diff --git a/web/js/components/smart-handoffs/smart-handoff-modal.js b/web/js/components/smart-handoffs/smart-handoff-modal.js
index ef0e4ee10..b8b69c693 100644
--- a/web/js/components/smart-handoffs/smart-handoff-modal.js
+++ b/web/js/components/smart-handoffs/smart-handoff-modal.js
@@ -95,9 +95,9 @@ function SmartHandoffModal({
</div>
)}
- <div className="toggle-more-info" onClick={() => toggleInfo(!showMoreInfo)}>
+ <button type="button" className="toggle-more-info" onClick={() => toggleInfo(!showMoreInfo)}>
<h2><span>{showMoreInfo ? 'Hide Info' : 'Show More Info'}</span></h2>
- </div>
+ </button>
<div className="smart-handoff-layer-info">
diff --git a/web/js/components/timeline/custom-interval-selector/interval-select.js b/web/js/components/timeline/custom-interval-selector/interval-select.js
index 965b1a5d7..e73c25366 100644
--- a/web/js/components/timeline/custom-interval-selector/interval-select.js
+++ b/web/js/components/timeline/custom-interval-selector/interval-select.js
@@ -48,30 +48,30 @@ function IntervalSelect(props) {
{TIME_SCALE_FROM_NUMBER[interval].toUpperCase()}
</DropdownToggle>
<DropdownMenu>
- <DropdownItem>
- <span onClick={() => handleChangeZoomLevelMobile('year')}>
+ <DropdownItem onClick={() => handleChangeZoomLevelMobile('year')}>
+ <span>
Year
</span>
</DropdownItem>
- <DropdownItem>
- <span onClick={() => handleChangeZoomLevelMobile('month')}>
+ <DropdownItem onClick={() => handleChangeZoomLevelMobile('month')}>
+ <span>
Month
</span>
</DropdownItem>
- <DropdownItem>
- <span onClick={() => handleChangeZoomLevelMobile('day')}>
+ <DropdownItem onClick={() => handleChangeZoomLevelMobile('day')}>
+ <span>
Day
</span>
</DropdownItem>
{hasSubdailyLayers ? (
<>
- <DropdownItem>
- <span onClick={() => handleChangeZoomLevelMobile('hour')}>
+ <DropdownItem onClick={() => handleChangeZoomLevelMobile('hour')}>
+ <span>
Hour
</span>
</DropdownItem>
- <DropdownItem>
- <span onClick={() => handleChangeZoomLevelMobile('minute')}>
+ <DropdownItem onClick={() => handleChangeZoomLevelMobile('minute')}>
+ <span>
Minute
</span>
</DropdownItem>
diff --git a/web/js/components/timeline/mobile-date-picker.js b/web/js/components/timeline/mobile-date-picker.js
index b7e6127d1..7f2aaffa1 100644
--- a/web/js/components/timeline/mobile-date-picker.js
+++ b/web/js/components/timeline/mobile-date-picker.js
@@ -125,14 +125,15 @@ function MobileDatePicker(props) {
return (
time && (
<>
- <div
+ <button
+ type="button"
className="mobile-date-picker-select-btn"
onClick={handleClickDateButton}
>
<div className="mobile-date-picker-select-btn-text">
<span>{displayDate}</span>
</div>
- </div>
+ </button>
<DatePicker
dateConfig={hasSubdailyLayers ? subDailyDateConfig : defaultDateConfig}
showCaption
diff --git a/web/js/components/timeline/timeline-controls/animation-button.js b/web/js/components/timeline/timeline-controls/animation-button.js
index a68615064..bb8af67c1 100644
--- a/web/js/components/timeline/timeline-controls/animation-button.js
+++ b/web/js/components/timeline/timeline-controls/animation-button.js
@@ -41,11 +41,20 @@ function AnimationButton(props) {
};
const buttonClass = getButtonClassName();
+ let className = `button-action-group mobile-animate-button animate-button-${buttonClass}`;
+ if (isKioskModeActive) {
+ className = 'd-none';
+ } else if (disabled) {
+ className = 'wv-disabled-button button-action-group animate-button';
+ } else if (!isMobile && !isEmbedModeActive) {
+ className = 'button-action-group animate-button';
+ }
return (
- <div
+ <button
+ type="button"
onClick={clickAnimationButton}
- className={isKioskModeActive ? 'd-none' : disabled ? 'wv-disabled-button button-action-group animate-button' : !isMobile && !isEmbedModeActive ? 'button-action-group animate-button' : `button-action-group mobile-animate-button animate-button-${buttonClass}`}
+ className={className}
aria-label={labelText}
>
<div id={buttonId}>
@@ -61,7 +70,7 @@ function AnimationButton(props) {
)}
<FontAwesomeIcon icon="video" className="wv-animate" size="2x" />
</div>
- </div>
+ </button>
);
}
diff --git a/web/js/components/timeline/timeline-controls/axis-timescale-change-tooltip.js b/web/js/components/timeline/timeline-controls/axis-timescale-change-tooltip.js
index a68870dcc..315d12c10 100644
--- a/web/js/components/timeline/timeline-controls/axis-timescale-change-tooltip.js
+++ b/web/js/components/timeline/timeline-controls/axis-timescale-change-tooltip.js
@@ -61,43 +61,48 @@ class AxisTimeScaleChangeTooltip extends PureComponent {
>
TIMESCALE
</p>
- <span
+ <button
+ type="button"
id="zoom-years"
className="zoom-btn zoom-years"
onClick={this.changeTimeScaleYear}
>
YEAR
- </span>
- <span
+ </button>
+ <button
+ type="button"
id="zoom-months"
className="zoom-btn zoom-months"
onClick={this.changeTimeScaleMonth}
>
MONTH
- </span>
- <span
+ </button>
+ <button
+ type="button"
id="zoom-days"
className="zoom-btn zoom-days"
onClick={this.changeTimeScaleDay}
>
DAY
- </span>
+ </button>
{hasSubdailyLayers ? (
<>
- <span
+ <button
+ type="button"
id="zoom-hours"
className="zoom-btn zoom-hours"
onClick={this.changeTimeScaleHour}
>
HOUR
- </span>
- <span
+ </button>
+ <button
+ type="button"
id="zoom-minutes"
className="zoom-btn zoom-minutes"
onClick={this.changeTimeScaleMinute}
>
MINUTE
- </span>
+ </button>
</>
) : null}
</div>
diff --git a/web/js/components/timeline/timeline-controls/axis-timescale-change.js b/web/js/components/timeline/timeline-controls/axis-timescale-change.js
index 59ae27443..2f74b47ef 100644
--- a/web/js/components/timeline/timeline-controls/axis-timescale-change.js
+++ b/web/js/components/timeline/timeline-controls/axis-timescale-change.js
@@ -95,6 +95,7 @@ class AxisTimeScaleChange extends PureComponent {
{ timeScale
? (
<div
+ style={{ display: 'inline-block' }}
onMouseEnter={this.toolTipHoverOn}
onMouseLeave={this.toolTipHoverOff}
>
diff --git a/web/js/components/timeline/timeline-controls/date-change-arrows.js b/web/js/components/timeline/timeline-controls/date-change-arrows.js
index 722ab7870..f67d1833e 100644
--- a/web/js/components/timeline/timeline-controls/date-change-arrows.js
+++ b/web/js/components/timeline/timeline-controls/date-change-arrows.js
@@ -94,7 +94,8 @@ class DateChangeArrows extends PureComponent {
)}
{/* LEFT ARROW */}
- <div
+ <button
+ type="button"
className={`button-action-group${leftArrowDisabled ? ' button-disabled' : ''} ${isKioskModeActive && !isEmbedModeActive ? 'd-none' : ''}`}
id="left-arrow-group"
onMouseDown={leftArrowDown}
@@ -109,10 +110,11 @@ class DateChangeArrows extends PureComponent {
target="left-arrow-group"
/>
<ArrowChevronLeft class="arrow" size="30px" />
- </div>
+ </button>
{/* RIGHT ARROW */}
- <div
+ <button
+ type="button"
className={`button-action-group${rightArrowDisabled ? ' button-disabled' : ''} ${isKioskModeActive && !isEmbedModeActive ? 'd-none' : ''}`}
id="right-arrow-group"
onMouseDown={rightArrowDown}
@@ -127,10 +129,11 @@ class DateChangeArrows extends PureComponent {
target="right-arrow-group"
/>
<ArrowChevronRight class="arrow" size="30px" />
- </div>
+ </button>
{/* NOW BUTTON */}
- <div
+ <button
+ type="button"
className={`button-action-group now-button-group${nowButtonDisabled ? ' button-disabled' : ''} ${isKioskModeActive ? 'd-none' : ''}`}
id="now-button-group"
onClick={handleSelectNowButton}
@@ -148,7 +151,7 @@ class DateChangeArrows extends PureComponent {
className="arrow"
/>
</svg>
- </div>
+ </button>
</div>
);
}
diff --git a/web/js/components/timeline/timeline-controls/timescale-interval-change.js b/web/js/components/timeline/timeline-controls/timescale-interval-change.js
index f2f2505d6..e08dcfec5 100644
--- a/web/js/components/timeline/timeline-controls/timescale-interval-change.js
+++ b/web/js/components/timeline/timeline-controls/timescale-interval-change.js
@@ -131,60 +131,67 @@ class TimeScaleIntervalChange extends PureComponent {
style={{ display: toolTipHovered ? 'block' : 'none' }}
>
<div id="timeline-interval" className="timeline-interval">
- <span
+ <button
+ type="button"
id="interval-years"
className="interval-btn interval-years"
onClick={() => this.handleClickInterval('year')}
>
Year
- </span>
- <span
+ </button>
+ <button
+ type="button"
id="interval-months"
className="interval-btn interval-months"
onClick={() => this.handleClickInterval('month')}
>
Month
- </span>
- <span
+ </button>
+ <button
+ type="button"
id="interval-days"
className="interval-btn interval-days"
onClick={() => this.handleClickInterval('day')}
>
Day
- </span>
+ </button>
{hasSubdailyLayers ? (
<>
- <span
+ <button
+ type="button"
id="interval-hours"
className="interval-btn interval-hours"
onClick={() => this.handleClickInterval('hour')}
>
Hour
- </span>
- <span
+ </button>
+ <button
+ type="button"
id="interval-minutes"
className="interval-btn interval-minutes"
onClick={() => this.handleClickInterval('minute')}
>
Minute
- </span>
+ </button>
</>
) : null}
- <span
+ <button
+ type="button"
id="interval-custom"
className="interval-btn interval-custom custom-interval-text"
style={{ display: customIntervalText === 'Custom' ? 'none' : 'block' }}
onClick={() => this.handleClickInterval('custom')}
>
{customIntervalText}
- </span>
- <span
+ </button>
+ <button
+ type="button"
id="interval-custom-static"
className="interval-btn interval-custom custom-interval-text"
onClick={() => this.handleClickInterval('custom', true)}
>
Custom
- </span>
+ </button>
</div>
</div>
);
@@ -200,26 +207,25 @@ class TimeScaleIntervalChange extends PureComponent {
isDisabled,
} = this.props;
- const className = `no-drag interval-btn interval-btn-active${customSelected ? ' custom-interval-text' : ''} ${isDisabled ? ' disabled' : ''}`;
+ const className = `no-drag interval-list-btn interval-btn-active${customSelected ? ' custom-interval-text' : ''} ${isDisabled ? ' disabled' : ''}`;
return (
- <div
+ <button
+ type="button"
id="timeline-interval-btn-container"
className="interval-btn-container noselect no-drag"
onMouseEnter={() => this.setTooltipState(true)}
onMouseLeave={() => this.setTooltipState(false)}
onClick={this.onClick}
>
-
<span
id="current-interval"
className={className}
>
{customSelected ? customIntervalText : `${1} ${TIME_SCALE_FROM_NUMBER[interval]}`}
</span>
-
{!isDisabled ? this.renderTooltip() : null}
- </div>
+ </button>
);
}
}
diff --git a/web/js/components/timeline/timeline-coverage/timeline-coverage.js b/web/js/components/timeline/timeline-coverage/timeline-coverage.js
index f6450fff3..06b648176 100644
--- a/web/js/components/timeline/timeline-coverage/timeline-coverage.js
+++ b/web/js/components/timeline/timeline-coverage/timeline-coverage.js
@@ -410,7 +410,8 @@ class TimelineLayerCoveragePanel extends Component {
return (
<>
{/* Timeline Layer Coverage Panel open/close handle */}
- <div
+ <button
+ type="button"
id="timeline-layer-coverage-panel-handle"
aria-label={panelToggleLabelText}
onClick={this.togglePanelOpenClose}
@@ -420,7 +421,7 @@ class TimelineLayerCoveragePanel extends Component {
{panelToggleLabelText}
</UncontrolledTooltip>
<div className={`timeline-layer-coverage-panel-handle-chevron ${panelChevronClassName}`} />
- </div>
+ </button>
<div
className={`timeline-layer-coverage-container ${isPanelOpenClassName}`}
style={panelContainerStyle}
diff --git a/web/js/components/util/alert.js b/web/js/components/util/alert.js
index a27345f85..2ee3197da 100644
--- a/web/js/components/util/alert.js
+++ b/web/js/components/util/alert.js
@@ -60,7 +60,8 @@ export default class AlertUtil extends React.Component {
className="wv-alert"
isOpen={isOpen}
>
- <div
+ <button
+ type="button"
className="alert-content"
title={title}
onClick={onClick}
@@ -79,15 +80,16 @@ export default class AlertUtil extends React.Component {
<b>{message}</b>
</em>
</div>
- </div>
+ </button>
{onDismiss && (
- <div
+ <button
+ type="button"
id={`${id}-close`}
className="close-alert"
onClick={() => this.closeAlert()}
>
<FontAwesomeIcon icon="times" className="exit" size="1x" />
- </div>
+ </button>
)}
</Alert>
);
diff --git a/web/js/components/util/arrow.js b/web/js/components/util/arrow.js
index ede6bac07..350f3cae3 100644
--- a/web/js/components/util/arrow.js
+++ b/web/js/components/util/arrow.js
@@ -12,13 +12,14 @@ function Arrow({
const arrowClassName = `${direction}arrow`;
return (
- <div
+ <button
+ type="button"
onClick={onClick}
className={isKioskModeActive ? 'd-none' : containerClassName}
data-interval={type}
>
<ArrowFilledUp className={arrowClassName} size={arrowSize} />
- </div>
+ </button>
);
}
diff --git a/web/js/components/util/switch.js b/web/js/components/util/switch.js
index d639c3cd5..2f2af21c7 100644
--- a/web/js/components/util/switch.js
+++ b/web/js/components/util/switch.js
@@ -67,6 +67,7 @@ function Switch(props) {
<span
className="switch-label-text"
onClick={toggleSwitch}
+ onKeyDown={onKeyDown}
>
{label}
</span>
diff --git a/web/js/containers/alertDropdown.js b/web/js/containers/alertDropdown.js
index 1afce2c51..1afef2e66 100644
--- a/web/js/containers/alertDropdown.js
+++ b/web/js/containers/alertDropdown.js
@@ -15,7 +15,7 @@ export default function AlertDropdown(isTourActive) {
return (
<div className="wv-alert-dropdown" hidden={isDistractionFreeModeActive || tourActive || isMobile}>
- <button type="button" hidden={notifications <= 1} onClick={toggle}>
+ <button type="button" className="multiple-alerts-btn" hidden={notifications <= 1} onClick={toggle}>
<FontAwesomeIcon
icon="exclamation-triangle"
className="wv-alert-icon"
diff --git a/web/js/containers/animation-widget/mobile-animation-widget.js b/web/js/containers/animation-widget/mobile-animation-widget.js
index 337ef896d..eea89631d 100644
--- a/web/js/containers/animation-widget/mobile-animation-widget.js
+++ b/web/js/containers/animation-widget/mobile-animation-widget.js
@@ -81,16 +81,23 @@ function MobileAnimationWidget (props) {
onUpdateEndDate(dateObj);
};
+ const buttonStyle = {
+ background: 'none',
+ border: 'none',
+ };
+
return (
<div className="wv-animation-widget-wrapper-mobile" id={`mobile-animation-widget-${mobileID}`}>
<div className="mobile-animation-header" style={{ justifyContent: isEmbedModeActive ? 'flex-start' : 'flex-end' }}>
- <span
+ <button
+ type="button"
+ style={buttonStyle}
aria-label="Close"
onClick={toggleCollapse}
id="mobile-animation-close"
>
<FontAwesomeIcon icon="times" className="collapse-icon" style={collapseIconMobile} />
- </span>
+ </button>
</div>
<div className="mobile-animation-warning-message-container">
<span id={playDisabled ? 'mobile-animation-warning-message' : ''}>Too many animation frames. Reduce time range or increase increment size.</span>
diff --git a/web/js/containers/embed.js b/web/js/containers/embed.js
index 220a42468..5caa14789 100644
--- a/web/js/containers/embed.js
+++ b/web/js/containers/embed.js
@@ -56,7 +56,7 @@ function Embed ({ isEmbedModeActive, selectedDate, isMobile }) {
>
{showClickToInteractMessage && (
<>
- <div onClick={handleOverlayClick} className="embed-overlay-bg" />
+ <button type="button" onClick={handleOverlayClick} className="embed-overlay-bg" aria-label="click to interact" />
<div className="embed-overlay-btn">
<FontAwesomeIcon icon="hand-pointer" size="2x" fixedWidth />
<p>Click anywhere to interact</p>
diff --git a/web/js/containers/sidebar/layer-row.js b/web/js/containers/sidebar/layer-row.js
index a1e4ba9c3..7946412d6 100644
--- a/web/js/containers/sidebar/layer-row.js
+++ b/web/js/containers/sidebar/layer-row.js
@@ -403,7 +403,8 @@ function LayerRow (props) {
: 'Zoom in further to click features.';
const layerVectorBtnId = `layer-vector-hand-btn-${encodedLayerId}`;
return (
- <div
+ <button
+ type="button"
id={layerVectorBtnId}
aria-label={title}
className={runningDataObj ? `${classNames} running` : classNames}
@@ -414,7 +415,7 @@ function LayerRow (props) {
{title}
</UncontrolledTooltip>
<FontAwesomeIcon icon="hand-pointer" fixedWidth />
- </div>
+ </button>
);
};
diff --git a/web/js/containers/timeline/timeline.js b/web/js/containers/timeline/timeline.js
index 19769b82a..43c9699b0 100644
--- a/web/js/containers/timeline/timeline.js
+++ b/web/js/containers/timeline/timeline.js
@@ -1254,13 +1254,13 @@ class Timeline extends React.Component {
/>
</div>
<div id="zoom-buttons-group" className={isKioskModeActive ? 'd-none' : ''}>
-
- <TimeScaleIntervalChange
- timeScaleChangeUnit={timeScaleChangeUnit}
- hasSubdailyLayers={hasSubdailyLayers}
- modalType={customModalType.TIMELINE}
- />
-
+ <div style={{ width: '90px', display: 'block' }}>
+ <TimeScaleIntervalChange
+ timeScaleChangeUnit={timeScaleChangeUnit}
+ hasSubdailyLayers={hasSubdailyLayers}
+ modalType={customModalType.TIMELINE}
+ />
+ </div>
{this.renderDateChangeArrows()}
</div>
<AnimationButton
@@ -1445,7 +1445,8 @@ class Timeline extends React.Component {
/>
{/* Open/Close Chevron */}
- <div
+ <button
+ type="button"
id="timeline-hide"
aria-label={isTimelineHidden ? 'Show timeline' : 'Hide timeline'}
onClick={this.toggleHideTimeline}
@@ -1456,7 +1457,7 @@ class Timeline extends React.Component {
<div
className={`wv-timeline-hide wv-timeline-hide-double-chevron-${chevronDirection}`}
/>
- </div>
+ </button>
</section>
)}
</ErrorBoundary>
diff --git a/web/scss/components/alert.scss b/web/scss/components/alert.scss
index adce34fcd..3197d8bc0 100644
--- a/web/scss/components/alert.scss
+++ b/web/scss/components/alert.scss
@@ -8,11 +8,27 @@
width: 450px;
background: #282828;
+ .multiple-alerts-btn {
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ position: relative;
+ color: #fff;
+ background: #282828;
+ border: #282828;
+ border-radius: 0;
+ min-height: 40px;
+ padding: 0;
+ z-index: 100;
+ padding-left: 1rem;
+ padding-right: 1rem;
+ }
button {
width: 100%;
display: flex;
- justify-content: space-between;
+ justify-content: flex-start;
align-items: center;
position: relative;
color: #fff;
@@ -20,13 +36,15 @@
border: #282828;
border-radius: 0;
min-height: 40px;
- cursor: pointer;
padding: 0;
z-index: 100;
- margin-bottom: 5px;
padding-left: 1rem;
padding-right: 1rem;
}
+
+ .close-alert {
+ width: unset;
+ }
}
.wv-alert-container {
@@ -47,7 +65,7 @@
cursor: pointer;
padding: 0;
z-index: 100;
- margin-bottom: 5px;
+ margin-bottom: 0;
}
.alert-content {
@@ -77,7 +95,7 @@
text-align: center;
}
-.wv-alert div:hover {
+.wv-alert button:hover {
background-color: #ddd;
color: #333;
}
diff --git a/web/scss/components/dateselector.scss b/web/scss/components/dateselector.scss
index 26386def8..ae2db0bd2 100644
--- a/web/scss/components/dateselector.scss
+++ b/web/scss/components/dateselector.scss
@@ -113,6 +113,9 @@
.date-arrows {
display: block;
height: 10px;
+ background: none;
+ border: none;
+ width: 100%;
}
.zoom-level-change-arrows .date-arrows {
@@ -120,6 +123,9 @@
margin-top: -5px;
padding-bottom: 20px;
margin-bottom: 5px;
+ background: none;
+ border: none;
+ width: 100%;
}
.wv-date-selector-widget .date-arrows svg,
diff --git a/web/scss/components/facets.scss b/web/scss/components/facets.scss
index 3ec486ef4..80a0b2fe2 100644
--- a/web/scss/components/facets.scss
+++ b/web/scss/components/facets.scss
@@ -20,6 +20,7 @@
position: relative;
display: inline-block;
cursor: pointer;
+ border: none;
span {
font-weight: 500;
diff --git a/web/scss/components/image.scss b/web/scss/components/image.scss
index 3d4cb3b1c..22119ab9d 100644
--- a/web/scss/components/image.scss
+++ b/web/scss/components/image.scss
@@ -120,6 +120,11 @@
padding: 5px 0;
font-weight: 600;
cursor: pointer;
+ width: 100%;
+ background: none;
+ border: none;
+ color: white;
+ text-align: left;
&:hover {
font-weight: 900;
diff --git a/web/scss/components/tooltip.scss b/web/scss/components/tooltip.scss
index bd95119c4..42d74c327 100644
--- a/web/scss/components/tooltip.scss
+++ b/web/scss/components/tooltip.scss
@@ -158,6 +158,13 @@
bottom: 0;
height: 20px;
width: 23px;
+ background: none;
+ border: none;
+ padding: 0;
+
+ & svg {
+ height: 13px;
+ }
}
}
@@ -176,9 +183,13 @@
.close-tooltip,
.minimize-tooltip {
- padding-left: 6px;
+ padding: 0 0 0 6px;
margin-left: 8px;
border-left: 1px solid #777;
+ border-top: none;
+ border-right: none;
+ border-bottom: none;
+ background: none;
&.close-coordinates-tooltip,
&.minimize-coordinates-tooltip {
diff --git a/web/scss/features/anim-widget.scss b/web/scss/features/anim-widget.scss
index 8020280d9..d49732a7c 100644
--- a/web/scss/features/anim-widget.scss
+++ b/web/scss/features/anim-widget.scss
@@ -145,6 +145,9 @@
& .interval-btn.interval-btn-active {
color: #ce4c21;
display: inline;
+ background: none;
+ border: none;
+ padding: 0;
&.disabled {
color: #fff;
diff --git a/web/scss/features/compare.scss b/web/scss/features/compare.scss
index ab272f8e7..458c2187f 100644
--- a/web/scss/features/compare.scss
+++ b/web/scss/features/compare.scss
@@ -208,6 +208,7 @@
padding: 13.5px;
color: #fff;
border: thin solid transparent;
+ background-color: transparent;
&:first-child {
border-bottom-left-radius: 5px;
diff --git a/web/scss/features/layer-categories.scss b/web/scss/features/layer-categories.scss
index 9c5b2d4cc..ba6be169f 100644
--- a/web/scss/features/layer-categories.scss
+++ b/web/scss/features/layer-categories.scss
@@ -226,6 +226,10 @@
position: relative;
cursor: pointer;
min-height: 44px;
+ width: 100%;
+ border: none;
+ background: none;
+ text-align: start;
& .arrow-icon {
color: #d54e21;
@@ -338,6 +342,7 @@
background: #333;
border-top: 2px solid #d54e21;
box-shadow: 0 -2px 16px rgb(0 0 0 / 35%);
+ width: 100%;
}
.layers-all .metadata-more:hover,
diff --git a/web/scss/features/layers.scss b/web/scss/features/layers.scss
index a55112e1e..51fa243dc 100644
--- a/web/scss/features/layers.scss
+++ b/web/scss/features/layers.scss
@@ -279,6 +279,10 @@
.layers-all-header {
padding: 0 0 0 40px;
+ width: 100%;
+ background: none;
+ border: none;
+ text-align: left;
&.notice {
padding: 0 0 0 70px;
diff --git a/web/scss/features/map.scss b/web/scss/features/map.scss
index c6e2647c7..3134883e0 100644
--- a/web/scss/features/map.scss
+++ b/web/scss/features/map.scss
@@ -200,6 +200,7 @@
cursor: pointer;
height: 35px;
padding: 0 0 0 5px;
+ width: 100%;
}
.wv-coords-map:hover {
diff --git a/web/scss/features/sidebar-panel.scss b/web/scss/features/sidebar-panel.scss
index 300ab1f11..7fce6dba8 100644
--- a/web/scss/features/sidebar-panel.scss
+++ b/web/scss/features/sidebar-panel.scss
@@ -82,6 +82,7 @@
display: flex;
align-items: center;
justify-content: center;
+ background: none;
svg.collapse-icon {
height: 22px;
@@ -327,6 +328,9 @@ li.item.productsitem.inmotion,
position: absolute;
right: 4px;
bottom: 7px;
+ background: none;
+ border: none;
+ padding: 0;
}
.productsitem .layer-pointer-icon svg.svg-inline--fa {
diff --git a/web/scss/features/smart-handoff.scss b/web/scss/features/smart-handoff.scss
index 8bc4fa168..b94a19bdf 100644
--- a/web/scss/features/smart-handoff.scss
+++ b/web/scss/features/smart-handoff.scss
@@ -174,6 +174,25 @@ a.help-link {
vertical-align: bottom;
}
}
+
+ button {
+ color: #fff;
+ font-size: 16px;
+ font-weight: 900;
+ margin: 14px 5px 5px;
+ display: inline-block;
+ text-align: center;
+ background: none;
+ border: none;
+ padding: 0;
+ height: auto;
+ width: auto;
+
+ &.help-link {
+ text-align: left;
+ display: inline;
+ }
+ }
}
.loading-granule-count {
@@ -331,6 +350,9 @@ a.help-link {
color: #7bf;
font-size: 17px;
text-align: center;
+ width: 100%;
+ background: none;
+ border: none;
}
.toggle-more-info:hover {
diff --git a/web/scss/features/timeline.scss b/web/scss/features/timeline.scss
index 978b0ee3a..54b1c9bbe 100644
--- a/web/scss/features/timeline.scss
+++ b/web/scss/features/timeline.scss
@@ -228,6 +228,9 @@ button:focus {
width: 35px;
margin: auto;
text-align: center;
+ background: none;
+ border: none;
+ padding: 0;
}
& .date-arrows svg {
@@ -288,6 +291,8 @@ button:focus {
width: 34px;
height: 34px;
margin-top: -1.5px;
+ padding: 0;
+ vertical-align: top;
svg {
left: 15px;
@@ -324,6 +329,7 @@ button:focus {
top: 16px;
right: 4px;
background-color: transparent;
+ border: none;
& svg {
top: 5px;
@@ -372,6 +378,8 @@ button:focus {
width: 40px;
vertical-align: middle;
position: relative;
+ background: none;
+ border: none;
}
.date-arrow-wrapper {
@@ -463,10 +471,10 @@ button:focus {
.zoom-level-change-arrows {
user-select: none;
background: transparent;
- border: thin solid transparent;
vertical-align: middle;
box-sizing: border-box;
width: 55px;
+ border: none;
}
/* Interval selector */
@@ -561,14 +569,18 @@ button:focus {
width: 100%;
margin-left: auto;
margin-right: auto;
- padding: 4px;
+ padding: 0;
background-color: variables.$wv-transparent-black;
border-radius: 3px;
}
#timeline-header #timeline-interval-btn-container,
#zoom-btn-container-axis {
+ color: white;
display: block;
+ background: none;
+ border: none;
+ width: inherit;
}
.timeline-container .wv-tooltip {
@@ -601,13 +613,12 @@ button:focus {
.zoom-btn-active,
.interval-btn-active {
- width: 90px;
+ width: inherit;
color: #ccc;
font-size: 12px;
line-height: 14px;
display: block;
clear: both;
- cursor: pointer;
text-transform: uppercase;
text-align: center;
font-family: variables.$wv-monospace-font;
@@ -638,6 +649,21 @@ button:focus {
line-height: 16px;
color: #ccc;
padding: 2px 0;
+ background: none;
+ border: none;
+ width: 100%;
+}
+
+.interval-list-btn {
+ display: block;
+ clear: both;
+ text-transform: uppercase;
+ text-align: center;
+ font-family: variables.$wv-monospace-font;
+ font-size: 14px;
+ line-height: 16px;
+ color: inherit;
+ padding: 2px 0;
}
.zoom-btn:hover,
@@ -652,10 +678,14 @@ button:focus {
right: 0;
height: 64px;
width: 20px;
- cursor: pointer;
border-left: variables.$wv-dark-menu-border;
border-top-right-radius: variables.$wv-menu-border-radius;
border-bottom-right-radius: variables.$wv-menu-border-radius;
+ border-right: none;
+ background: none;
+ padding: 0;
+ border-top: none;
+ border-bottom: none;
}
#timeline-hide:hover,