#1888 fixes import for ManifestoCanvas, re-adds padding for thumbnail grid cell

src/components/ThumbnailNavigation.js

@@ -101,6 +101,7 @@ export class ThumbnailNavigation extends Component {
    * canvases
    */
   calculateScaledWidth(options) {
+<<<<<<< HEAD
     const { config, canvasGroupings } = this.props;
     const ret = canvasGroupings
       .getCanvases(options.index)
@@ -120,6 +121,16 @@ export class ThumbnailNavigation extends Component {
         return Math.ceil(window.canvasIndex / 2);
       default:
         return window.canvasIndex;
+=======
+    const { config, canvases } = this.props;
+    const canvas = new ManifestoCanvas(canvases[options.index]);
+    /*
+    if canvas provides valid dimensions return calculated width, based on height and aspectRatio,
+    otherweise return the default width
+    */
+    if (canvas.hasValidDimensions) {
+      return Math.floor(config.thumbnailNavigation.height * canvas.aspectRatio) + 8;
+>>>>>>> #1888 fixes import for ManifestoCanvas, re-adds padding for thumbnail grid cell
     }
   }
 

src/components/WindowSideBarCanvasPanel.js

@@ -4,8 +4,14 @@ import classNames from 'classnames';
 import Typography from '@material-ui/core/Typography';
 import List from '@material-ui/core/List';
 import ListItem from '@material-ui/core/ListItem';
+<<<<<<< HEAD
 import { CanvasThumbnail } from './CanvasThumbnail';
 import ManifestoCanvas from '../lib/ManifestoCanvas';
+=======
+import { withStyles } from '@material-ui/core/styles';
+import ManifestoCanvas from '../lib/ManifestoCanvas';
+import CanvasThumbnail from './CanvasThumbnail';
+>>>>>>> #1888 fixes import for ManifestoCanvas, re-adds padding for thumbnail grid cell
 import { getIdAndLabelOfCanvases } from '../state/selectors';
 
 /**