From 242f35d7610dd8995fd41624c474db3150fa133e Mon Sep 17 00:00:00 2001 From: Ben Griffin Date: Mon, 19 Dec 2022 12:08:26 -0800 Subject: [PATCH 1/4] Update chip color tokens --- dist/android/colors.xml | 11 ++++---- dist/ios/CdrColor.h | 1 + dist/ios/CdrColor.m | 9 ++++--- dist/js/cdr-tokens.common.js | 11 ++++---- dist/js/cdr-tokens.mjs | 11 ++++---- dist/json/android.json | 46 ++++++++++++++++++++++++++-------- dist/json/global.json | 46 ++++++++++++++++++++++++++-------- dist/json/ios.json | 46 ++++++++++++++++++++++++++-------- dist/json/platform-tokens.json | 46 ++++++++++++++++++++++++++-------- dist/json/web.json | 46 ++++++++++++++++++++++++++-------- dist/less/cdr-tokens.less | 11 ++++---- dist/scss/cdr-tokens.scss | 11 ++++---- dist/sketch/sketch.json | 21 ++++++++++++---- tokens/global/chip.json5 | 20 +++++++++++---- 14 files changed, 247 insertions(+), 89 deletions(-) diff --git a/dist/android/colors.xml b/dist/android/colors.xml index 4b3ac123..04ce7a53 100644 --- a/dist/android/colors.xml +++ b/dist/android/colors.xml @@ -18,7 +18,7 @@ #ffc7370f #ffffffff #ffffffff - #ff4e4d49 + #bf0c0b08 #ffd1cbbd #bf0c0b08 #bf423b2f @@ -74,12 +74,13 @@ #fff4f2ed #ffffffff #ffffffff - #fff9f8f6 + #fff4f2ed #ffffffff #ffedeae3 - #ffedeae3 - #ffedeae3 - #ffedeae3 + #ffdcd6cb + #ffdcd6cb + #ffdcd6cb + #ffedeae3 #ffffffff #fff4f2ed #ff1f513f diff --git a/dist/ios/CdrColor.h b/dist/ios/CdrColor.h index 064632f3..958f604d 100644 --- a/dist/ios/CdrColor.h +++ b/dist/ios/CdrColor.h @@ -87,6 +87,7 @@ CdrColorBackgroundChipDefaultActive, CdrColorBackgroundChipDefaultSelected, CdrColorBackgroundChipDefaultSelectedHover, CdrColorBackgroundChipDefaultSelectedFocus, +CdrColorBackgroundChipDefaultSelectedActive, CdrColorBackgroundPrimary, CdrColorBackgroundSecondary, CdrColorBackgroundBrandSpruce, diff --git a/dist/ios/CdrColor.m b/dist/ios/CdrColor.m index 7d17b418..4cdd6e22 100644 --- a/dist/ios/CdrColor.m +++ b/dist/ios/CdrColor.m @@ -36,7 +36,7 @@ + (NSArray *)values { [UIColor colorWithRed:0.780f green:0.216f blue:0.059f alpha:1.000f], [UIColor colorWithRed:1.000f green:1.000f blue:1.000f alpha:1.000f], [UIColor colorWithRed:1.000f green:1.000f blue:1.000f alpha:1.000f], -[UIColor colorWithRed:0.306f green:0.302f blue:0.286f alpha:1.000f], +[UIColor colorWithRed:0.047f green:0.043f blue:0.031f alpha:0.749f], [UIColor colorWithRed:0.820f green:0.796f blue:0.741f alpha:1.000f], [UIColor colorWithRed:0.047f green:0.043f blue:0.031f alpha:0.749f], [UIColor colorWithRed:0.259f green:0.231f blue:0.184f alpha:0.749f], @@ -92,11 +92,12 @@ + (NSArray *)values { [UIColor colorWithRed:0.957f green:0.949f blue:0.929f alpha:1.000f], [UIColor colorWithRed:1.000f green:1.000f blue:1.000f alpha:1.000f], [UIColor colorWithRed:1.000f green:1.000f blue:1.000f alpha:1.000f], -[UIColor colorWithRed:0.976f green:0.973f blue:0.965f alpha:1.000f], +[UIColor colorWithRed:0.957f green:0.949f blue:0.929f alpha:1.000f], [UIColor colorWithRed:1.000f green:1.000f blue:1.000f alpha:1.000f], [UIColor colorWithRed:0.929f green:0.918f blue:0.890f alpha:1.000f], -[UIColor colorWithRed:0.929f green:0.918f blue:0.890f alpha:1.000f], -[UIColor colorWithRed:0.929f green:0.918f blue:0.890f alpha:1.000f], +[UIColor colorWithRed:0.863f green:0.839f blue:0.796f alpha:1.000f], +[UIColor colorWithRed:0.863f green:0.839f blue:0.796f alpha:1.000f], +[UIColor colorWithRed:0.863f green:0.839f blue:0.796f alpha:1.000f], [UIColor colorWithRed:0.929f green:0.918f blue:0.890f alpha:1.000f], [UIColor colorWithRed:1.000f green:1.000f blue:1.000f alpha:1.000f], [UIColor colorWithRed:0.957f green:0.949f blue:0.929f alpha:1.000f], diff --git a/dist/js/cdr-tokens.common.js b/dist/js/cdr-tokens.common.js index 6c0561e9..12a0a3aa 100644 --- a/dist/js/cdr-tokens.common.js +++ b/dist/js/cdr-tokens.common.js @@ -15,7 +15,7 @@ module.exports = { CdrColorTextButtonSaleHover: "#c7370f", CdrColorTextButtonSaleActive: "#ffffff", CdrColorTextButtonSaleDisabled: "#ffffff", - CdrColorTextChipDefault: "#4e4d49", + CdrColorTextChipDefault: "rgba(12, 11, 8, 0.75)", CdrColorTextChipDisabled: "#d1cbbd", CdrColorTextPrimary: "rgba(12, 11, 8, 0.75)", CdrColorTextSecondary: "rgba(66, 59, 47, 0.75)", @@ -71,12 +71,13 @@ module.exports = { CdrColorBackgroundButtonIconOnlyActive: "#f4f2ed", CdrColorBackgroundChipDefaultRest: "#ffffff", CdrColorBackgroundChipDefaultDisabled: "#ffffff", - CdrColorBackgroundChipDefaultHover: "#f9f8f6", + CdrColorBackgroundChipDefaultHover: "#f4f2ed", CdrColorBackgroundChipDefaultFocus: "#ffffff", CdrColorBackgroundChipDefaultActive: "#edeae3", - CdrColorBackgroundChipDefaultSelected: "#edeae3", - CdrColorBackgroundChipDefaultSelectedHover: "#edeae3", - CdrColorBackgroundChipDefaultSelectedFocus: "#edeae3", + CdrColorBackgroundChipDefaultSelected: "#dcd6cb", + CdrColorBackgroundChipDefaultSelectedHover: "#dcd6cb", + CdrColorBackgroundChipDefaultSelectedFocus: "#dcd6cb", + CdrColorBackgroundChipDefaultSelectedActive: "#edeae3", CdrColorBackgroundPrimary: "#ffffff", CdrColorBackgroundSecondary: "#f4f2ed", CdrColorBackgroundBrandSpruce: "#1f513f", diff --git a/dist/js/cdr-tokens.mjs b/dist/js/cdr-tokens.mjs index 8a6013ae..a6f95e1b 100644 --- a/dist/js/cdr-tokens.mjs +++ b/dist/js/cdr-tokens.mjs @@ -14,7 +14,7 @@ export const CdrColorTextButtonSale = "#ffffff"; export const CdrColorTextButtonSaleHover = "#c7370f"; export const CdrColorTextButtonSaleActive = "#ffffff"; export const CdrColorTextButtonSaleDisabled = "#ffffff"; -export const CdrColorTextChipDefault = "#4e4d49"; +export const CdrColorTextChipDefault = "rgba(12, 11, 8, 0.75)"; export const CdrColorTextChipDisabled = "#d1cbbd"; export const CdrColorTextPrimary = "rgba(12, 11, 8, 0.75)"; export const CdrColorTextSecondary = "rgba(66, 59, 47, 0.75)"; @@ -70,12 +70,13 @@ export const CdrColorBackgroundButtonDefaultDisabled = "#dcd6cb"; export const CdrColorBackgroundButtonIconOnlyActive = "#f4f2ed"; export const CdrColorBackgroundChipDefaultRest = "#ffffff"; export const CdrColorBackgroundChipDefaultDisabled = "#ffffff"; -export const CdrColorBackgroundChipDefaultHover = "#f9f8f6"; +export const CdrColorBackgroundChipDefaultHover = "#f4f2ed"; export const CdrColorBackgroundChipDefaultFocus = "#ffffff"; export const CdrColorBackgroundChipDefaultActive = "#edeae3"; -export const CdrColorBackgroundChipDefaultSelected = "#edeae3"; -export const CdrColorBackgroundChipDefaultSelectedHover = "#edeae3"; -export const CdrColorBackgroundChipDefaultSelectedFocus = "#edeae3"; +export const CdrColorBackgroundChipDefaultSelected = "#dcd6cb"; +export const CdrColorBackgroundChipDefaultSelectedHover = "#dcd6cb"; +export const CdrColorBackgroundChipDefaultSelectedFocus = "#dcd6cb"; +export const CdrColorBackgroundChipDefaultSelectedActive = "#edeae3"; export const CdrColorBackgroundPrimary = "#ffffff"; export const CdrColorBackgroundSecondary = "#f4f2ed"; export const CdrColorBackgroundBrandSpruce = "#1f513f"; diff --git a/dist/json/android.json b/dist/json/android.json index a6ffdef4..c1e20525 100644 --- a/dist/json/android.json +++ b/dist/json/android.json @@ -433,7 +433,7 @@ } }, { - "value": "#ff4e4d49", + "value": "#bf0c0b08", "category": "color", "docs": { "category": "colors", @@ -442,7 +442,7 @@ "description": "Text color for default chips" }, "original": { - "value": "{options.color.warm-grey-900.value}", + "value": "{options.color.warm-grey-900-75.value}", "category": "color", "docs": { "category": "colors", @@ -1889,7 +1889,7 @@ } }, { - "value": "#fff9f8f6", + "value": "#fff4f2ed", "category": "color", "docs": { "category": "colors", @@ -1898,7 +1898,7 @@ "description": "Background color for hovered chips" }, "original": { - "value": "{options.color.warm-grey-100.value}", + "value": "{options.color.warm-grey-200.value}", "category": "color", "docs": { "category": "colors", @@ -1967,7 +1967,7 @@ } }, { - "value": "#ffedeae3", + "value": "#ffdcd6cb", "category": "color", "docs": { "category": "colors", @@ -1976,7 +1976,7 @@ "description": "Background color for selected chips" }, "original": { - "value": "{options.color.warm-grey-300.value}", + "value": "{options.color.warm-grey-400.value}", "category": "color", "docs": { "category": "colors", @@ -1993,7 +1993,7 @@ } }, { - "value": "#ffedeae3", + "value": "#ffdcd6cb", "category": "color", "docs": { "category": "colors", @@ -2002,7 +2002,7 @@ "description": "Background color for hovered selected chips" }, "original": { - "value": "{options.color.warm-grey-300.value}", + "value": "{options.color.warm-grey-400.value}", "category": "color", "docs": { "category": "colors", @@ -2019,7 +2019,7 @@ } }, { - "value": "#ffedeae3", + "value": "#ffdcd6cb", "category": "color", "docs": { "category": "colors", @@ -2028,7 +2028,7 @@ "description": "Background color for focused selected chips" }, "original": { - "value": "{options.color.warm-grey-300.value}", + "value": "{options.color.warm-grey-400.value}", "category": "color", "docs": { "category": "colors", @@ -2044,6 +2044,32 @@ "category": "color" } }, + { + "value": "#ffedeae3", + "category": "color", + "docs": { + "category": "colors", + "type": "chip", + "example": "color", + "description": "Background color for active selected chips" + }, + "original": { + "value": "{options.color.warm-grey-300.value}", + "category": "color", + "docs": { + "category": "colors", + "type": "chip", + "example": "color", + "description": "Background color for active selected chips" + } + }, + "name": "cdr_color_background_chip_default_selected_active", + "attributes": { + "option": false, + "deprecated": false, + "category": "color" + } + }, { "value": "#ffffffff", "category": "color", diff --git a/dist/json/global.json b/dist/json/global.json index b6297ba0..a9ac95c9 100644 --- a/dist/json/global.json +++ b/dist/json/global.json @@ -433,7 +433,7 @@ } }, { - "value": "#4e4d49", + "value": "rgba(12, 11, 8, 0.75)", "category": "color", "docs": { "category": "colors", @@ -442,7 +442,7 @@ "description": "Text color for default chips" }, "original": { - "value": "{options.color.warm-grey-900.value}", + "value": "{options.color.warm-grey-900-75.value}", "category": "color", "docs": { "category": "colors", @@ -1889,7 +1889,7 @@ } }, { - "value": "#f9f8f6", + "value": "#f4f2ed", "category": "color", "docs": { "category": "colors", @@ -1898,7 +1898,7 @@ "description": "Background color for hovered chips" }, "original": { - "value": "{options.color.warm-grey-100.value}", + "value": "{options.color.warm-grey-200.value}", "category": "color", "docs": { "category": "colors", @@ -1967,7 +1967,7 @@ } }, { - "value": "#edeae3", + "value": "#dcd6cb", "category": "color", "docs": { "category": "colors", @@ -1976,7 +1976,7 @@ "description": "Background color for selected chips" }, "original": { - "value": "{options.color.warm-grey-300.value}", + "value": "{options.color.warm-grey-400.value}", "category": "color", "docs": { "category": "colors", @@ -1993,7 +1993,7 @@ } }, { - "value": "#edeae3", + "value": "#dcd6cb", "category": "color", "docs": { "category": "colors", @@ -2002,7 +2002,7 @@ "description": "Background color for hovered selected chips" }, "original": { - "value": "{options.color.warm-grey-300.value}", + "value": "{options.color.warm-grey-400.value}", "category": "color", "docs": { "category": "colors", @@ -2019,7 +2019,7 @@ } }, { - "value": "#edeae3", + "value": "#dcd6cb", "category": "color", "docs": { "category": "colors", @@ -2028,7 +2028,7 @@ "description": "Background color for focused selected chips" }, "original": { - "value": "{options.color.warm-grey-300.value}", + "value": "{options.color.warm-grey-400.value}", "category": "color", "docs": { "category": "colors", @@ -2044,6 +2044,32 @@ "category": "color" } }, + { + "value": "#edeae3", + "category": "color", + "docs": { + "category": "colors", + "type": "chip", + "example": "color", + "description": "Background color for active selected chips" + }, + "original": { + "value": "{options.color.warm-grey-300.value}", + "category": "color", + "docs": { + "category": "colors", + "type": "chip", + "example": "color", + "description": "Background color for active selected chips" + } + }, + "name": "cdr-color-background-chip-default-selected-active", + "attributes": { + "option": false, + "deprecated": false, + "category": "color" + } + }, { "value": "#ffffff", "category": "color", diff --git a/dist/json/ios.json b/dist/json/ios.json index 6ea75fa2..3e796395 100644 --- a/dist/json/ios.json +++ b/dist/json/ios.json @@ -433,7 +433,7 @@ } }, { - "value": "[UIColor colorWithRed:0.306f green:0.302f blue:0.286f alpha:1.000f]", + "value": "[UIColor colorWithRed:0.047f green:0.043f blue:0.031f alpha:0.749f]", "category": "color", "docs": { "category": "colors", @@ -442,7 +442,7 @@ "description": "Text color for default chips" }, "original": { - "value": "{options.color.warm-grey-900.value}", + "value": "{options.color.warm-grey-900-75.value}", "category": "color", "docs": { "category": "colors", @@ -1889,7 +1889,7 @@ } }, { - "value": "[UIColor colorWithRed:0.976f green:0.973f blue:0.965f alpha:1.000f]", + "value": "[UIColor colorWithRed:0.957f green:0.949f blue:0.929f alpha:1.000f]", "category": "color", "docs": { "category": "colors", @@ -1898,7 +1898,7 @@ "description": "Background color for hovered chips" }, "original": { - "value": "{options.color.warm-grey-100.value}", + "value": "{options.color.warm-grey-200.value}", "category": "color", "docs": { "category": "colors", @@ -1967,7 +1967,7 @@ } }, { - "value": "[UIColor colorWithRed:0.929f green:0.918f blue:0.890f alpha:1.000f]", + "value": "[UIColor colorWithRed:0.863f green:0.839f blue:0.796f alpha:1.000f]", "category": "color", "docs": { "category": "colors", @@ -1976,7 +1976,7 @@ "description": "Background color for selected chips" }, "original": { - "value": "{options.color.warm-grey-300.value}", + "value": "{options.color.warm-grey-400.value}", "category": "color", "docs": { "category": "colors", @@ -1993,7 +1993,7 @@ } }, { - "value": "[UIColor colorWithRed:0.929f green:0.918f blue:0.890f alpha:1.000f]", + "value": "[UIColor colorWithRed:0.863f green:0.839f blue:0.796f alpha:1.000f]", "category": "color", "docs": { "category": "colors", @@ -2002,7 +2002,7 @@ "description": "Background color for hovered selected chips" }, "original": { - "value": "{options.color.warm-grey-300.value}", + "value": "{options.color.warm-grey-400.value}", "category": "color", "docs": { "category": "colors", @@ -2019,7 +2019,7 @@ } }, { - "value": "[UIColor colorWithRed:0.929f green:0.918f blue:0.890f alpha:1.000f]", + "value": "[UIColor colorWithRed:0.863f green:0.839f blue:0.796f alpha:1.000f]", "category": "color", "docs": { "category": "colors", @@ -2028,7 +2028,7 @@ "description": "Background color for focused selected chips" }, "original": { - "value": "{options.color.warm-grey-300.value}", + "value": "{options.color.warm-grey-400.value}", "category": "color", "docs": { "category": "colors", @@ -2044,6 +2044,32 @@ "category": "color" } }, + { + "value": "[UIColor colorWithRed:0.929f green:0.918f blue:0.890f alpha:1.000f]", + "category": "color", + "docs": { + "category": "colors", + "type": "chip", + "example": "color", + "description": "Background color for active selected chips" + }, + "original": { + "value": "{options.color.warm-grey-300.value}", + "category": "color", + "docs": { + "category": "colors", + "type": "chip", + "example": "color", + "description": "Background color for active selected chips" + } + }, + "name": "CdrColorBackgroundChipDefaultSelectedActive", + "attributes": { + "option": false, + "deprecated": false, + "category": "color" + } + }, { "value": "[UIColor colorWithRed:1.000f green:1.000f blue:1.000f alpha:1.000f]", "category": "color", diff --git a/dist/json/platform-tokens.json b/dist/json/platform-tokens.json index 3fedc0a1..405ac5d9 100644 --- a/dist/json/platform-tokens.json +++ b/dist/json/platform-tokens.json @@ -434,7 +434,7 @@ } }, { - "value": "#4e4d49", + "value": "rgba(12, 11, 8, 0.75)", "category": "color", "docs": { "category": "colors", @@ -443,7 +443,7 @@ "description": "Text color for default chips" }, "original": { - "value": "{options.color.warm-grey-900.value}", + "value": "{options.color.warm-grey-900-75.value}", "category": "color", "docs": { "category": "colors", @@ -1890,7 +1890,7 @@ } }, { - "value": "#f9f8f6", + "value": "#f4f2ed", "category": "color", "docs": { "category": "colors", @@ -1899,7 +1899,7 @@ "description": "Background color for hovered chips" }, "original": { - "value": "{options.color.warm-grey-100.value}", + "value": "{options.color.warm-grey-200.value}", "category": "color", "docs": { "category": "colors", @@ -1968,7 +1968,7 @@ } }, { - "value": "#edeae3", + "value": "#dcd6cb", "category": "color", "docs": { "category": "colors", @@ -1977,7 +1977,7 @@ "description": "Background color for selected chips" }, "original": { - "value": "{options.color.warm-grey-300.value}", + "value": "{options.color.warm-grey-400.value}", "category": "color", "docs": { "category": "colors", @@ -1994,7 +1994,7 @@ } }, { - "value": "#edeae3", + "value": "#dcd6cb", "category": "color", "docs": { "category": "colors", @@ -2003,7 +2003,7 @@ "description": "Background color for hovered selected chips" }, "original": { - "value": "{options.color.warm-grey-300.value}", + "value": "{options.color.warm-grey-400.value}", "category": "color", "docs": { "category": "colors", @@ -2020,7 +2020,7 @@ } }, { - "value": "#edeae3", + "value": "#dcd6cb", "category": "color", "docs": { "category": "colors", @@ -2029,7 +2029,7 @@ "description": "Background color for focused selected chips" }, "original": { - "value": "{options.color.warm-grey-300.value}", + "value": "{options.color.warm-grey-400.value}", "category": "color", "docs": { "category": "colors", @@ -2045,6 +2045,32 @@ "category": "color" } }, + { + "value": "#edeae3", + "category": "color", + "docs": { + "category": "colors", + "type": "chip", + "example": "color", + "description": "Background color for active selected chips" + }, + "original": { + "value": "{options.color.warm-grey-300.value}", + "category": "color", + "docs": { + "category": "colors", + "type": "chip", + "example": "color", + "description": "Background color for active selected chips" + } + }, + "name": "cdr-color-background-chip-default-selected-active", + "attributes": { + "option": false, + "deprecated": false, + "category": "color" + } + }, { "value": "#ffffff", "category": "color", diff --git a/dist/json/web.json b/dist/json/web.json index 58b41bbf..13362671 100644 --- a/dist/json/web.json +++ b/dist/json/web.json @@ -433,7 +433,7 @@ } }, { - "value": "#4e4d49", + "value": "rgba(12, 11, 8, 0.75)", "category": "color", "docs": { "category": "colors", @@ -442,7 +442,7 @@ "description": "Text color for default chips" }, "original": { - "value": "{options.color.warm-grey-900.value}", + "value": "{options.color.warm-grey-900-75.value}", "category": "color", "docs": { "category": "colors", @@ -1889,7 +1889,7 @@ } }, { - "value": "#f9f8f6", + "value": "#f4f2ed", "category": "color", "docs": { "category": "colors", @@ -1898,7 +1898,7 @@ "description": "Background color for hovered chips" }, "original": { - "value": "{options.color.warm-grey-100.value}", + "value": "{options.color.warm-grey-200.value}", "category": "color", "docs": { "category": "colors", @@ -1967,7 +1967,7 @@ } }, { - "value": "#edeae3", + "value": "#dcd6cb", "category": "color", "docs": { "category": "colors", @@ -1976,7 +1976,7 @@ "description": "Background color for selected chips" }, "original": { - "value": "{options.color.warm-grey-300.value}", + "value": "{options.color.warm-grey-400.value}", "category": "color", "docs": { "category": "colors", @@ -1993,7 +1993,7 @@ } }, { - "value": "#edeae3", + "value": "#dcd6cb", "category": "color", "docs": { "category": "colors", @@ -2002,7 +2002,7 @@ "description": "Background color for hovered selected chips" }, "original": { - "value": "{options.color.warm-grey-300.value}", + "value": "{options.color.warm-grey-400.value}", "category": "color", "docs": { "category": "colors", @@ -2019,7 +2019,7 @@ } }, { - "value": "#edeae3", + "value": "#dcd6cb", "category": "color", "docs": { "category": "colors", @@ -2028,7 +2028,7 @@ "description": "Background color for focused selected chips" }, "original": { - "value": "{options.color.warm-grey-300.value}", + "value": "{options.color.warm-grey-400.value}", "category": "color", "docs": { "category": "colors", @@ -2044,6 +2044,32 @@ "category": "color" } }, + { + "value": "#edeae3", + "category": "color", + "docs": { + "category": "colors", + "type": "chip", + "example": "color", + "description": "Background color for active selected chips" + }, + "original": { + "value": "{options.color.warm-grey-300.value}", + "category": "color", + "docs": { + "category": "colors", + "type": "chip", + "example": "color", + "description": "Background color for active selected chips" + } + }, + "name": "cdr-color-background-chip-default-selected-active", + "attributes": { + "option": false, + "deprecated": false, + "category": "color" + } + }, { "value": "#ffffff", "category": "color", diff --git a/dist/less/cdr-tokens.less b/dist/less/cdr-tokens.less index 76c9d640..06fe0492 100644 --- a/dist/less/cdr-tokens.less +++ b/dist/less/cdr-tokens.less @@ -690,7 +690,7 @@ @cdr-color-text-button-sale-hover: #c7370f; @cdr-color-text-button-sale-active: #ffffff; @cdr-color-text-button-sale-disabled: #ffffff; -@cdr-color-text-chip-default: #4e4d49; +@cdr-color-text-chip-default: rgba(12, 11, 8, 0.75); @cdr-color-text-chip-disabled: #d1cbbd; @cdr-color-text-primary: rgba(12, 11, 8, 0.75); @cdr-color-text-secondary: rgba(66, 59, 47, 0.75); @@ -746,12 +746,13 @@ @cdr-color-background-button-icon-only-active: #f4f2ed; @cdr-color-background-chip-default-rest: #ffffff; @cdr-color-background-chip-default-disabled: #ffffff; -@cdr-color-background-chip-default-hover: #f9f8f6; +@cdr-color-background-chip-default-hover: #f4f2ed; @cdr-color-background-chip-default-focus: #ffffff; @cdr-color-background-chip-default-active: #edeae3; -@cdr-color-background-chip-default-selected: #edeae3; -@cdr-color-background-chip-default-selected-hover: #edeae3; -@cdr-color-background-chip-default-selected-focus: #edeae3; +@cdr-color-background-chip-default-selected: #dcd6cb; +@cdr-color-background-chip-default-selected-hover: #dcd6cb; +@cdr-color-background-chip-default-selected-focus: #dcd6cb; +@cdr-color-background-chip-default-selected-active: #edeae3; @cdr-color-background-primary: #ffffff; @cdr-color-background-secondary: #f4f2ed; @cdr-color-background-brand-spruce: #1f513f; diff --git a/dist/scss/cdr-tokens.scss b/dist/scss/cdr-tokens.scss index 9d016ebb..9f703557 100644 --- a/dist/scss/cdr-tokens.scss +++ b/dist/scss/cdr-tokens.scss @@ -1370,7 +1370,7 @@ $cdr-color-text-button-sale: #ffffff; $cdr-color-text-button-sale-hover: #c7370f; $cdr-color-text-button-sale-active: #ffffff; $cdr-color-text-button-sale-disabled: #ffffff; -$cdr-color-text-chip-default: #4e4d49; +$cdr-color-text-chip-default: rgba(12, 11, 8, 0.75); $cdr-color-text-chip-disabled: #d1cbbd; $cdr-color-text-primary: rgba(12, 11, 8, 0.75); $cdr-color-text-secondary: rgba(66, 59, 47, 0.75); @@ -1426,12 +1426,13 @@ $cdr-color-background-button-default-disabled: #dcd6cb; $cdr-color-background-button-icon-only-active: #f4f2ed; $cdr-color-background-chip-default-rest: #ffffff; $cdr-color-background-chip-default-disabled: #ffffff; -$cdr-color-background-chip-default-hover: #f9f8f6; +$cdr-color-background-chip-default-hover: #f4f2ed; $cdr-color-background-chip-default-focus: #ffffff; $cdr-color-background-chip-default-active: #edeae3; -$cdr-color-background-chip-default-selected: #edeae3; -$cdr-color-background-chip-default-selected-hover: #edeae3; -$cdr-color-background-chip-default-selected-focus: #edeae3; +$cdr-color-background-chip-default-selected: #dcd6cb; +$cdr-color-background-chip-default-selected-hover: #dcd6cb; +$cdr-color-background-chip-default-selected-focus: #dcd6cb; +$cdr-color-background-chip-default-selected-active: #edeae3; $cdr-color-background-primary: #ffffff; $cdr-color-background-secondary: #f4f2ed; $cdr-color-background-brand-spruce: #1f513f; diff --git a/dist/sketch/sketch.json b/dist/sketch/sketch.json index da2d1d21..e77e71f9 100644 --- a/dist/sketch/sketch.json +++ b/dist/sketch/sketch.json @@ -178,7 +178,7 @@ }, { "name": "cdr-color-text-chip-default", - "value": "#4e4d49", + "value": "#0c0b08bf", "type": "text", "path": [ "color", @@ -797,7 +797,7 @@ }, { "name": "cdr-color-background-chip-default-hover", - "value": "#f9f8f6", + "value": "#f4f2ed", "type": "background", "path": [ "color", @@ -830,7 +830,7 @@ }, { "name": "cdr-color-background-chip-default-selected", - "value": "#edeae3", + "value": "#dcd6cb", "type": "background", "path": [ "color", @@ -841,7 +841,7 @@ }, { "name": "cdr-color-background-chip-default-selected-hover", - "value": "#edeae3", + "value": "#dcd6cb", "type": "background", "path": [ "color", @@ -852,7 +852,7 @@ }, { "name": "cdr-color-background-chip-default-selected-focus", - "value": "#edeae3", + "value": "#dcd6cb", "type": "background", "path": [ "color", @@ -861,6 +861,17 @@ "default-selected-focus" ] }, + { + "name": "cdr-color-background-chip-default-selected-active", + "value": "#edeae3", + "type": "background", + "path": [ + "color", + "background", + "chip", + "default-selected-active" + ] + }, { "name": "cdr-color-background-primary", "value": "#ffffff", diff --git a/tokens/global/chip.json5 b/tokens/global/chip.json5 index bfff9fc2..89d807bb 100644 --- a/tokens/global/chip.json5 +++ b/tokens/global/chip.json5 @@ -5,7 +5,7 @@ text: { chip: { default: { - value: '{options.color.warm-grey-900.value}', + value: '{options.color.warm-grey-900-75.value}', category: 'color', docs: { category: '{color.docCategory}', @@ -50,7 +50,7 @@ } }, 'default-hover': { - value: '{options.color.warm-grey-100.value}', + value: '{options.color.warm-grey-200.value}', category: 'color', docs: { category: '{color.docCategory}', @@ -80,7 +80,7 @@ } }, 'default-selected': { - value: '{options.color.warm-grey-300.value}', + value: '{options.color.warm-grey-400.value}', category: 'color', docs: { category: '{color.docCategory}', @@ -90,7 +90,7 @@ } }, 'default-selected-hover': { - value: '{options.color.warm-grey-300.value}', + value: '{options.color.warm-grey-400.value}', category: 'color', docs: { category: '{color.docCategory}', @@ -100,7 +100,7 @@ } }, 'default-selected-focus': { - value: '{options.color.warm-grey-300.value}', + value: '{options.color.warm-grey-400.value}', category: 'color', docs: { category: '{color.docCategory}', @@ -109,6 +109,16 @@ description: 'Background color for focused selected chips', } }, + 'default-selected-active': { + value: '{options.color.warm-grey-300.value}', + category: 'color', + docs: { + category: '{color.docCategory}', + type: 'chip', + example: '{color.docExample}', + description: 'Background color for active selected chips', + } + }, }, }, From 833e6346e9b0990507295ddd9cbec3385efe7cba Mon Sep 17 00:00:00 2001 From: Ben Griffin Date: Mon, 19 Dec 2022 12:09:02 -0800 Subject: [PATCH 2/4] 11.0.1-beta.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4c361a3c..8be38b6b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@rei/cdr-tokens", - "version": "11.0.0", + "version": "11.0.1-beta.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@rei/cdr-tokens", - "version": "11.0.0", + "version": "11.0.1-beta.0", "license": "ISC", "devDependencies": { "concat": "^1.0.3", diff --git a/package.json b/package.json index 1a8ea612..7bbe72b6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@rei/cdr-tokens", - "version": "11.0.0", + "version": "11.0.1-beta.0", "description": "Tokens for REI cedar design system", "author": "REI Software Engineering", "homepage": "https://rei.github.io/rei-cedar-tokens/#/", From 3f9cc6e972531b885fdcb2251941501ff584bfe4 Mon Sep 17 00:00:00 2001 From: Ben Griffin Date: Mon, 19 Dec 2022 13:08:33 -0800 Subject: [PATCH 3/4] Update chip selected-hover state --- dist/android/colors.xml | 2 +- dist/ios/CdrColor.m | 2 +- dist/js/cdr-tokens.common.js | 2 +- dist/js/cdr-tokens.mjs | 2 +- dist/json/android.json | 4 ++-- dist/json/global.json | 4 ++-- dist/json/ios.json | 4 ++-- dist/json/platform-tokens.json | 4 ++-- dist/json/web.json | 4 ++-- dist/less/cdr-tokens.less | 2 +- dist/scss/cdr-tokens.scss | 2 +- dist/sketch/sketch.json | 2 +- package-lock.json | 4 ++-- package.json | 2 +- tokens/global/chip.json5 | 2 +- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dist/android/colors.xml b/dist/android/colors.xml index 04ce7a53..78efb0e2 100644 --- a/dist/android/colors.xml +++ b/dist/android/colors.xml @@ -78,7 +78,7 @@ #ffffffff #ffedeae3 #ffdcd6cb - #ffdcd6cb + #ffedeae3 #ffdcd6cb #ffedeae3 #ffffffff diff --git a/dist/ios/CdrColor.m b/dist/ios/CdrColor.m index 4cdd6e22..6c4b6e8d 100644 --- a/dist/ios/CdrColor.m +++ b/dist/ios/CdrColor.m @@ -96,7 +96,7 @@ + (NSArray *)values { [UIColor colorWithRed:1.000f green:1.000f blue:1.000f alpha:1.000f], [UIColor colorWithRed:0.929f green:0.918f blue:0.890f alpha:1.000f], [UIColor colorWithRed:0.863f green:0.839f blue:0.796f alpha:1.000f], -[UIColor colorWithRed:0.863f green:0.839f blue:0.796f alpha:1.000f], +[UIColor colorWithRed:0.929f green:0.918f blue:0.890f alpha:1.000f], [UIColor colorWithRed:0.863f green:0.839f blue:0.796f alpha:1.000f], [UIColor colorWithRed:0.929f green:0.918f blue:0.890f alpha:1.000f], [UIColor colorWithRed:1.000f green:1.000f blue:1.000f alpha:1.000f], diff --git a/dist/js/cdr-tokens.common.js b/dist/js/cdr-tokens.common.js index 12a0a3aa..8aed5196 100644 --- a/dist/js/cdr-tokens.common.js +++ b/dist/js/cdr-tokens.common.js @@ -75,7 +75,7 @@ module.exports = { CdrColorBackgroundChipDefaultFocus: "#ffffff", CdrColorBackgroundChipDefaultActive: "#edeae3", CdrColorBackgroundChipDefaultSelected: "#dcd6cb", - CdrColorBackgroundChipDefaultSelectedHover: "#dcd6cb", + CdrColorBackgroundChipDefaultSelectedHover: "#edeae3", CdrColorBackgroundChipDefaultSelectedFocus: "#dcd6cb", CdrColorBackgroundChipDefaultSelectedActive: "#edeae3", CdrColorBackgroundPrimary: "#ffffff", diff --git a/dist/js/cdr-tokens.mjs b/dist/js/cdr-tokens.mjs index a6f95e1b..b4fc9ff7 100644 --- a/dist/js/cdr-tokens.mjs +++ b/dist/js/cdr-tokens.mjs @@ -74,7 +74,7 @@ export const CdrColorBackgroundChipDefaultHover = "#f4f2ed"; export const CdrColorBackgroundChipDefaultFocus = "#ffffff"; export const CdrColorBackgroundChipDefaultActive = "#edeae3"; export const CdrColorBackgroundChipDefaultSelected = "#dcd6cb"; -export const CdrColorBackgroundChipDefaultSelectedHover = "#dcd6cb"; +export const CdrColorBackgroundChipDefaultSelectedHover = "#edeae3"; export const CdrColorBackgroundChipDefaultSelectedFocus = "#dcd6cb"; export const CdrColorBackgroundChipDefaultSelectedActive = "#edeae3"; export const CdrColorBackgroundPrimary = "#ffffff"; diff --git a/dist/json/android.json b/dist/json/android.json index c1e20525..39747dae 100644 --- a/dist/json/android.json +++ b/dist/json/android.json @@ -1993,7 +1993,7 @@ } }, { - "value": "#ffdcd6cb", + "value": "#ffedeae3", "category": "color", "docs": { "category": "colors", @@ -2002,7 +2002,7 @@ "description": "Background color for hovered selected chips" }, "original": { - "value": "{options.color.warm-grey-400.value}", + "value": "{options.color.warm-grey-300.value}", "category": "color", "docs": { "category": "colors", diff --git a/dist/json/global.json b/dist/json/global.json index a9ac95c9..d7265a98 100644 --- a/dist/json/global.json +++ b/dist/json/global.json @@ -1993,7 +1993,7 @@ } }, { - "value": "#dcd6cb", + "value": "#edeae3", "category": "color", "docs": { "category": "colors", @@ -2002,7 +2002,7 @@ "description": "Background color for hovered selected chips" }, "original": { - "value": "{options.color.warm-grey-400.value}", + "value": "{options.color.warm-grey-300.value}", "category": "color", "docs": { "category": "colors", diff --git a/dist/json/ios.json b/dist/json/ios.json index 3e796395..713c6361 100644 --- a/dist/json/ios.json +++ b/dist/json/ios.json @@ -1993,7 +1993,7 @@ } }, { - "value": "[UIColor colorWithRed:0.863f green:0.839f blue:0.796f alpha:1.000f]", + "value": "[UIColor colorWithRed:0.929f green:0.918f blue:0.890f alpha:1.000f]", "category": "color", "docs": { "category": "colors", @@ -2002,7 +2002,7 @@ "description": "Background color for hovered selected chips" }, "original": { - "value": "{options.color.warm-grey-400.value}", + "value": "{options.color.warm-grey-300.value}", "category": "color", "docs": { "category": "colors", diff --git a/dist/json/platform-tokens.json b/dist/json/platform-tokens.json index 405ac5d9..378a5d33 100644 --- a/dist/json/platform-tokens.json +++ b/dist/json/platform-tokens.json @@ -1994,7 +1994,7 @@ } }, { - "value": "#dcd6cb", + "value": "#edeae3", "category": "color", "docs": { "category": "colors", @@ -2003,7 +2003,7 @@ "description": "Background color for hovered selected chips" }, "original": { - "value": "{options.color.warm-grey-400.value}", + "value": "{options.color.warm-grey-300.value}", "category": "color", "docs": { "category": "colors", diff --git a/dist/json/web.json b/dist/json/web.json index 13362671..596b36a0 100644 --- a/dist/json/web.json +++ b/dist/json/web.json @@ -1993,7 +1993,7 @@ } }, { - "value": "#dcd6cb", + "value": "#edeae3", "category": "color", "docs": { "category": "colors", @@ -2002,7 +2002,7 @@ "description": "Background color for hovered selected chips" }, "original": { - "value": "{options.color.warm-grey-400.value}", + "value": "{options.color.warm-grey-300.value}", "category": "color", "docs": { "category": "colors", diff --git a/dist/less/cdr-tokens.less b/dist/less/cdr-tokens.less index 06fe0492..7952dd03 100644 --- a/dist/less/cdr-tokens.less +++ b/dist/less/cdr-tokens.less @@ -750,7 +750,7 @@ @cdr-color-background-chip-default-focus: #ffffff; @cdr-color-background-chip-default-active: #edeae3; @cdr-color-background-chip-default-selected: #dcd6cb; -@cdr-color-background-chip-default-selected-hover: #dcd6cb; +@cdr-color-background-chip-default-selected-hover: #edeae3; @cdr-color-background-chip-default-selected-focus: #dcd6cb; @cdr-color-background-chip-default-selected-active: #edeae3; @cdr-color-background-primary: #ffffff; diff --git a/dist/scss/cdr-tokens.scss b/dist/scss/cdr-tokens.scss index 9f703557..a5d3ae4e 100644 --- a/dist/scss/cdr-tokens.scss +++ b/dist/scss/cdr-tokens.scss @@ -1430,7 +1430,7 @@ $cdr-color-background-chip-default-hover: #f4f2ed; $cdr-color-background-chip-default-focus: #ffffff; $cdr-color-background-chip-default-active: #edeae3; $cdr-color-background-chip-default-selected: #dcd6cb; -$cdr-color-background-chip-default-selected-hover: #dcd6cb; +$cdr-color-background-chip-default-selected-hover: #edeae3; $cdr-color-background-chip-default-selected-focus: #dcd6cb; $cdr-color-background-chip-default-selected-active: #edeae3; $cdr-color-background-primary: #ffffff; diff --git a/dist/sketch/sketch.json b/dist/sketch/sketch.json index e77e71f9..4d2522e5 100644 --- a/dist/sketch/sketch.json +++ b/dist/sketch/sketch.json @@ -841,7 +841,7 @@ }, { "name": "cdr-color-background-chip-default-selected-hover", - "value": "#dcd6cb", + "value": "#edeae3", "type": "background", "path": [ "color", diff --git a/package-lock.json b/package-lock.json index 8be38b6b..ad65a15f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@rei/cdr-tokens", - "version": "11.0.1-beta.0", + "version": "11.0.1-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@rei/cdr-tokens", - "version": "11.0.1-beta.0", + "version": "11.0.1-beta.1", "license": "ISC", "devDependencies": { "concat": "^1.0.3", diff --git a/package.json b/package.json index 7bbe72b6..d17a36ef 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@rei/cdr-tokens", - "version": "11.0.1-beta.0", + "version": "11.0.1-beta.1", "description": "Tokens for REI cedar design system", "author": "REI Software Engineering", "homepage": "https://rei.github.io/rei-cedar-tokens/#/", diff --git a/tokens/global/chip.json5 b/tokens/global/chip.json5 index 89d807bb..f329441f 100644 --- a/tokens/global/chip.json5 +++ b/tokens/global/chip.json5 @@ -90,7 +90,7 @@ } }, 'default-selected-hover': { - value: '{options.color.warm-grey-400.value}', + value: '{options.color.warm-grey-300.value}', category: 'color', docs: { category: '{color.docCategory}', From 5b84f4ff6934f24d6786d2fe50b6eff4afd0182c Mon Sep 17 00:00:00 2001 From: Ben Griffin Date: Mon, 19 Dec 2022 13:31:11 -0800 Subject: [PATCH 4/4] 11.0.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index ad65a15f..f8779e24 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@rei/cdr-tokens", - "version": "11.0.1-beta.1", + "version": "11.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@rei/cdr-tokens", - "version": "11.0.1-beta.1", + "version": "11.0.1", "license": "ISC", "devDependencies": { "concat": "^1.0.3", diff --git a/package.json b/package.json index d17a36ef..b86ee531 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@rei/cdr-tokens", - "version": "11.0.1-beta.1", + "version": "11.0.1", "description": "Tokens for REI cedar design system", "author": "REI Software Engineering", "homepage": "https://rei.github.io/rei-cedar-tokens/#/",