From abdbb1b335e0ff4bc25d55a713b83786c77fa6c0 Mon Sep 17 00:00:00 2001
From: davidgoli <davigoli@gmail.com>
Date: Fri, 18 Jan 2019 16:18:21 -0800
Subject: [PATCH 1/3] build out Theme types

---
 types/styled-system/index.d.ts | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/types/styled-system/index.d.ts b/types/styled-system/index.d.ts
index ca2f7ce1fc..66a2ff5418 100644
--- a/types/styled-system/index.d.ts
+++ b/types/styled-system/index.d.ts
@@ -105,6 +105,24 @@ export interface BaseTheme {
     };
 }
 
+export type ObjectOrArray<T> = T[] | { [K: string]: T };
+
+export interface Theme extends BaseTheme {
+    fonts?: ObjectOrArray<CSS.FontFamilyProperty>;
+    fontWeights?: ObjectOrArray<CSS.FontWeightProperty>;
+    maxWidths?: ObjectOrArray<CSS.WidthProperty<{}>>;
+    minWidths?: ObjectOrArray<CSS.WidthProperty<{}>>;
+    heights?: ObjectOrArray<CSS.HeightProperty<{}>>;
+    maxHeights?: ObjectOrArray<CSS.HeightProperty<{}>>;
+    minHeights?: ObjectOrArray<CSS.HeightProperty<{}>>;
+    lineHeights?: ObjectOrArray<CSS.LineHeightProperty<{}>>;
+    letterSpacings?: ObjectOrArray<CSS.LetterSpacingProperty<{}>>;
+    shadows?: ObjectOrArray<CSS.BoxShadowProperty>;
+    borders?: ObjectOrArray<CSS.BorderProperty<{}>>;
+    radii?: ObjectOrArray<CSS.BorderRadiusProperty<{}>>;
+    opacity?: ObjectOrArray<CSS.GlobalsNumber>;
+}
+
 /**
  * Font Size
  */

From 87f83c2018ac90f46d9cdf30ac05b43399a5ba6b Mon Sep 17 00:00:00 2001
From: davidgoli <davigoli@gmail.com>
Date: Fri, 18 Jan 2019 16:32:39 -0800
Subject: [PATCH 2/3] add variant fields

---
 types/styled-system/index.d.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/types/styled-system/index.d.ts b/types/styled-system/index.d.ts
index 66a2ff5418..fffce48818 100644
--- a/types/styled-system/index.d.ts
+++ b/types/styled-system/index.d.ts
@@ -96,17 +96,15 @@ export interface VariantArgs {
 
 export function variant(props: VariantArgs): (...args: any[]) => any;
 
+export type ObjectOrArray<T> = T[] | { [K: string]: T };
+
 export interface BaseTheme {
     breakpoints?: number[];
     space?: number[];
     fontSizes?: number[];
-    colors?: {
-        [name: string]: string;
-    };
+    colors?: ObjectOrArray<CSS.ColorProperty>;
 }
 
-export type ObjectOrArray<T> = T[] | { [K: string]: T };
-
 export interface Theme extends BaseTheme {
     fonts?: ObjectOrArray<CSS.FontFamilyProperty>;
     fontWeights?: ObjectOrArray<CSS.FontWeightProperty>;
@@ -121,6 +119,9 @@ export interface Theme extends BaseTheme {
     borders?: ObjectOrArray<CSS.BorderProperty<{}>>;
     radii?: ObjectOrArray<CSS.BorderRadiusProperty<{}>>;
     opacity?: ObjectOrArray<CSS.GlobalsNumber>;
+    textStyles?: ObjectOrArray<CSS.StandardProperties>;
+    colorStyles?: ObjectOrArray<CSS.StandardProperties>;
+    buttons?: ObjectOrArray<CSS.StandardProperties>;
 }
 
 /**

From 7c243ec63778ffa69fba9a5769a73335f1561a2f Mon Sep 17 00:00:00 2001
From: davidgoli <davigoli@gmail.com>
Date: Fri, 18 Jan 2019 17:35:36 -0800
Subject: [PATCH 3/3] alphabetize props

---
 types/styled-system/index.d.ts | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/types/styled-system/index.d.ts b/types/styled-system/index.d.ts
index fffce48818..5ff6aac2b5 100644
--- a/types/styled-system/index.d.ts
+++ b/types/styled-system/index.d.ts
@@ -100,28 +100,28 @@ export type ObjectOrArray<T> = T[] | { [K: string]: T };
 
 export interface BaseTheme {
     breakpoints?: number[];
-    space?: number[];
-    fontSizes?: number[];
     colors?: ObjectOrArray<CSS.ColorProperty>;
+    fontSizes?: number[];
+    space?: number[];
 }
 
 export interface Theme extends BaseTheme {
-    fonts?: ObjectOrArray<CSS.FontFamilyProperty>;
-    fontWeights?: ObjectOrArray<CSS.FontWeightProperty>;
-    maxWidths?: ObjectOrArray<CSS.WidthProperty<{}>>;
-    minWidths?: ObjectOrArray<CSS.WidthProperty<{}>>;
-    heights?: ObjectOrArray<CSS.HeightProperty<{}>>;
-    maxHeights?: ObjectOrArray<CSS.HeightProperty<{}>>;
-    minHeights?: ObjectOrArray<CSS.HeightProperty<{}>>;
-    lineHeights?: ObjectOrArray<CSS.LineHeightProperty<{}>>;
-    letterSpacings?: ObjectOrArray<CSS.LetterSpacingProperty<{}>>;
-    shadows?: ObjectOrArray<CSS.BoxShadowProperty>;
     borders?: ObjectOrArray<CSS.BorderProperty<{}>>;
-    radii?: ObjectOrArray<CSS.BorderRadiusProperty<{}>>;
-    opacity?: ObjectOrArray<CSS.GlobalsNumber>;
-    textStyles?: ObjectOrArray<CSS.StandardProperties>;
-    colorStyles?: ObjectOrArray<CSS.StandardProperties>;
     buttons?: ObjectOrArray<CSS.StandardProperties>;
+    colorStyles?: ObjectOrArray<CSS.StandardProperties>;
+    fontWeights?: ObjectOrArray<CSS.FontWeightProperty>;
+    fonts?: ObjectOrArray<CSS.FontFamilyProperty>;
+    heights?: ObjectOrArray<CSS.HeightProperty<{}>>;
+    letterSpacings?: ObjectOrArray<CSS.LetterSpacingProperty<{}>>;
+    lineHeights?: ObjectOrArray<CSS.LineHeightProperty<{}>>;
+    maxHeights?: ObjectOrArray<CSS.HeightProperty<{}>>;
+    maxWidths?: ObjectOrArray<CSS.WidthProperty<{}>>;
+    minHeights?: ObjectOrArray<CSS.HeightProperty<{}>>;
+    minWidths?: ObjectOrArray<CSS.WidthProperty<{}>>;
+    opacity?: ObjectOrArray<CSS.GlobalsNumber>;
+    radii?: ObjectOrArray<CSS.BorderRadiusProperty<{}>>;
+    shadows?: ObjectOrArray<CSS.BoxShadowProperty>;
+    textStyles?: ObjectOrArray<CSS.StandardProperties>;
 }
 
 /**