Merge branch 'master' into patch-1

keystonejs · Mar 30, 2021 · a3eba7c · a3eba7c
2 parents e150ae2 + eeba0ef
commit a3eba7c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 27 deletions.
diff --git a/docs-next/components/Status.tsx b/docs-next/components/Status.tsx
@@ -4,28 +4,23 @@ import { jsx } from '@keystone-ui/core';
 const statusMap = {
   notStarted: {
     label: 'Not started',
-    color: '#666666',
-    backgroundColor: '#eeeeee',
+    color: 'gray',
   },
   figuringItOut: {
     label: 'Figuring it out',
-    color: '#D97706',
-    backgroundColor: '#FEF3C7',
+    color: 'orange',
   },
   theresAPlan: {
     label: 'There’s a plan',
-    color: '#DB2777',
-    backgroundColor: '#FCE7F3',
+    color: 'pink',
   },
   makingItHappen: {
     label: 'Making it happen',
-    color: '#1D4ED8',
-    backgroundColor: '#DBEAFE',
+    color: 'blue',
   },
   cleaningUp: {
     label: 'Cleaning up',
-    color: '#15803D',
-    backgroundColor: '#DCFCE7',
+    color: 'green',
   },
 };
 
@@ -34,20 +29,11 @@ type StatusProps = {
 };
 export function Status({ look }: StatusProps) {
   const status = statusMap[look];
-  const styles = {
-    '&::before': {
-      display: 'none',
-    },
-    '&::after': {
-      display: 'none',
-    },
-    fontSize: '85%',
-    fontFamily: 'SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace',
-    padding: '0.25rem 0.375rem',
-    borderRadius: 6,
-    color: status.color,
-    backgroundColor: status.backgroundColor,
-  };
+  const styles = `
+    rounded font-mono text-sm py-1 px-2
+    bg-${status.color}-100
+    text-${status.color}-700
+  `;
 
-  return <span css={styles}>{status.label}</span>;
+  return <span className={styles}>{status.label}</span>;
 }
diff --git a/docs-next/pages/roadmap.mdx b/docs-next/pages/roadmap.mdx
@@ -37,7 +37,7 @@ Here's what you'll see in the next month:
 
 ### 👇 What's next on our list
 
-We’re status-tagging everything we’re tracking. Leaning on Basecamp’s [Shape Up](https://basecamp.com/shapeup/3.4-chapter-12#work-is-like-a-hill) (and RedwoodJS) we’re using colour-coded labels to help surface our activities, making it quicker and clearer for you to understand where things are up to:
+We’re status-tagging everything we’re tracking. Borrowing from RedwoodJS's roadmap format and leaning on Basecamp’s [Shape Up](https://basecamp.com/shapeup/3.4-chapter-12#work-is-like-a-hill) we’re using colour-coded labels to help surface our activities, making it quicker and clearer for you to understand where things are up to:
 
 - <Status look="notStarted" />
 - <Status look="figuringItOut" />
@@ -88,7 +88,7 @@ streamlined migration stories for.
 
 ## Field Types Review
 
-<Status look="figuringItOut" />
+<Status look="theresAPlan" />
 
 We're planning to revisit our field types and make them more powerful and consistent. This will
 include new interface options for the Admin UI, new features for validation and logic, and better