From d476563ca03b48df94e4bf7ffea1446c588dc444 Mon Sep 17 00:00:00 2001 From: James Bradford Date: Wed, 13 Sep 2023 11:41:01 -0700 Subject: [PATCH] Unify graph Past and Future colors for more simplicity (REVERT if undesired) --- packages/ui-styles/src/styles/tokens.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/ui-styles/src/styles/tokens.ts b/packages/ui-styles/src/styles/tokens.ts index c9ab607b..b5007910 100644 --- a/packages/ui-styles/src/styles/tokens.ts +++ b/packages/ui-styles/src/styles/tokens.ts @@ -162,6 +162,7 @@ export const GraphTokens = { PresentBgColor: `var(--PresentBgColor)`, // PresentDasharray: // none, + // OVERRIDDEN BELOW // FutureFgColor: `var(--FutureFgColor)`, FutureBgColor: `var(--FutureBgColor)`, FutureDasharray: '0px 6px', // Dotted @@ -179,6 +180,11 @@ export const GraphTokens = { TextOutlineColor: `var(--TextOutlineColor)`, }; +// Simplify Graph Colors by using the same for Past & Future // +GraphTokens.FutureFgColor = GraphTokens.PastFgColor; +GraphTokens.FutureBgColor = GraphTokens.PastBgColor; +GraphTokens.FutureDasharray = GraphTokens.PastDasharray; + const lightThemeGraphAndTimelineCssVars = declareCssVars([ [TimelineTokens.PresentBgTimeline, CoreTokens.Colors.Gray2], [TimelineTokens.PastBgTimeline, CoreTokens.Colors.LightGray2], @@ -190,8 +196,8 @@ const lightThemeGraphAndTimelineCssVars = declareCssVars([ [GraphTokens.PresentBgColor, CoreTokens.Colors.White], [GraphTokens.PastFgColor, CoreTokens.Colors.LightGray2], [GraphTokens.PastBgColor, CoreTokens.Colors.LightGray4], - [GraphTokens.FutureFgColor, CoreTokens.Colors.White], - [GraphTokens.FutureBgColor, CoreTokens.Colors.LightGray5], + // [GraphTokens.FutureFgColor, CoreTokens.Colors.White], + // [GraphTokens.FutureBgColor, CoreTokens.Colors.LightGray5], [GraphTokens.SelectedFgColor, CoreTokens.Colors.Gray2], [GraphTokens.PreviewFgColor, CoreTokens.Colors.DarkGray5], [GraphTokens.SelectedFocusFgColor, CoreTokens.Intent.Primary4], @@ -211,8 +217,8 @@ const darkThemeGraphAndTimelineCssVars = declareCssVars([ [GraphTokens.PresentBgColor, CoreTokens.Colors.DarkGray3], [GraphTokens.PastFgColor, CoreTokens.Colors.DarkGray5], [GraphTokens.PastBgColor, CoreTokens.Colors.DarkGray2], - [GraphTokens.FutureFgColor, CoreTokens.Colors.Black], // Black? - [GraphTokens.FutureBgColor, CoreTokens.Colors.DarkGray2], // DarkGray2? + // [GraphTokens.FutureFgColor, CoreTokens.Colors.Black], // Black? + // [GraphTokens.FutureBgColor, CoreTokens.Colors.DarkGray2], // DarkGray2? [GraphTokens.SelectedFgColor, CoreTokens.Colors.LightGray1], [GraphTokens.PreviewFgColor, CoreTokens.Colors.White], [GraphTokens.SelectedFocusFgColor, CoreTokens.Intent.Primary3],