Fix after rebase

- Update color tokens for chips
- Remove duplicated `outline_variant` color token

Author: YohYamasaki

src/common/gui/base/FilterChip.ts

@@ -32,7 +32,7 @@ export class FilterChip implements Component<FilterChipAttrs> {
 			selectors += ".pr-vpad-m"
 		}
 
-		const contentColor = selected ? on_secondary_fixed : theme.content_fg
+		const contentColor = selected ? on_secondary_fixed : theme.on_surface
 		return m(
 			selectors,
 			{

src/common/gui/builtinThemes.ts

@@ -144,7 +144,6 @@ export const themes = (): Themes => {
 		experimental_tertiary: RED_FIGHTER,
 		highlight_bg: highlight,
 		highlight_fg: black,
-		outline_variant: grey_lighter_1,
 	})
 	const darkRed = Object.freeze<Theme>({
 		themeId: !isCalendarApp ? "dark" : "dark_secondary",
@@ -173,7 +172,6 @@ export const themes = (): Themes => {
 		experimental_tertiary: RED_FIGHTER,
 		highlight_bg: highlight,
 		highlight_fg: black,
-		outline_variant: grey_darker_0,
 	})
 	const lightBlue = Object.freeze<Theme>({
 		themeId: isCalendarApp ? "light" : "light_secondary",
@@ -203,7 +201,6 @@ export const themes = (): Themes => {
 		experimental_tertiary: BLUE_FIGHTER,
 		highlight_bg: highlight,
 		highlight_fg: black,
-		outline_variant: grey_lighter_1,
 	})
 	const darkBlue = Object.freeze<Theme>({
 		themeId: isCalendarApp ? "dark" : "dark_secondary",
@@ -232,7 +229,6 @@ export const themes = (): Themes => {
 		experimental_tertiary: BLUE_FIGHTER,
 		highlight_bg: highlight,
 		highlight_fg: black,
-		outline_variant: grey_darker_0,
 	})
 
 	return {

src/common/gui/main-styles.ts

@@ -1428,7 +1428,7 @@ styles.registerStyle("main", () => {
 			outline: "none",
 		},
 		".state-bg-2::before": {
-			"background-color": `var(--state-bg-color, ${theme.content_fg})`,
+			"background-color": `var(--state-bg-color, ${theme.on_surface})`,
 			opacity: "0",
 			transition: "opacity 0.6s",
 			content: "''",

src/common/gui/theme.ts

@@ -48,7 +48,6 @@ export type Theme = {
 	experimental_primary_container: string
 	experimental_on_primary_container: string
 	experimental_tertiary: string
-	outline_variant: string
 }
 
 const themeSingleton = {}