Merge 4c5880a into a01cbd1

akveo · Apr 19, 2019 · bc7a85e · bc7a85e
2 parents a01cbd1 + 4c5880a
commit bc7a85e
Show file tree

Hide file tree

Showing 7 changed files with 2,239 additions and 1,163 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/framework/ui/common/mapping.json b/src/framework/ui/common/mapping.json
@@ -685,7 +685,7 @@
       "appearances": {
         "filled": {
           "mapping": {
-            "buttonBorderRadius": 6
+            "buttonBorderRadius": 8
           },
           "variantGroups": {
             "size": {
@@ -699,6 +699,9 @@
         },
         "outline": {
           "mapping": {}
+        },
+        "ghost": {
+          "mapping": {}
         }
       }
     },
@@ -1082,6 +1085,48 @@
           },
           "iconTintColor": {
             "type": "string"
+          },
+          "labelColor": {
+            "type": "string"
+          },
+          "labelFontSize": {
+            "type": "number"
+          },
+          "labelLineHeight": {
+            "type": "number"
+          },
+          "labelMarginBottom": {
+            "type": "number"
+          },
+          "labelFontWeight": {
+            "type": "string"
+          },
+          "captionMarginTop": {
+            "type": "number"
+          },
+          "captionTextColor": {
+            "type": "string"
+          },
+          "captionTextFontSize": {
+            "type": "number"
+          },
+          "captionTextLineHeight": {
+            "type": "number"
+          },
+          "captionTextFontWeight": {
+            "type": "string"
+          },
+          "captionIconWidth": {
+            "type": "number"
+          },
+          "captionIconHeight": {
+            "type": "number"
+          },
+          "captionIconMarginRight": {
+            "type": "number"
+          },
+          "captionIconTintColor": {
+            "type": "string"
           }
         },
         "appearances": {
@@ -1139,6 +1184,20 @@
             "iconHeight": 24,
             "iconMarginHorizontal": 8,
             "iconTintColor": "color-basic-500",
+            "labelColor": "color-basic-600",
+            "labelFontSize": 12,
+            "labelLineHeight": 16,
+            "labelMarginBottom": 4,
+            "labelFontWeight": "700",
+            "captionMarginTop": 4,
+            "captionTextColor": "color-basic-600",
+            "captionTextFontSize": 11,
+            "captionTextLineHeight": 16,
+            "captionTextFontWeight": "normal",
+            "captionIconWidth": 10,
+            "captionIconHeight": 10,
+            "captionIconMarginRight": 8,
+            "captionIconTintColor": "color-basic-500",
             "state": {
               "disabled": {
                 "backgroundColor": "color-basic-200",
@@ -1153,39 +1212,49 @@
                 "state": {
                   "focused": {
                     "borderColor": "color-primary-500",
-                    "iconTintColor": "color-primary-500"
+                    "iconTintColor": "color-primary-500",
+                    "captionTextColor": "color-primary-500",
+                    "captionIconTintColor": "color-primary-500"
                   }
                 }
               },
               "success": {
                 "state": {
                   "focused": {
                     "borderColor": "color-success-500",
-                    "iconTintColor": "color-success-500"
+                    "iconTintColor": "color-success-500",
+                    "captionTextColor": "color-success-500",
+                    "captionIconTintColor": "color-success-500"
                   }
                 }
               },
               "info": {
                 "state": {
                   "focused": {
                     "borderColor": "color-info-500",
-                    "iconTintColor": "color-info-500"
+                    "iconTintColor": "color-info-500",
+                    "captionTextColor": "color-info-500",
+                    "captionIconTintColor": "color-info-500"
                   }
                 }
               },
               "warning": {
                 "state": {
                   "focused": {
                     "borderColor": "color-warning-500",
-                    "iconTintColor": "color-warning-500"
+                    "iconTintColor": "color-warning-500",
+                    "captionTextColor": "color-warning-500",
+                    "captionIconTintColor": "color-warning-500"
                   }
                 }
               },
               "danger": {
                 "state": {
                   "focused": {
                     "borderColor": "color-danger-500",
-                    "iconTintColor": "color-danger-500"
+                    "iconTintColor": "color-danger-500",
+                    "captionTextColor": "color-danger-500",
+                    "captionIconTintColor": "color-danger-500"
                   }
                 }
               }