Skip to content

Commit

Permalink
fix(mapping): white status & input sizes
Browse files Browse the repository at this point in the history
  • Loading branch information
Artur Yorsh committed Jun 5, 2019
1 parent a9cab91 commit 60b2626
Show file tree
Hide file tree
Showing 3 changed files with 110 additions and 110 deletions.
128 changes: 64 additions & 64 deletions packages/eva/mapping.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@
"state": {
"disabled": {
"borderColor": "border-basic-color-3",
"backgroundColor": "border-basic-color-3",
"backgroundColor": "background-basic-color-3",
"textColor": "text-disabled-color",
"iconTintColor": "text-disabled-color"
}
Expand Down Expand Up @@ -454,19 +454,22 @@
}
},
"white": {
"backgroundColor": "color-white",
"backgroundColor": "color-basic-100",
"borderColor": "color-basic-100",
"textColor": "color-primary-default",
"iconTintColor": "color-primary-default",
"state": {
"active": {
"backgroundColor": "color-white",
"backgroundColor": "color-basic-300",
"borderColor": "color-basic-300",
"textColor": "color-primary-active",
"iconTintColor": "color-primary-active"
},
"disabled": {
"backgroundColor": "color-white",
"textColor": "color-primary-disabled",
"iconTintColor": "color-primary-disabled"
"backgroundColor": "color-basic-300",
"borderColor": "color-basic-300",
"textColor": "color-basic-500",
"iconTintColor": "color-basic-500"
}
}
}
Expand Down Expand Up @@ -610,15 +613,15 @@
}
},
"white": {
"backgroundColor": "transparent",
"backgroundColor": "background-basic-color-2",
"state": {
"active": {
"backgroundColor": "transparent"
"borderColor": "color-basic-300",
"backgroundColor": "background-basic-color-2"
},
"disabled": {
"backgroundColor": "transparent",
"borderColor": "transparent",
"textColor": "text-primary-disabled-color"
"borderColor": "color-basic-300",
"backgroundColor": "background-basic-color-3"
}
}
}
Expand Down Expand Up @@ -721,14 +724,16 @@
}
},
"white": {
"borderColor": "transparent",
"backgroundColor": "transparent",
"state": {
"active": {
"borderColor": "transparent",
"backgroundColor": "transparent"
},
"disabled": {
"backgroundColor": "transparent",
"textColor": "text-primary-disabled-color"
"borderColor": "transparent",
"backgroundColor": "transparent"
}
}
}
Expand Down Expand Up @@ -809,9 +814,10 @@
"appearances": {
"filled": {
"mapping": {
"borderWidth": 1,
"borderRadius": 8,
"borderColor": "transparent",
"dividerWidth": 1
"dividerWidth": 1,
"borderColor": "transparent"
},
"variantGroups": {
"size": {
Expand All @@ -838,15 +844,13 @@
"dividerBackgroundColor": "border-danger-color-2"
},
"white": {
"dividerBackgroundColor": "color-white"
"dividerBackgroundColor": "color-basic-200"
}
}
}
},
"outline": {
"mapping": {
"borderWidth": 2
},
"mapping": {},
"variantGroups": {
"status": {
"primary": {
Expand All @@ -870,14 +874,11 @@
"dividerBackgroundColor": "color-danger-default"
},
"white": {
"borderColor": "color-white",
"dividerBackgroundColor": "color-white"
"borderColor": "color-basic-100",
"dividerBackgroundColor": "color-basic-100"
}
}
}
},
"ghost": {
"mapping": {}
}
}
},
Expand Down Expand Up @@ -964,9 +965,6 @@
},
"info": {
"default": false
},
"white": {
"default": false
}
}
},
Expand Down Expand Up @@ -1120,24 +1118,6 @@
"borderColor": "color-danger-focus"
}
}
},
"white": {
"borderColor": "color-white",
"backgroundColor": "color-white",
"state": {
"active": {
"borderColor": "color-white",
"backgroundColor": "color-white"
},
"checked": {
"backgroundColor": "color-white",
"borderColor": "color-white",
"iconTintColor": "color-primary-default"
},
"indeterminate": {
"iconTintColor": "color-primary-default"
}
}
}
}
}
Expand Down Expand Up @@ -1264,6 +1244,17 @@
"danger": {
"default": false
}
},
"size": {
"small": {
"default": false
},
"medium": {
"default": true
},
"large": {
"default": false
}
}
},
"states": {
Expand All @@ -1282,27 +1273,19 @@
"appearances": {
"default": {
"mapping": {
"paddingVertical": 7,
"paddingHorizontal": 8,
"minHeight": 48,
"borderRadius": 4,
"borderWidth": 2,
"borderWidth": 1,
"paddingHorizontal": 8,
"borderColor": "border-basic-color-3",
"backgroundColor": "background-basic-color-2",
"textMarginHorizontal": 8,
"textFontSize": "text-subtitle-1-font-size",
"textLineHeight": "text-subtitle-1-line-height",
"textFontWeight": "normal",
"textColor": "text-hint-color",
"placeholderColor": "text-hint-color",
"iconWidth": 24,
"iconHeight": 24,
"iconMarginHorizontal": 8,
"iconTintColor": "icon-hint-color",
"labelColor": "text-hint-color",
"labelFontSize": "text-label-font-size",
"labelLineHeight": "text-label-line-height",
"labelFontWeight": "text-label-font-weight",
"labelMarginBottom": 4,
"captionMarginTop": 4,
"captionColor": "text-hint-color",
Expand Down Expand Up @@ -1399,6 +1382,29 @@
}
}
}
},
"size": {
"small": {
"minHeight": 40,
"paddingVertical": 3,
"textFontSize": "text-subtitle-2-font-size",
"textLineHeight": "text-subtitle-2-line-height",
"textFontWeight": "normal"
},
"medium": {
"minHeight": 48,
"paddingVertical": 7,
"textFontSize": "text-subtitle-1-font-size",
"textLineHeight": "text-subtitle-1-line-height",
"textFontWeight": "normal"
},
"large": {
"minHeight": 56,
"paddingVertical": 11,
"textFontSize": "text-subtitle-1-font-size",
"textLineHeight": "text-subtitle-1-line-height",
"textFontWeight": "normal"
}
}
}
}
Expand Down Expand Up @@ -2152,10 +2158,7 @@
"alternative": {
"default": false
},
"hintLight": {
"default": false
},
"hintDark": {
"hint": {
"default": false
}
},
Expand Down Expand Up @@ -2197,9 +2200,6 @@
"c2": {
"default": false
},
"overline": {
"default": false
},
"label": {
"default": false
}
Expand Down Expand Up @@ -2819,10 +2819,10 @@
"iconWidth": 24,
"iconHeight": 24,
"iconMarginHorizontal": 8,
"iconTintColor": "text-basic-color",
"iconTintColor": "background-alternative-color-1",
"state": {
"active": {
"iconTintColor": "color-basic-900"
"iconTintColor": "background-alternative-color-3"
}
}
}
Expand Down
46 changes: 23 additions & 23 deletions packages/eva/themes/dark.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,29 +144,29 @@
"border-primary-color-4": "$color-primary-800",
"border-primary-color-5": "$color-primary-900",

