Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

WV-2468: Updating Modal Dialogs with X Button (#4052)

Ryan Weiler24386a379c3b
diff --git a/e2e/features/animation/mobile-animation-test.js b/e2e/features/animation/mobile-animation-test.js
index ebb831f4d..3765a9b0d 100644
--- a/e2e/features/animation/mobile-animation-test.js
+++ b/e2e/features/animation/mobile-animation-test.js
@@ -20,7 +20,7 @@ module.exports = {
},
'Minimizing mobile animation widget opens collapsed animation widget': (c) => {
- c.useCss().click('.wv-minimize');
+ c.useCss().click('#mobile-animation-close');
c.waitForElementVisible('#collapsed-animate-widget-phone-portrait', TIME_LIMIT);
},
diff --git a/web/js/components/sidebar/nav/nav-case.js b/web/js/components/sidebar/nav/nav-case.js
index 026e8ff4e..ad416d4e2 100644
--- a/web/js/components/sidebar/nav/nav-case.js
+++ b/web/js/components/sidebar/nav/nav-case.js
@@ -72,10 +72,11 @@ function NavCase (props) {
width: '45px',
} : null;
const collapseIconMobile = isMobile ? {
- height: '40px',
- width: '40px',
+ height: '30px',
+ width: '30px',
color: '#fff',
} : null;
+ const fontAwesomeStyle = isMobile ? 'times' : 'caret-up';
return (
<Nav tabs className="main-nav">
@@ -105,7 +106,7 @@ function NavCase (props) {
>
<FontAwesomeIcon
className="collapse-icon"
- icon="caret-up"
+ icon={fontAwesomeStyle}
aria-label="Hide sidebar"
style={collapseIconMobile}
/>
diff --git a/web/js/containers/animation-widget.js b/web/js/containers/animation-widget.js
index 5f4065d1f..9a6b8b553 100644
--- a/web/js/containers/animation-widget.js
+++ b/web/js/containers/animation-widget.js
@@ -406,11 +406,17 @@ class AnimationWidget extends React.Component {
const mobileID = getMobileIDs();
+ const collapseIconMobile = {
+ height: '30px',
+ width: '30px',
+ color: '#fff',
+ };
+
return (
<div className="wv-animation-widget-wrapper-mobile" id={`mobile-animation-widget-${mobileID}`}>
<div className="mobile-animation-header">
- <span className="close wv-minimize" aria-label="Close" onClick={this.toggleCollapse}>
- <FontAwesomeIcon icon="times" id="mobile-close-btn" />
+ <span aria-label="Close" onClick={this.toggleCollapse} id="mobile-animation-close">
+ <FontAwesomeIcon icon="times" className="collapse-icon" style={collapseIconMobile} />
</span>
</div>
<div className="mobile-animation-warning-message-container">
diff --git a/web/scss/features/anim-widget.scss b/web/scss/features/anim-widget.scss
index 5ef07264e..c03407435 100644
--- a/web/scss/features/anim-widget.scss
+++ b/web/scss/features/anim-widget.scss
@@ -420,7 +420,7 @@ a .wv-animation-widget-icon {
background-color: $wv-solid-black;
& .mobile-animation-header {
- padding: 0 20px 0 10px;
+ padding: 10px;
background-color: #333;
border-bottom: $wv-dark-menu-border;
border-top-left-radius: 6px;
diff --git a/web/scss/features/sidebar-panel.scss b/web/scss/features/sidebar-panel.scss
index a98d2d5c0..ec22e5217 100644
--- a/web/scss/features/sidebar-panel.scss
+++ b/web/scss/features/sidebar-panel.scss
@@ -76,6 +76,9 @@
width: 30px;
border: 1px solid transparent;
cursor: pointer;
+ display: flex;
+ align-items: center;
+ justify-content: center;
svg.collapse-icon {
height: 22px;