From 19a26686446ba3ecc25cce7ce06c707a02b57a29 Mon Sep 17 00:00:00 2001
From: Mitchell McCaffrey <mitchemmc@gmail.com>
Date: Thu, 20 May 2021 13:50:19 +1000
Subject: [PATCH] Even up group tile padding and fix light theme badge colour

---
 src/components/Tile.js                 | 11 ++++-------
 src/components/map/MapTileGroup.js     | 14 ++++++--------
 src/components/token/TokenTileGroup.js | 17 ++++++++++-------
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/components/Tile.js b/src/components/Tile.js
index 04c0bae..9869424 100644
--- a/src/components/Tile.js
+++ b/src/components/Tile.js
@@ -1,5 +1,5 @@
 import React from "react";
-import { Flex, IconButton, Box, Text, Badge, Grid } from "theme-ui";
+import { Flex, IconButton, Box, Text, Badge } from "theme-ui";
 
 import EditTileIcon from "../icons/EditTileIcon";
 
@@ -12,7 +12,6 @@ function Tile({
   canEdit,
   badges,
   editTitle,
-  columns,
   children,
 }) {
   return (
@@ -37,19 +36,17 @@ function Tile({
       onDoubleClick={onDoubleClick}
       aria-label={title}
     >
-      <Grid
-        columns={columns}
+      <Box
         sx={{
           width: "100%",
           height: "100%",
           position: "absolute",
           top: 0,
           left: 0,
-          gridGap: 0,
         }}
       >
         {children}
-      </Grid>
+      </Box>
       <Flex
         sx={{
           position: "absolute",
@@ -89,7 +86,7 @@ function Tile({
       />
       <Box sx={{ position: "absolute", top: 0, left: 0 }}>
         {badges.map((badge, i) => (
-          <Badge m={2} key={i} bg="overlay">
+          <Badge m={2} key={i} bg="overlay" color="text">
             {badge}
           </Badge>
         ))}
diff --git a/src/components/map/MapTileGroup.js b/src/components/map/MapTileGroup.js
index 0d1a634..ca78cdd 100644
--- a/src/components/map/MapTileGroup.js
+++ b/src/components/map/MapTileGroup.js
@@ -1,4 +1,5 @@
 import React from "react";
+import { Grid } from "theme-ui";
 
 import Tile from "../Tile";
 import MapTileImage from "./MapTileImage";
@@ -10,15 +11,12 @@ function MapTileGroup({ group, maps, isSelected, onSelect, onOpen, canOpen }) {
       isSelected={isSelected}
       onSelect={() => onSelect(group)}
       onDoubleClick={() => canOpen && onOpen()}
-      columns="1fr 1fr"
     >
-      {maps.slice(0, 4).map((map) => (
-        <MapTileImage
-          sx={{ padding: 1, borderRadius: "8px" }}
-          map={map}
-          key={map.id}
-        />
-      ))}
+      <Grid columns="1fr 1fr" p={2} sx={{ gridGap: 2 }}>
+        {maps.slice(0, 4).map((map) => (
+          <MapTileImage sx={{ borderRadius: "8px" }} map={map} key={map.id} />
+        ))}
+      </Grid>
     </Tile>
   );
 }
diff --git a/src/components/token/TokenTileGroup.js b/src/components/token/TokenTileGroup.js
index 8f0ec6b..54553ef 100644
--- a/src/components/token/TokenTileGroup.js
+++ b/src/components/token/TokenTileGroup.js
@@ -1,4 +1,5 @@
 import React from "react";
+import { Grid } from "theme-ui";
 
 import Tile from "../Tile";
 import TokenTileImage from "./TokenTileImage";
@@ -19,13 +20,15 @@ function TokenTileGroup({
       onDoubleClick={() => canOpen && onOpen()}
       columns="1fr 1fr"
     >
-      {tokens.slice(0, 4).map((token) => (
-        <TokenTileImage
-          sx={{ padding: 1, borderRadius: "8px" }}
-          token={token}
-          key={token.id}
-        />
-      ))}
+      <Grid columns="1fr 1fr" p={2} sx={{ gridGap: 2 }}>
+        {tokens.slice(0, 4).map((token) => (
+          <TokenTileImage
+            sx={{ padding: 1, borderRadius: "8px" }}
+            token={token}
+            key={token.id}
+          />
+        ))}
+      </Grid>
     </Tile>
   );
 }