Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

use large list items in menus on mobile

Jason Kent17a3ba561260
diff --git a/web/css/list.css b/web/css/list.css
index ac3eacfee..ba6607ef3 100644
--- a/web/css/list.css
+++ b/web/css/list.css
@@ -13,7 +13,6 @@
}
.list-group-item svg.svg-inline--fa {
margin-right: 6px;
- line-height: 1.5;
height: 1em;
}
button.list-group-item {
@@ -22,3 +21,12 @@ button.list-group-item {
.list-group-item.small-item {
padding: 5px;
}
+.list-group-item.large-item {
+ font-size: 14px;
+ svg.svg-inline--fa {
+ margin-right: 12px;
+ height: 1.25em;
+ position: relative;
+ top: 2px;
+ }
+}
diff --git a/web/css/toolbar.css b/web/css/toolbar.css
index 98df6a99d..8ca98a11f 100644
--- a/web/css/toolbar.css
+++ b/web/css/toolbar.css
@@ -68,6 +68,9 @@
.toolbar-list-modal.modal-dialog {
width: 160px;
+ @media (max-width: 768px) {
+ width: 180px;
+ }
}
.toolbar-medium-modal {
diff --git a/web/js/components/measure-tool/measure-menu.js b/web/js/components/measure-tool/measure-menu.js
index 54b0a771c..edb95f84a 100644
--- a/web/js/components/measure-tool/measure-menu.js
+++ b/web/js/components/measure-tool/measure-menu.js
@@ -4,7 +4,7 @@ import React, { Component } from 'react';
import { Form } from 'reactstrap';
import { onToggle } from '../../modules/modal/actions';
-import IconList from '../util/list';
+import IconList from '../util/icon-list';
import { changeUnits } from '../../modules/measure/actions';
import util from '../../util/util';
@@ -85,7 +85,7 @@ class MeasureMenu extends Component {
const {
isTouchDevice, unitOfMeasure, measurementsInProj, isMobile,
} = this.props;
- const listSize = isTouchDevice ? 'medium' : 'small';
+ const listSize = isTouchDevice ? 'large' : 'small';
// DOWNLOAD_SHAPEFILE.hidden = !measurementsInProj || isMobile;
DOWNLOAD_GEOJSON.hidden = !measurementsInProj || isMobile;
return (
diff --git a/web/js/components/util/list.js b/web/js/components/util/icon-list.js
similarity index 95%
rename from web/js/components/util/list.js
rename to web/js/components/util/icon-list.js
index ef2166bad..e32860411 100644
--- a/web/js/components/util/list.js
+++ b/web/js/components/util/icon-list.js
@@ -9,7 +9,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
* @class List
* @extends React.Component
*/
-export default function List(props) {
+export default function IconList(props) {
const {
list, listClass, active, disabled, onClick, size,
} = props;
@@ -28,7 +28,6 @@ export default function List(props) {
: null;
const onClickFn = item.onClick ? item.onClick : propsOnClick;
-
return !hidden && (
<ListGroupItem
key={key || id || ''}
@@ -50,10 +49,10 @@ export default function List(props) {
</ListGroup>
);
}
-List.defaultProps = {
+IconList.defaultProps = {
size: 'medium',
};
-List.propTypes = {
+IconList.propTypes = {
active: PropTypes.string,
disabled: PropTypes.bool,
list: PropTypes.array,
diff --git a/web/js/containers/info.js b/web/js/containers/info.js
index fb5603608..11de015ab 100644
--- a/web/js/containers/info.js
+++ b/web/js/containers/info.js
@@ -7,7 +7,7 @@ import {
} from '../modules/modal/actions';
import toggleDistractionFreeModeAction from '../modules/ui/actions';
import AboutPage from '../components/about/about-page';
-import IconList from '../components/util/list';
+import IconList from '../components/util/icon-list';
import onClickFeedback from '../modules/feedback/util';
import { addToLocalStorage } from '../modules/notifications/util';
@@ -142,7 +142,12 @@ function InfoList (props) {
return arr;
}
- return (<IconList list={getListArray()} size="small" />);
+ return (
+ <IconList
+ list={getListArray()}
+ size={isMobile ? 'large' : 'small'}
+ />
+ );
}
function mapStateToProps(state) {
diff --git a/web/js/containers/projection.js b/web/js/containers/projection.js
index e98597be5..ceaf0005d 100644
--- a/web/js/containers/projection.js
+++ b/web/js/containers/projection.js
@@ -7,7 +7,7 @@ import changeProjection from '../modules/projection/actions';
import { onToggle } from '../modules/modal/actions';
import { stop } from '../modules/animation/actions';
import { onProjectionSwitch } from '../modules/product-picker/actions';
-import IconList from '../components/util/list';
+import IconList from '../components/util/icon-list';
const DEFAULT_PROJ_ARRAY = [
{
@@ -66,13 +66,13 @@ class ProjectionList extends Component {
}
render() {
- const { projection, projectionArray } = this.props;
+ const { projection, projectionArray, isMobile } = this.props;
return (
<IconList
list={projectionArray}
active={projection}
onClick={this.onClick}
- size="small"
+ size={isMobile ? 'large' : 'small'}
/>
);
}
@@ -80,15 +80,17 @@ class ProjectionList extends Component {
const mapStateToProps = (state) => {
const {
- config, models, animation, proj,
+ config, models, animation, proj, browser,
} = state;
const projArray = lodashGet(config, 'ui.projections');
const projectionArray = projArray
? getInfoArray(projArray)
: DEFAULT_PROJ_ARRAY;
+ const isMobile = browser.lessThan.medium;
return {
models,
config,
+ isMobile,
isPlaying: animation.isPlaying,
projection: proj.id,
projectionArray,
@@ -116,6 +118,7 @@ export default connect(
ProjectionList.propTypes = {
config: PropTypes.object,
onCloseModal: PropTypes.func,
+ isMobile: PropTypes.bool,
isPlaying: PropTypes.bool,
projection: PropTypes.string,
projectionArray: PropTypes.array,