fix: wrap count labels in capture matching (Greenstand#322)

gwynndp · Jan 25, 2022 · 1dfd366 · 1dfd366
1 parent 0d98af1
commit 1dfd366
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/components/CaptureMatching/CaptureHeader.js b/src/components/CaptureMatching/CaptureHeader.js
@@ -36,7 +36,7 @@ function CaptureHeader(props) {
           alignItems="baseline"
         >
           <CurrentCaptureNumber
-            text={`Unmatched Capture${imgCount !== 1 && 's'}`}
+            text={`Unmatched Capture${imgCount !== 1 && 's' || ''}`}
             cameraImg={iconImgLogo}
             imgCount={imgCount}
           />

diff --git a/src/components/CaptureMatching/CaptureMatchingView.js b/src/components/CaptureMatching/CaptureMatchingView.js
@@ -169,7 +169,7 @@ function CaptureMatchingView() {
           <Box style={{ width: '50%' }}>
             <Box className={classes.candidateIconBox}>
               <CurrentCaptureNumber
-                text={`Candidate Match${treesCount !== 1 && 'es'}`}
+                text={`Candidate Match${treesCount !== 1 && 'es' || ''}`}
                 treeIcon={treeIcon}
                 treesCount={treesCount}
               />

diff --git a/src/components/CaptureMatching/CurrentCaptureNumber.js b/src/components/CaptureMatching/CurrentCaptureNumber.js
@@ -5,16 +5,16 @@ import { Paper, Typography, Box } from '@material-ui/core';
 function CurrentCaptureNumber(props) {
   return (
     <Box>
-      <Paper elevation={2} style={{ width: '160px' }}>
+      <Paper elevation={2} style={{ width: '200px' }}>
         <Box p={1} style={{ display: 'flex' }}>
-          <Box style={{ color: '#666', padding: '5px' }}>
+          <Box style={{ color: '#666', padding: '3px' }}>
             {props.cameraImg}
             {props.treeIcon}
           </Box>
           <Typography
             variant="h3"
             width="65%"
-            style={{ fontSize: '14px', padding: '4px' }}
+            style={{ fontSize: '14px', padding: '6px' }}
           >
             {props.imgCount} {props.treesCount}
             <span