From c71fbcf436ac38e0f19cf0bba12c4046e6bd72b2 Mon Sep 17 00:00:00 2001
From: orangemug <info@orangemug.co.uk>
Date: Mon, 28 May 2018 11:15:16 +0100
Subject: [PATCH] Tidy

---
 src/components/App.jsx                | 6 +++---
 src/components/layers/LayerEditor.jsx | 5 ++---
 src/components/layers/LayerList.jsx   | 2 +-
 src/styles/_layer.scss                | 5 +++++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/components/App.jsx b/src/components/App.jsx
index 857931f9..78175034 100644
--- a/src/components/App.jsx
+++ b/src/components/App.jsx
@@ -167,7 +167,7 @@ export default class App extends React.Component {
     })
   }
 
-  onSortEnd(move) {
+  onMoveLayer(move) {
     let { oldIndex, newIndex } = move;
     let layers = this.state.mapStyle.layers;
     oldIndex = clamp(oldIndex, 0, layers.length-1);
@@ -352,7 +352,7 @@ export default class App extends React.Component {
     />
 
     const layerList = <LayerList
-      onSortEnd={this.onSortEnd.bind(this)}
+      onMoveLayer={this.onMoveLayer.bind(this)}
       onLayerDestroy={this.onLayerDestroy.bind(this)}
       onLayerCopy={this.onLayerCopy.bind(this)}
       onLayerVisibilityToggle={this.onLayerVisibilityToggle.bind(this)}
@@ -371,7 +371,7 @@ export default class App extends React.Component {
       sources={this.state.sources}
       vectorLayers={this.state.vectorLayers}
       spec={this.state.spec}
-      onSortEnd={this.onSortEnd.bind(this)}
+      onMoveLayer={this.onMoveLayer.bind(this)}
       onLayerChanged={this.onLayerChanged.bind(this)}
       onLayerDestroy={this.onLayerDestroy.bind(this)}
       onLayerCopy={this.onLayerCopy.bind(this)}
diff --git a/src/components/layers/LayerEditor.jsx b/src/components/layers/LayerEditor.jsx
index 16c8d28c..6f6f44c8 100644
--- a/src/components/layers/LayerEditor.jsx
+++ b/src/components/layers/LayerEditor.jsx
@@ -1,7 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import { Wrapper, Button, Menu, MenuItem } from 'react-aria-menubutton'
-import classnames from 'classnames'
 
 import JSONEditor from './JSONEditor'
 import FilterEditor from '../filter/FilterEditor'
@@ -181,7 +180,7 @@ export default class LayerEditor extends React.Component {
   }
 
   moveLayer(offset) {
-    this.props.onSortEnd({
+    this.props.onMoveLayer({
       oldIndex: this.props.layerIndex,
       newIndex: this.props.layerIndex+offset
     })
@@ -250,7 +249,7 @@ export default class LayerEditor extends React.Component {
               closeOnSelection={false}
             >
               <Button className='more-menu__button'>
-                <MoreVertIcon width="22px" height="22px" />
+                <MoreVertIcon className="more-menu__button__svg" />
               </Button>
               <Menu>
                 <ul className="more-menu__menu">
diff --git a/src/components/layers/LayerList.jsx b/src/components/layers/LayerList.jsx
index 25312f66..1b50b898 100644
--- a/src/components/layers/LayerList.jsx
+++ b/src/components/layers/LayerList.jsx
@@ -208,7 +208,7 @@ export default class LayerList extends React.Component {
   render() {
     return <LayerListContainer
       {...this.props}
-      onSortEnd={this.props.onSortEnd.bind(this)}
+      onSortEnd={this.props.onMoveLayer.bind(this)}
       useDragHandle={true}
     />
   }
diff --git a/src/styles/_layer.scss b/src/styles/_layer.scss
index 8013f3ae..c5a3a9a0 100644
--- a/src/styles/_layer.scss
+++ b/src/styles/_layer.scss
@@ -192,6 +192,11 @@
     min-width: 120px;
   }
 
+  &__button__svg {
+    width: 24px;
+    height: 24px;
+  }
+
   &__menu__item {
     padding: 4px;
   }