refactor(mapping/theme): eva-mapping and light/dark themes refactor

eva-design · Jun 4, 2019 · 016b0e8 · 016b0e8
1 parent 70e1ab3
commit 016b0e8
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 40 deletions.
diff --git a/packages/eva/mapping.json b/packages/eva/mapping.json
@@ -998,8 +998,8 @@
           "mapping": {
             "borderWidth": 1,
             "borderRadius": 3,
-            "backgroundColor": "background-color-default-2",
-            "borderColor": "border-color-default-3",
+            "backgroundColor": "background-color-default-3",
+            "borderColor": "border-color-default-4",
             "textColor": "text-color-default",
             "iconTintColor": "transparent",
             "outlineBorderRadius": 6,
@@ -1033,8 +1033,8 @@
                 "iconBorderRadius": 1.5
               },
               "disabled": {
-                "borderColor": "border-color-default-4",
-                "backgroundColor": "background-color-default-3",
+                "borderColor": "border-color-default-3",
+                "backgroundColor": "background-color-default-2",
                 "textColor": "text-color-disabled"
               }
             }
@@ -1784,6 +1784,9 @@
           "borderColor": {
             "type": "string"
           },
+          "backgroundColor": {
+            "type": "string"
+          },
           "textColor": {
             "type": "string"
           },
@@ -1870,7 +1873,8 @@
         "default": {
           "mapping": {
             "borderWidth": 1,
-            "borderColor": "border-color-default-3",
+            "backgroundColor": "background-color-default-3",
+            "borderColor": "border-color-default-4",
             "textColor": "text-color-default",
             "iconTintColor": "transparent",
             "outlineBackgroundColor": "transparent",
@@ -1897,7 +1901,8 @@
                 "iconTintColor": "color-primary-default"
               },
               "disabled": {
-                "borderColor": "border-color-default-4",
+                "backgroundColor": "background-color-default-2",
+                "borderColor": "border-color-default-3",
                 "textColor": "text-color-disabled"
               },
               "checked.active": {

diff --git a/packages/eva/themes/dark.json b/packages/eva/themes/dark.json
@@ -1,25 +1,25 @@
 {
   "color-basic-100": "#FFFFFF",
-  "color-basic-200": "#F7F8FA",
-  "color-basic-300": "#EDF0F4",
-  "color-basic-400": "#DDE1EB",
-  "color-basic-500": "#C8CEDB",
-  "color-basic-600": "#A7B0C1",
-  "color-basic-700": "#657084",
-  "color-basic-800": "#2E384F",
-  "color-basic-900": "#232A40",
-  "color-basic-1000": "#1A1F33",
-  "color-basic-1100": "#131729",
+  "color-basic-200": "#F7F9FC",
+  "color-basic-300": "#EDF1F7",
+  "color-basic-400": "#E4E9F2",
+  "color-basic-500": "#C5CEE0",
+  "color-basic-600": "#8F9BB3",
+  "color-basic-700": "#2E3A59",
+  "color-basic-800": "#222B45",
+  "color-basic-900": "#1A2138",
+  "color-basic-1000": "#151A30",
+  "color-basic-1100": "#101426",
 
   "color-primary-100": "#F2F6FF",
   "color-primary-200": "#D9E4FF",
   "color-primary-300": "#A6C1FF",
   "color-primary-400": "#598BFF",
   "color-primary-500": "#3366FF",
-  "color-primary-600": "#284DE0",
-  "color-primary-700": "#2541CC",
-  "color-primary-800": "#192F9E",
-  "color-primary-900": "#14236E",
+  "color-primary-600": "#274BDB",
+  "color-primary-700": "#1A34B8",
+  "color-primary-800": "#102694",
+  "color-primary-900": "#091C7A",
 
   "color-secondary-100": "#F7F2FF",
   "color-secondary-200": "#E0D1FF",
@@ -145,7 +145,7 @@
   "border-color-primary-5": "$color-primary-900",
 
   "text-color-default": "$color-basic-100",
-  "text-color-alternative": "$color-basic-1000",
+  "text-color-alternative": "$color-basic-900",
   "text-color-control": "$color-basic-100",
   "text-color-disabled": "$color-basic-700",
   "text-color-hint": "$color-basic-600",
@@ -170,11 +170,11 @@
   "text-color-danger-active": "$color-danger-active",
   "text-color-danger-disabled": "$color-danger-disabled",
 
-  "icon-color-default": "$color-basic-500",
+  "icon-color-default": "$color-basic-100",
   "icon-color-active": "$color-basic-400",
   "icon-color-control": "$color-basic-100",
-  "icon-color-disabled": "$color-basic-800",
-  "icon-color-hint": "$color-basic-700",
+  "icon-color-disabled": "$color-basic-700",
+  "icon-color-hint": "$color-basic-600",
 
-  "outline-color": "$color-basic-700",
+  "outline-color": "$color-basic-700"
 }
diff --git a/packages/eva/themes/light.json b/packages/eva/themes/light.json
@@ -1,25 +1,25 @@
 {
   "color-basic-100": "#FFFFFF",
-  "color-basic-200": "#F7F8FA",
-  "color-basic-300": "#EDF0F4",
-  "color-basic-400": "#DDE1EB",
-  "color-basic-500": "#C8CEDB",
-  "color-basic-600": "#A7B0C1",
-  "color-basic-700": "#657084",
-  "color-basic-800": "#2E384F",
-  "color-basic-900": "#232A40",
-  "color-basic-1000": "#1A1F33",
-  "color-basic-1100": "#131729",
+  "color-basic-200": "#F7F9FC",
+  "color-basic-300": "#EDF1F7",
+  "color-basic-400": "#E4E9F2",
+  "color-basic-500": "#C5CEE0",
+  "color-basic-600": "#8F9BB3",
+  "color-basic-700": "#2E3A59",
+  "color-basic-800": "#222B45",
+  "color-basic-900": "#1A2138",
+  "color-basic-1000": "#151A30",
+  "color-basic-1100": "#101426",
 
   "color-primary-100": "#F2F6FF",
   "color-primary-200": "#D9E4FF",
   "color-primary-300": "#A6C1FF",
   "color-primary-400": "#598BFF",
   "color-primary-500": "#3366FF",
-  "color-primary-600": "#284DE0",
-  "color-primary-700": "#2541CC",
-  "color-primary-800": "#192F9E",
-  "color-primary-900": "#14236E",
+  "color-primary-600": "#274BDB",
+  "color-primary-700": "#1A34B8",
+  "color-primary-800": "#102694",
+  "color-primary-900": "#091C7A",
 
   "color-secondary-100": "#F7F2FF",
   "color-secondary-200": "#E0D1FF",
@@ -144,7 +144,7 @@
   "border-color-primary-4": "$color-primary-800",
   "border-color-primary-5": "$color-primary-900",
 
-  "text-color-default": "$color-basic-1000",
+  "text-color-default": "$color-basic-900",
   "text-color-alternative": "$color-basic-100",
   "text-color-control": "$color-basic-100",
   "text-color-disabled": "$color-basic-500",