From 5c12aa4d065b08c34086d81086f1a23068ed169b Mon Sep 17 00:00:00 2001 From: Michael Hewson Date: Wed, 3 Jan 2024 11:32:26 -0800 Subject: [PATCH 1/2] adding surface tokens for default theme --- dist/docsite/android/colors.xml | 2 + dist/docsite/css/cdr-tokens.css | 2 + dist/docsite/figma/figma.json | 10 ++++ dist/docsite/ios/CdrColor.h | 2 + dist/docsite/ios/CdrColor.m | 2 + dist/docsite/js/cdr-tokens.cjs | 2 + dist/docsite/js/cdr-tokens.d.mts | 4 +- dist/docsite/js/cdr-tokens.mjs | 2 + dist/docsite/json/android.json | 54 ++++++++++++++++++++++ dist/docsite/json/global.json | 54 ++++++++++++++++++++++ dist/docsite/json/ios.json | 54 ++++++++++++++++++++++ dist/docsite/json/platform-tokens.json | 54 ++++++++++++++++++++++ dist/docsite/json/web.json | 54 ++++++++++++++++++++++ dist/docsite/less/cdr-tokens.less | 2 + dist/docsite/scss/cdr-tokens.scss | 2 + dist/rei-dot-com/android/colors.xml | 2 + dist/rei-dot-com/css/cdr-tokens.css | 2 + dist/rei-dot-com/figma/figma.json | 10 ++++ dist/rei-dot-com/ios/CdrColor.h | 2 + dist/rei-dot-com/ios/CdrColor.m | 2 + dist/rei-dot-com/js/cdr-tokens.cjs | 2 + dist/rei-dot-com/js/cdr-tokens.d.mts | 4 +- dist/rei-dot-com/js/cdr-tokens.mjs | 2 + dist/rei-dot-com/json/android.json | 54 ++++++++++++++++++++++ dist/rei-dot-com/json/global.json | 54 ++++++++++++++++++++++ dist/rei-dot-com/json/ios.json | 54 ++++++++++++++++++++++ dist/rei-dot-com/json/platform-tokens.json | 54 ++++++++++++++++++++++ dist/rei-dot-com/json/web.json | 54 ++++++++++++++++++++++ dist/rei-dot-com/less/cdr-tokens.less | 2 + dist/rei-dot-com/scss/cdr-tokens.scss | 2 + tokens/global/color.json5 | 22 +++++++++ 31 files changed, 620 insertions(+), 2 deletions(-) diff --git a/dist/docsite/android/colors.xml b/dist/docsite/android/colors.xml index b53f12c3..156ff3fc 100644 --- a/dist/docsite/android/colors.xml +++ b/dist/docsite/android/colors.xml @@ -252,6 +252,8 @@ #ffdcd6cb #ffdcd6cb #ffdcd6cb + #ffffffff + #fff4f2ed #ffc4b03b #330c0b08 #330c0b08 diff --git a/dist/docsite/css/cdr-tokens.css b/dist/docsite/css/cdr-tokens.css index cc8fda6b..f61bf796 100644 --- a/dist/docsite/css/cdr-tokens.css +++ b/dist/docsite/css/cdr-tokens.css @@ -249,6 +249,8 @@ --cdr-color-icon-switch-selected-default-rest: #dcd6cb; --cdr-color-icon-switch-selected-default-hover: #dcd6cb; --cdr-color-icon-switch-selected-default-focus: #dcd6cb; + --cdr-color-surface-primary: #ffffff; + --cdr-color-surface-secondary: #f4f2ed; --cdr-color-icon-background-note: #c4b03b; --cdr-form-input-height-default: 4rem; --cdr-form-input-height-large: 4.8rem; diff --git a/dist/docsite/figma/figma.json b/dist/docsite/figma/figma.json index df5131be..590171e7 100644 --- a/dist/docsite/figma/figma.json +++ b/dist/docsite/figma/figma.json @@ -1145,6 +1145,16 @@ } } }, + "surface": { + "primary": { + "value": "#ffffff", + "type": "color" + }, + "secondary": { + "value": "#f4f2ed", + "type": "color" + } + }, "icon-background": { "note": { "value": "#c4b03b", diff --git a/dist/docsite/ios/CdrColor.h b/dist/docsite/ios/CdrColor.h index de352e6c..8913d917 100644 --- a/dist/docsite/ios/CdrColor.h +++ b/dist/docsite/ios/CdrColor.h @@ -256,6 +256,8 @@ CdrColorIconCheckboxDefaultSelectedActive, CdrColorIconSwitchSelectedDefaultRest, CdrColorIconSwitchSelectedDefaultHover, CdrColorIconSwitchSelectedDefaultFocus, +CdrColorSurfacePrimary, +CdrColorSurfaceSecondary, CdrColorIconBackgroundNote, CdrProminenceFlatColor, CdrProminenceRaisedColor, diff --git a/dist/docsite/ios/CdrColor.m b/dist/docsite/ios/CdrColor.m index 1b3bf48d..fd0dc801 100644 --- a/dist/docsite/ios/CdrColor.m +++ b/dist/docsite/ios/CdrColor.m @@ -267,6 +267,8 @@ + (NSArray *)values { [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:1.000f green:1.000f blue:1.000f alpha:1.000f], +[UIColor colorWithRed:0.957f green:0.949f blue:0.929f alpha:1.000f], [UIColor colorWithRed:0.769f green:0.690f blue:0.231f alpha:1.000f], [UIColor colorWithRed:0.047f green:0.043f blue:0.031f alpha:0.200f], [UIColor colorWithRed:0.047f green:0.043f blue:0.031f alpha:0.200f], diff --git a/dist/docsite/js/cdr-tokens.cjs b/dist/docsite/js/cdr-tokens.cjs index 946e5e4d..28218c5c 100644 --- a/dist/docsite/js/cdr-tokens.cjs +++ b/dist/docsite/js/cdr-tokens.cjs @@ -249,6 +249,8 @@ module.exports = { CdrColorIconSwitchSelectedDefaultRest: "#dcd6cb", CdrColorIconSwitchSelectedDefaultHover: "#dcd6cb", CdrColorIconSwitchSelectedDefaultFocus: "#dcd6cb", + CdrColorSurfacePrimary: "#ffffff", + CdrColorSurfaceSecondary: "#f4f2ed", CdrColorIconBackgroundNote: "#c4b03b", CdrFormInputHeightDefault: "40", CdrFormInputHeightLarge: "48", diff --git a/dist/docsite/js/cdr-tokens.d.mts b/dist/docsite/js/cdr-tokens.d.mts index b60cc9c1..88e6df9e 100644 --- a/dist/docsite/js/cdr-tokens.d.mts +++ b/dist/docsite/js/cdr-tokens.d.mts @@ -1,6 +1,6 @@ /** * Do not edit directly - * Generated on Wed, 13 Sep 2023 22:46:21 GMT + * Generated on Wed, 03 Jan 2024 19:26:00 GMT */ export const CdrColorTextButtonPrimary : string; @@ -253,6 +253,8 @@ export const CdrColorIconCheckboxDefaultSelectedActive : string; export const CdrColorIconSwitchSelectedDefaultRest : string; export const CdrColorIconSwitchSelectedDefaultHover : string; export const CdrColorIconSwitchSelectedDefaultFocus : string; +export const CdrColorSurfacePrimary : string; +export const CdrColorSurfaceSecondary : string; export const CdrColorIconBackgroundNote : string; export const CdrFormInputHeightDefault : string; export const CdrFormInputHeightLarge : string; diff --git a/dist/docsite/js/cdr-tokens.mjs b/dist/docsite/js/cdr-tokens.mjs index 1c2575b6..cdda5f03 100644 --- a/dist/docsite/js/cdr-tokens.mjs +++ b/dist/docsite/js/cdr-tokens.mjs @@ -248,6 +248,8 @@ export const CdrColorIconCheckboxDefaultSelectedActive = "#4e4d49"; export const CdrColorIconSwitchSelectedDefaultRest = "#dcd6cb"; export const CdrColorIconSwitchSelectedDefaultHover = "#dcd6cb"; export const CdrColorIconSwitchSelectedDefaultFocus = "#dcd6cb"; +export const CdrColorSurfacePrimary = "#ffffff"; +export const CdrColorSurfaceSecondary = "#f4f2ed"; export const CdrColorIconBackgroundNote = "#c4b03b"; export const CdrFormInputHeightDefault = "40"; export const CdrFormInputHeightLarge = "48"; diff --git a/dist/docsite/json/android.json b/dist/docsite/json/android.json index 8807ed8a..7dc1d60e 100644 --- a/dist/docsite/json/android.json +++ b/dist/docsite/json/android.json @@ -6267,6 +6267,60 @@ "deprecated": false, "category": "color" } + }, + { + "value": "#ffffffff", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "The default, primary surface color of most pages" + }, + "filePath": "tokens/global/color.json5", + "isSource": false, + "original": { + "value": "{options.color.white}", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "The default, primary surface color of most pages" + } + }, + "name": "cdr_color_surface_primary", + "attributes": { + "deprecated": false, + "category": "color" + } + }, + { + "value": "#fff4f2ed", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "An alternate, secondary surface color used on some pages" + }, + "filePath": "tokens/global/color.json5", + "isSource": false, + "original": { + "value": "{options.color.warm-grey-200}", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "An alternate, secondary surface color used on some pages" + } + }, + "name": "cdr_color_surface_secondary", + "attributes": { + "deprecated": false, + "category": "color" + } } ], "misc": [ diff --git a/dist/docsite/json/global.json b/dist/docsite/json/global.json index 5be4724e..fb52449a 100644 --- a/dist/docsite/json/global.json +++ b/dist/docsite/json/global.json @@ -6267,6 +6267,60 @@ "deprecated": false, "category": "color" } + }, + { + "value": "#ffffff", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "The default, primary surface color of most pages" + }, + "filePath": "tokens/global/color.json5", + "isSource": false, + "original": { + "value": "{options.color.white}", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "The default, primary surface color of most pages" + } + }, + "name": "cdr-color-surface-primary", + "attributes": { + "deprecated": false, + "category": "color" + } + }, + { + "value": "#f4f2ed", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "An alternate, secondary surface color used on some pages" + }, + "filePath": "tokens/global/color.json5", + "isSource": false, + "original": { + "value": "{options.color.warm-grey-200}", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "An alternate, secondary surface color used on some pages" + } + }, + "name": "cdr-color-surface-secondary", + "attributes": { + "deprecated": false, + "category": "color" + } } ], "misc": [ diff --git a/dist/docsite/json/ios.json b/dist/docsite/json/ios.json index 020ad741..22b98af9 100644 --- a/dist/docsite/json/ios.json +++ b/dist/docsite/json/ios.json @@ -6267,6 +6267,60 @@ "deprecated": false, "category": "color" } + }, + { + "value": "[UIColor colorWithRed:1.000f green:1.000f blue:1.000f alpha:1.000f]", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "The default, primary surface color of most pages" + }, + "filePath": "tokens/global/color.json5", + "isSource": false, + "original": { + "value": "{options.color.white}", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "The default, primary surface color of most pages" + } + }, + "name": "CdrColorSurfacePrimary", + "attributes": { + "deprecated": false, + "category": "color" + } + }, + { + "value": "[UIColor colorWithRed:0.957f green:0.949f blue:0.929f alpha:1.000f]", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "An alternate, secondary surface color used on some pages" + }, + "filePath": "tokens/global/color.json5", + "isSource": false, + "original": { + "value": "{options.color.warm-grey-200}", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "An alternate, secondary surface color used on some pages" + } + }, + "name": "CdrColorSurfaceSecondary", + "attributes": { + "deprecated": false, + "category": "color" + } } ], "misc": [ diff --git a/dist/docsite/json/platform-tokens.json b/dist/docsite/json/platform-tokens.json index ac359f6a..a15c54e1 100644 --- a/dist/docsite/json/platform-tokens.json +++ b/dist/docsite/json/platform-tokens.json @@ -6268,6 +6268,60 @@ "deprecated": false, "category": "color" } + }, + { + "value": "#ffffff", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "The default, primary surface color of most pages" + }, + "filePath": "tokens/global/color.json5", + "isSource": false, + "original": { + "value": "{options.color.white}", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "The default, primary surface color of most pages" + } + }, + "name": "cdr-color-surface-primary", + "attributes": { + "deprecated": false, + "category": "color" + } + }, + { + "value": "#f4f2ed", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "An alternate, secondary surface color used on some pages" + }, + "filePath": "tokens/global/color.json5", + "isSource": false, + "original": { + "value": "{options.color.warm-grey-200}", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "An alternate, secondary surface color used on some pages" + } + }, + "name": "cdr-color-surface-secondary", + "attributes": { + "deprecated": false, + "category": "color" + } } ], "misc": [ diff --git a/dist/docsite/json/web.json b/dist/docsite/json/web.json index bbb76d95..21c1020a 100644 --- a/dist/docsite/json/web.json +++ b/dist/docsite/json/web.json @@ -6267,6 +6267,60 @@ "deprecated": false, "category": "color" } + }, + { + "value": "#ffffff", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "The default, primary surface color of most pages" + }, + "filePath": "tokens/global/color.json5", + "isSource": false, + "original": { + "value": "{options.color.white}", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "The default, primary surface color of most pages" + } + }, + "name": "cdr-color-surface-primary", + "attributes": { + "deprecated": false, + "category": "color" + } + }, + { + "value": "#f4f2ed", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "An alternate, secondary surface color used on some pages" + }, + "filePath": "tokens/global/color.json5", + "isSource": false, + "original": { + "value": "{options.color.warm-grey-200}", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "An alternate, secondary surface color used on some pages" + } + }, + "name": "cdr-color-surface-secondary", + "attributes": { + "deprecated": false, + "category": "color" + } } ], "misc": [ diff --git a/dist/docsite/less/cdr-tokens.less b/dist/docsite/less/cdr-tokens.less index c7e39f16..ad8c2e4d 100644 --- a/dist/docsite/less/cdr-tokens.less +++ b/dist/docsite/less/cdr-tokens.less @@ -924,6 +924,8 @@ @cdr-color-icon-switch-selected-default-rest: #dcd6cb; @cdr-color-icon-switch-selected-default-hover: #dcd6cb; @cdr-color-icon-switch-selected-default-focus: #dcd6cb; +@cdr-color-surface-primary: #ffffff; +@cdr-color-surface-secondary: #f4f2ed; @cdr-color-icon-background-note: #c4b03b; @cdr-form-input-height-default: 4rem; @cdr-form-input-height-large: 4.8rem; diff --git a/dist/docsite/scss/cdr-tokens.scss b/dist/docsite/scss/cdr-tokens.scss index 1e523c8e..3f833d4f 100644 --- a/dist/docsite/scss/cdr-tokens.scss +++ b/dist/docsite/scss/cdr-tokens.scss @@ -1604,6 +1604,8 @@ $cdr-color-icon-checkbox-default-selected-active: #4e4d49; $cdr-color-icon-switch-selected-default-rest: #dcd6cb; $cdr-color-icon-switch-selected-default-hover: #dcd6cb; $cdr-color-icon-switch-selected-default-focus: #dcd6cb; +$cdr-color-surface-primary: #ffffff; +$cdr-color-surface-secondary: #f4f2ed; $cdr-color-icon-background-note: #c4b03b; $cdr-form-input-height-default: 4rem; $cdr-form-input-height-large: 4.8rem; diff --git a/dist/rei-dot-com/android/colors.xml b/dist/rei-dot-com/android/colors.xml index 78efb0e2..41f65c9e 100644 --- a/dist/rei-dot-com/android/colors.xml +++ b/dist/rei-dot-com/android/colors.xml @@ -233,6 +233,8 @@ #ffdcd6cb #ffdcd6cb #ffdcd6cb + #ffffffff + #fff4f2ed #330c0b08 #330c0b08 #330c0b08 diff --git a/dist/rei-dot-com/css/cdr-tokens.css b/dist/rei-dot-com/css/cdr-tokens.css index 6385867a..62dfaad4 100644 --- a/dist/rei-dot-com/css/cdr-tokens.css +++ b/dist/rei-dot-com/css/cdr-tokens.css @@ -230,6 +230,8 @@ --cdr-color-icon-switch-selected-default-rest: #dcd6cb; --cdr-color-icon-switch-selected-default-hover: #dcd6cb; --cdr-color-icon-switch-selected-default-focus: #dcd6cb; + --cdr-color-surface-primary: #ffffff; + --cdr-color-surface-secondary: #f4f2ed; --cdr-form-input-height-default: 4rem; --cdr-form-input-height-large: 4.8rem; --cdr-form-figure-size-small: 1.6rem; diff --git a/dist/rei-dot-com/figma/figma.json b/dist/rei-dot-com/figma/figma.json index 5c3ff00b..80ae6cc0 100644 --- a/dist/rei-dot-com/figma/figma.json +++ b/dist/rei-dot-com/figma/figma.json @@ -1053,6 +1053,16 @@ } } } + }, + "surface": { + "primary": { + "value": "#ffffff", + "type": "color" + }, + "secondary": { + "value": "#f4f2ed", + "type": "color" + } } }, "form": { diff --git a/dist/rei-dot-com/ios/CdrColor.h b/dist/rei-dot-com/ios/CdrColor.h index 401da2fd..fca92e09 100644 --- a/dist/rei-dot-com/ios/CdrColor.h +++ b/dist/rei-dot-com/ios/CdrColor.h @@ -237,6 +237,8 @@ CdrColorIconCheckboxDefaultSelectedActive, CdrColorIconSwitchSelectedDefaultRest, CdrColorIconSwitchSelectedDefaultHover, CdrColorIconSwitchSelectedDefaultFocus, +CdrColorSurfacePrimary, +CdrColorSurfaceSecondary, CdrProminenceFlatColor, CdrProminenceRaisedColor, CdrProminenceElevatedColor, diff --git a/dist/rei-dot-com/ios/CdrColor.m b/dist/rei-dot-com/ios/CdrColor.m index fdc40052..fe4f14a9 100644 --- a/dist/rei-dot-com/ios/CdrColor.m +++ b/dist/rei-dot-com/ios/CdrColor.m @@ -248,6 +248,8 @@ + (NSArray *)values { [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:1.000f green:1.000f blue:1.000f alpha:1.000f], +[UIColor colorWithRed:0.957f green:0.949f blue:0.929f alpha:1.000f], [UIColor colorWithRed:0.047f green:0.043f blue:0.031f alpha:0.200f], [UIColor colorWithRed:0.047f green:0.043f blue:0.031f alpha:0.200f], [UIColor colorWithRed:0.047f green:0.043f blue:0.031f alpha:0.200f], diff --git a/dist/rei-dot-com/js/cdr-tokens.cjs b/dist/rei-dot-com/js/cdr-tokens.cjs index 8aed5196..50479342 100644 --- a/dist/rei-dot-com/js/cdr-tokens.cjs +++ b/dist/rei-dot-com/js/cdr-tokens.cjs @@ -230,6 +230,8 @@ module.exports = { CdrColorIconSwitchSelectedDefaultRest: "#dcd6cb", CdrColorIconSwitchSelectedDefaultHover: "#dcd6cb", CdrColorIconSwitchSelectedDefaultFocus: "#dcd6cb", + CdrColorSurfacePrimary: "#ffffff", + CdrColorSurfaceSecondary: "#f4f2ed", CdrFormInputHeightDefault: "40", CdrFormInputHeightLarge: "48", CdrFormFigureSizeSmall: "16", diff --git a/dist/rei-dot-com/js/cdr-tokens.d.mts b/dist/rei-dot-com/js/cdr-tokens.d.mts index 3947333a..2473beba 100644 --- a/dist/rei-dot-com/js/cdr-tokens.d.mts +++ b/dist/rei-dot-com/js/cdr-tokens.d.mts @@ -1,6 +1,6 @@ /** * Do not edit directly - * Generated on Wed, 13 Sep 2023 22:46:20 GMT + * Generated on Wed, 03 Jan 2024 19:26:00 GMT */ export const CdrColorTextButtonPrimary : string; @@ -234,6 +234,8 @@ export const CdrColorIconCheckboxDefaultSelectedActive : string; export const CdrColorIconSwitchSelectedDefaultRest : string; export const CdrColorIconSwitchSelectedDefaultHover : string; export const CdrColorIconSwitchSelectedDefaultFocus : string; +export const CdrColorSurfacePrimary : string; +export const CdrColorSurfaceSecondary : string; export const CdrFormInputHeightDefault : string; export const CdrFormInputHeightLarge : string; export const CdrFormFigureSizeSmall : string; diff --git a/dist/rei-dot-com/js/cdr-tokens.mjs b/dist/rei-dot-com/js/cdr-tokens.mjs index b4fc9ff7..67ffa547 100644 --- a/dist/rei-dot-com/js/cdr-tokens.mjs +++ b/dist/rei-dot-com/js/cdr-tokens.mjs @@ -229,6 +229,8 @@ export const CdrColorIconCheckboxDefaultSelectedActive = "#4e4d49"; export const CdrColorIconSwitchSelectedDefaultRest = "#dcd6cb"; export const CdrColorIconSwitchSelectedDefaultHover = "#dcd6cb"; export const CdrColorIconSwitchSelectedDefaultFocus = "#dcd6cb"; +export const CdrColorSurfacePrimary = "#ffffff"; +export const CdrColorSurfaceSecondary = "#f4f2ed"; export const CdrFormInputHeightDefault = "40"; export const CdrFormInputHeightLarge = "48"; export const CdrFormFigureSizeSmall = "16"; diff --git a/dist/rei-dot-com/json/android.json b/dist/rei-dot-com/json/android.json index bdcdf2e4..2a75a667 100644 --- a/dist/rei-dot-com/json/android.json +++ b/dist/rei-dot-com/json/android.json @@ -6261,6 +6261,60 @@ "deprecated": false, "category": "color" } + }, + { + "value": "#ffffffff", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "The default, primary surface color of most pages" + }, + "filePath": "tokens/global/color.json5", + "isSource": false, + "original": { + "value": "{options.color.white}", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "The default, primary surface color of most pages" + } + }, + "name": "cdr_color_surface_primary", + "attributes": { + "deprecated": false, + "category": "color" + } + }, + { + "value": "#fff4f2ed", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "An alternate, secondary surface color used on some pages" + }, + "filePath": "tokens/global/color.json5", + "isSource": false, + "original": { + "value": "{options.color.warm-grey-200}", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "An alternate, secondary surface color used on some pages" + } + }, + "name": "cdr_color_surface_secondary", + "attributes": { + "deprecated": false, + "category": "color" + } } ], "misc": [ diff --git a/dist/rei-dot-com/json/global.json b/dist/rei-dot-com/json/global.json index d6f3cd6a..7c6b323a 100644 --- a/dist/rei-dot-com/json/global.json +++ b/dist/rei-dot-com/json/global.json @@ -6261,6 +6261,60 @@ "deprecated": false, "category": "color" } + }, + { + "value": "#ffffff", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "The default, primary surface color of most pages" + }, + "filePath": "tokens/global/color.json5", + "isSource": false, + "original": { + "value": "{options.color.white}", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "The default, primary surface color of most pages" + } + }, + "name": "cdr-color-surface-primary", + "attributes": { + "deprecated": false, + "category": "color" + } + }, + { + "value": "#f4f2ed", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "An alternate, secondary surface color used on some pages" + }, + "filePath": "tokens/global/color.json5", + "isSource": false, + "original": { + "value": "{options.color.warm-grey-200}", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "An alternate, secondary surface color used on some pages" + } + }, + "name": "cdr-color-surface-secondary", + "attributes": { + "deprecated": false, + "category": "color" + } } ], "misc": [ diff --git a/dist/rei-dot-com/json/ios.json b/dist/rei-dot-com/json/ios.json index 67f135f1..b084b22e 100644 --- a/dist/rei-dot-com/json/ios.json +++ b/dist/rei-dot-com/json/ios.json @@ -6261,6 +6261,60 @@ "deprecated": false, "category": "color" } + }, + { + "value": "[UIColor colorWithRed:1.000f green:1.000f blue:1.000f alpha:1.000f]", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "The default, primary surface color of most pages" + }, + "filePath": "tokens/global/color.json5", + "isSource": false, + "original": { + "value": "{options.color.white}", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "The default, primary surface color of most pages" + } + }, + "name": "CdrColorSurfacePrimary", + "attributes": { + "deprecated": false, + "category": "color" + } + }, + { + "value": "[UIColor colorWithRed:0.957f green:0.949f blue:0.929f alpha:1.000f]", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "An alternate, secondary surface color used on some pages" + }, + "filePath": "tokens/global/color.json5", + "isSource": false, + "original": { + "value": "{options.color.warm-grey-200}", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "An alternate, secondary surface color used on some pages" + } + }, + "name": "CdrColorSurfaceSecondary", + "attributes": { + "deprecated": false, + "category": "color" + } } ], "misc": [ diff --git a/dist/rei-dot-com/json/platform-tokens.json b/dist/rei-dot-com/json/platform-tokens.json index 8d8e9fdf..de0b8b69 100644 --- a/dist/rei-dot-com/json/platform-tokens.json +++ b/dist/rei-dot-com/json/platform-tokens.json @@ -6262,6 +6262,60 @@ "deprecated": false, "category": "color" } + }, + { + "value": "#ffffff", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "The default, primary surface color of most pages" + }, + "filePath": "tokens/global/color.json5", + "isSource": false, + "original": { + "value": "{options.color.white}", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "The default, primary surface color of most pages" + } + }, + "name": "cdr-color-surface-primary", + "attributes": { + "deprecated": false, + "category": "color" + } + }, + { + "value": "#f4f2ed", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "An alternate, secondary surface color used on some pages" + }, + "filePath": "tokens/global/color.json5", + "isSource": false, + "original": { + "value": "{options.color.warm-grey-200}", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "An alternate, secondary surface color used on some pages" + } + }, + "name": "cdr-color-surface-secondary", + "attributes": { + "deprecated": false, + "category": "color" + } } ], "misc": [ diff --git a/dist/rei-dot-com/json/web.json b/dist/rei-dot-com/json/web.json index fbca9f4b..c336b249 100644 --- a/dist/rei-dot-com/json/web.json +++ b/dist/rei-dot-com/json/web.json @@ -6261,6 +6261,60 @@ "deprecated": false, "category": "color" } + }, + { + "value": "#ffffff", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "The default, primary surface color of most pages" + }, + "filePath": "tokens/global/color.json5", + "isSource": false, + "original": { + "value": "{options.color.white}", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "The default, primary surface color of most pages" + } + }, + "name": "cdr-color-surface-primary", + "attributes": { + "deprecated": false, + "category": "color" + } + }, + { + "value": "#f4f2ed", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "An alternate, secondary surface color used on some pages" + }, + "filePath": "tokens/global/color.json5", + "isSource": false, + "original": { + "value": "{options.color.warm-grey-200}", + "category": "color", + "docs": { + "category": "colors", + "type": "surface", + "example": "color", + "description": "An alternate, secondary surface color used on some pages" + } + }, + "name": "cdr-color-surface-secondary", + "attributes": { + "deprecated": false, + "category": "color" + } } ], "misc": [ diff --git a/dist/rei-dot-com/less/cdr-tokens.less b/dist/rei-dot-com/less/cdr-tokens.less index 7952dd03..dbd82065 100644 --- a/dist/rei-dot-com/less/cdr-tokens.less +++ b/dist/rei-dot-com/less/cdr-tokens.less @@ -905,6 +905,8 @@ @cdr-color-icon-switch-selected-default-rest: #dcd6cb; @cdr-color-icon-switch-selected-default-hover: #dcd6cb; @cdr-color-icon-switch-selected-default-focus: #dcd6cb; +@cdr-color-surface-primary: #ffffff; +@cdr-color-surface-secondary: #f4f2ed; @cdr-form-input-height-default: 4rem; @cdr-form-input-height-large: 4.8rem; @cdr-form-figure-size-small: 1.6rem; diff --git a/dist/rei-dot-com/scss/cdr-tokens.scss b/dist/rei-dot-com/scss/cdr-tokens.scss index a5d3ae4e..7cc4a9e5 100644 --- a/dist/rei-dot-com/scss/cdr-tokens.scss +++ b/dist/rei-dot-com/scss/cdr-tokens.scss @@ -1585,6 +1585,8 @@ $cdr-color-icon-checkbox-default-selected-active: #4e4d49; $cdr-color-icon-switch-selected-default-rest: #dcd6cb; $cdr-color-icon-switch-selected-default-hover: #dcd6cb; $cdr-color-icon-switch-selected-default-focus: #dcd6cb; +$cdr-color-surface-primary: #ffffff; +$cdr-color-surface-secondary: #f4f2ed; $cdr-form-input-height-default: 4rem; $cdr-form-input-height-large: 4.8rem; $cdr-form-figure-size-small: 1.6rem; diff --git a/tokens/global/color.json5 b/tokens/global/color.json5 index 35747f12..2ecb5f0a 100644 --- a/tokens/global/color.json5 +++ b/tokens/global/color.json5 @@ -628,5 +628,27 @@ }, }, }, + surface: { + primary: { + value: "{options.color.white}", + category: "color", + docs: { + category: "colors", + type: "surface", + example: "color", + description: "The default, primary surface color of most pages", + }, + }, + secondary: { + value: "{options.color.warm-grey-200}", + category: "color", + docs: { + category: "colors", + type: "surface", + example: "color", + description: "An alternate, secondary surface color used on some pages", + }, + }, + }, } } From 8b39833f80cd5967ef617703b454191e7184f06a Mon Sep 17 00:00:00 2001 From: Ben Griffin Date: Thu, 4 Jan 2024 15:44:45 -0800 Subject: [PATCH 2/2] 12.1.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 6efb789c..07abd443 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@rei/cdr-tokens", - "version": "12.0.0", + "version": "12.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@rei/cdr-tokens", - "version": "12.0.0", + "version": "12.1.0", "license": "ISC", "devDependencies": { "@divriots/style-dictionary-to-figma": "^0.4.0", diff --git a/package.json b/package.json index b541d17b..39b2f14c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@rei/cdr-tokens", - "version": "12.0.0", + "version": "12.1.0", "description": "Tokens for REI cedar design system", "author": "REI Software Engineering", "homepage": "https://rei.github.io/rei-cedar-tokens/#/",