"border-success-color-1": "$color-success-500",
"border-success-color-2": "$color-success-600",
"border-success-color-3": "$color-success-700",
"border-success-color-4": "$color-success-800",
"border-success-color-5": "$color-success-900",

"border-info-color-1": "$color-info-500",
"border-info-color-2": "$color-info-600",
"border-info-color-3": "$color-info-700",
"border-info-color-4": "$color-info-800",
"border-info-color-5": "$color-info-900",

"border-warning-color-1": "$color-warning-500",
"border-warning-color-2": "$color-warning-600",
"border-warning-color-3": "$color-warning-700",
"border-warning-color-4": "$color-warning-800",
"border-warning-color-5": "$color-warning-900",

"border-danger-color-1": "$color-danger-500",
"border-danger-color-2": "$color-danger-600",
"border-danger-color-3": "$color-danger-700",
"border-danger-color-4": "$color-danger-800",
"border-danger-color-5": "$color-danger-900",
"border-success-color-1": "$color-success-500",
"border-success-color-2": "$color-success-600",
"border-success-color-3": "$color-success-700",
"border-success-color-4": "$color-success-800",
"border-success-color-5": "$color-success-900",

"border-info-color-1": "$color-info-500",
"border-info-color-2": "$color-info-600",
"border-info-color-3": "$color-info-700",
"border-info-color-4": "$color-info-800",
"border-info-color-5": "$color-info-900",

"border-warning-color-1": "$color-warning-500",
"border-warning-color-2": "$color-warning-600",
"border-warning-color-3": "$color-warning-700",
"border-warning-color-4": "$color-warning-800",
"border-warning-color-5": "$color-warning-900",

"border-danger-color-1": "$color-danger-500",
"border-danger-color-2": "$color-danger-600",
"border-danger-color-3": "$color-danger-700",
"border-danger-color-4": "$color-danger-800",
"border-danger-color-5": "$color-danger-900",

"text-basic-color": "$color-basic-100",
"text-alternate-color": "$color-basic-900",
Expand Down
46 changes: 23 additions & 23 deletions packages/eva/themes/light.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,29 +144,29 @@
"border-primary-color-4": "$color-primary-800",
"border-primary-color-5": "$color-primary-900",

"border-success-color-1": "$color-success-500",
"border-success-color-2": "$color-success-600",
"border-success-color-3": "$color-success-700",
"border-success-color-4": "$color-success-800",
"border-success-color-5": "$color-success-900",

"border-info-color-1": "$color-info-500",
"border-info-color-2": "$color-info-600",
"border-info-color-3": "$color-info-700",
"border-info-color-4": "$color-info-800",
"border-info-color-5": "$color-info-900",

"border-warning-color-1": "$color-warning-500",
"border-warning-color-2": "$color-warning-600",
"border-warning-color-3": "$color-warning-700",
"border-warning-color-4": "$color-warning-800",
"border-warning-color-5": "$color-warning-900",

"border-danger-color-1": "$color-danger-500",
"border-danger-color-2": "$color-danger-600",
"border-danger-color-3": "$color-danger-700",
"border-danger-color-4": "$color-danger-800",
"border-danger-color-5": "$color-danger-900",
"border-success-color-1": "$color-success-500",
"border-success-color-2": "$color-success-600",
"border-success-color-3": "$color-success-700",
"border-success-color-4": "$color-success-800",
"border-success-color-5": "$color-success-900",

"border-info-color-1": "$color-info-500",
"border-info-color-2": "$color-info-600",
"border-info-color-3": "$color-info-700",
"border-info-color-4": "$color-info-800",
"border-info-color-5": "$color-info-900",

"border-warning-color-1": "$color-warning-500",
"border-warning-color-2": "$color-warning-600",
"border-warning-color-3": "$color-warning-700",
"border-warning-color-4": "$color-warning-800",
"border-warning-color-5": "$color-warning-900",

"border-danger-color-1": "$color-danger-500",
"border-danger-color-2": "$color-danger-600",
"border-danger-color-3": "$color-danger-700",
"border-danger-color-4": "$color-danger-800",
"border-danger-color-5": "$color-danger-900",

"text-basic-color": "$color-basic-900",
"text-alternate-color": "$color-basic-100",
Expand Down

0 comments on commit 60b2626

Please sign in to comment.