diff --git a/src/build/__snapshots__/snapthots.test.ts.snap b/src/build/__snapshots__/snapthots.test.ts.snap index 22e8f2e2..95af5018 100644 --- a/src/build/__snapshots__/snapthots.test.ts.snap +++ b/src/build/__snapshots__/snapthots.test.ts.snap @@ -1348,6 +1348,76 @@ exports[`shapshots calendar theme should match cssVars snapshot 1`] = ` "value": "var(--vkui--calendar_color_headeron_widget_alpha, rgba(0, 95, 249, 1))", }, }, + "calendarColorIconAppointment": { + "active": { + "name": "--vkui--calendar_color_icon_appointment--active", + "value": "var(--vkui--calendar_color_icon_appointment--active, #E4AC09)", + }, + "hover": { + "name": "--vkui--calendar_color_icon_appointment--hover", + "value": "var(--vkui--calendar_color_icon_appointment--hover, #EEB306)", + }, + "normal": { + "name": "--vkui--calendar_color_icon_appointment", + "value": "var(--vkui--calendar_color_icon_appointment, #F8BA04)", + }, + }, + "calendarColorIconEvent": { + "active": { + "name": "--vkui--calendar_color_icon_event--active", + "value": "var(--vkui--calendar_color_icon_event--active, #089AEB)", + }, + "hover": { + "name": "--vkui--calendar_color_icon_event--hover", + "value": "var(--vkui--calendar_color_icon_event--hover, #09A0F2)", + }, + "normal": { + "name": "--vkui--calendar_color_icon_event", + "value": "var(--vkui--calendar_color_icon_event, #09a6fa)", + }, + }, + "calendarColorIconFinance": { + "active": { + "name": "--vkui--calendar_color_icon_finance--active", + "value": "var(--vkui--calendar_color_icon_finance--active, #2BB97F)", + }, + "hover": { + "name": "--vkui--calendar_color_icon_finance--hover", + "value": "var(--vkui--calendar_color_icon_finance--hover, #2DC182)", + }, + "normal": { + "name": "--vkui--calendar_color_icon_finance", + "value": "var(--vkui--calendar_color_icon_finance, #2fc885)", + }, + }, + "calendarColorIconOrder": { + "active": { + "name": "--vkui--calendar_color_icon_order--active", + "value": "var(--vkui--calendar_color_icon_order--active, #EB4FA1)", + }, + "hover": { + "name": "--vkui--calendar_color_icon_order--hover", + "value": "var(--vkui--calendar_color_icon_order--hover, #F551A6)", + }, + "normal": { + "name": "--vkui--calendar_color_icon_order", + "value": "var(--vkui--calendar_color_icon_order, #ff54aa)", + }, + }, + "calendarColorIconOthers": { + "active": { + "name": "--vkui--calendar_color_icon_others--active", + "value": "var(--vkui--calendar_color_icon_others--active, #0059EA)", + }, + "hover": { + "name": "--vkui--calendar_color_icon_others--hover", + "value": "var(--vkui--calendar_color_icon_others--hover, #005CF1)", + }, + "normal": { + "name": "--vkui--calendar_color_icon_others", + "value": "var(--vkui--calendar_color_icon_others, #005FF9)", + }, + }, "calendarColorIconPrimary": { "active": { "name": "--vkui--calendar_color_icon_primary--active", @@ -1362,6 +1432,20 @@ exports[`shapshots calendar theme should match cssVars snapshot 1`] = ` "value": "var(--vkui--calendar_color_icon_primary, #2C2D2E)", }, }, + "calendarColorIconTravel": { + "active": { + "name": "--vkui--calendar_color_icon_travel--active", + "value": "var(--vkui--calendar_color_icon_travel--active, #AB31ED)", + }, + "hover": { + "name": "--vkui--calendar_color_icon_travel--hover", + "value": "var(--vkui--calendar_color_icon_travel--hover, #B333F4)", + }, + "normal": { + "name": "--vkui--calendar_color_icon_travel", + "value": "var(--vkui--calendar_color_icon_travel, #ba34fc)", + }, + }, "calendarColorOverlayBackground": { "active": { "name": "--vkui--calendar_color_overlay_background--active", @@ -6823,11 +6907,41 @@ exports[`shapshots calendar theme should match pixelify theme snapshot 1`] = ` "hover": "#005CF1", "normal": "rgba(0, 95, 249, 1)", }, + "calendarColorIconAppointment": { + "active": "#E4AC09", + "hover": "#EEB306", + "normal": "#F8BA04", + }, + "calendarColorIconEvent": { + "active": "#089AEB", + "hover": "#09A0F2", + "normal": "#09a6fa", + }, + "calendarColorIconFinance": { + "active": "#2BB97F", + "hover": "#2DC182", + "normal": "#2fc885", + }, + "calendarColorIconOrder": { + "active": "#EB4FA1", + "hover": "#F551A6", + "normal": "#ff54aa", + }, + "calendarColorIconOthers": { + "active": "#0059EA", + "hover": "#005CF1", + "normal": "#005FF9", + }, "calendarColorIconPrimary": { "active": "#282B2F", "hover": "#2A2C2F", "normal": "#2C2D2E", }, + "calendarColorIconTravel": { + "active": "#AB31ED", + "hover": "#B333F4", + "normal": "#ba34fc", + }, "calendarColorOverlayBackground": { "active": "rgba(0, 16, 61, 0.08)", "hover": "rgba(0, 16, 61, 0.04)", @@ -8819,11 +8933,41 @@ exports[`shapshots calendar theme should match pseudo theme from CssVars 1`] = ` "hover": "var(--vkui--calendar_color_headeron_widget_alpha--hover, #005CF1)", "normal": "var(--vkui--calendar_color_headeron_widget_alpha, rgba(0, 95, 249, 1))", }, + "calendarColorIconAppointment": { + "active": "var(--vkui--calendar_color_icon_appointment--active, #E4AC09)", + "hover": "var(--vkui--calendar_color_icon_appointment--hover, #EEB306)", + "normal": "var(--vkui--calendar_color_icon_appointment, #F8BA04)", + }, + "calendarColorIconEvent": { + "active": "var(--vkui--calendar_color_icon_event--active, #089AEB)", + "hover": "var(--vkui--calendar_color_icon_event--hover, #09A0F2)", + "normal": "var(--vkui--calendar_color_icon_event, #09a6fa)", + }, + "calendarColorIconFinance": { + "active": "var(--vkui--calendar_color_icon_finance--active, #2BB97F)", + "hover": "var(--vkui--calendar_color_icon_finance--hover, #2DC182)", + "normal": "var(--vkui--calendar_color_icon_finance, #2fc885)", + }, + "calendarColorIconOrder": { + "active": "var(--vkui--calendar_color_icon_order--active, #EB4FA1)", + "hover": "var(--vkui--calendar_color_icon_order--hover, #F551A6)", + "normal": "var(--vkui--calendar_color_icon_order, #ff54aa)", + }, + "calendarColorIconOthers": { + "active": "var(--vkui--calendar_color_icon_others--active, #0059EA)", + "hover": "var(--vkui--calendar_color_icon_others--hover, #005CF1)", + "normal": "var(--vkui--calendar_color_icon_others, #005FF9)", + }, "calendarColorIconPrimary": { "active": "var(--vkui--calendar_color_icon_primary--active, #282B2F)", "hover": "var(--vkui--calendar_color_icon_primary--hover, #2A2C2F)", "normal": "var(--vkui--calendar_color_icon_primary, #2C2D2E)", }, + "calendarColorIconTravel": { + "active": "var(--vkui--calendar_color_icon_travel--active, #AB31ED)", + "hover": "var(--vkui--calendar_color_icon_travel--hover, #B333F4)", + "normal": "var(--vkui--calendar_color_icon_travel, #ba34fc)", + }, "calendarColorOverlayBackground": { "active": "var(--vkui--calendar_color_overlay_background--active, rgba(0, 16, 61, 0.08))", "hover": "var(--vkui--calendar_color_overlay_background--hover, rgba(0, 16, 61, 0.04))", @@ -10815,11 +10959,41 @@ exports[`shapshots calendar theme should match root theme snapshot 1`] = ` "hover": "#005CF1", "normal": "rgba(0, 95, 249, 1)", }, + "calendarColorIconAppointment": { + "active": "#E4AC09", + "hover": "#EEB306", + "normal": "#F8BA04", + }, + "calendarColorIconEvent": { + "active": "#089AEB", + "hover": "#09A0F2", + "normal": "#09a6fa", + }, + "calendarColorIconFinance": { + "active": "#2BB97F", + "hover": "#2DC182", + "normal": "#2fc885", + }, + "calendarColorIconOrder": { + "active": "#EB4FA1", + "hover": "#F551A6", + "normal": "#ff54aa", + }, + "calendarColorIconOthers": { + "active": "#0059EA", + "hover": "#005CF1", + "normal": "#005FF9", + }, "calendarColorIconPrimary": { "active": "#282B2F", "hover": "#2A2C2F", "normal": "#2C2D2E", }, + "calendarColorIconTravel": { + "active": "#AB31ED", + "hover": "#B333F4", + "normal": "#ba34fc", + }, "calendarColorOverlayBackground": { "active": "rgba(0, 16, 61, 0.08)", "hover": "rgba(0, 16, 61, 0.04)", @@ -13672,6 +13846,76 @@ exports[`shapshots calendarDark theme should match cssVars snapshot 1`] = ` "value": "var(--vkui--calendar_color_headeron_widget_alpha, rgba(255, 255, 255, 0.3))", }, }, + "calendarColorIconAppointment": { + "active": { + "name": "--vkui--calendar_color_icon_appointment--active", + "value": "var(--vkui--calendar_color_icon_appointment--active, #F9C018)", + }, + "hover": { + "name": "--vkui--calendar_color_icon_appointment--hover", + "value": "var(--vkui--calendar_color_icon_appointment--hover, #F8BD0E)", + }, + "normal": { + "name": "--vkui--calendar_color_icon_appointment", + "value": "var(--vkui--calendar_color_icon_appointment, #F8BA04)", + }, + }, + "calendarColorIconEvent": { + "active": { + "name": "--vkui--calendar_color_icon_event--active", + "value": "var(--vkui--calendar_color_icon_event--active, #1DADFA)", + }, + "hover": { + "name": "--vkui--calendar_color_icon_event--hover", + "value": "var(--vkui--calendar_color_icon_event--hover, #13AAFA)", + }, + "normal": { + "name": "--vkui--calendar_color_icon_event", + "value": "var(--vkui--calendar_color_icon_event, #09a6fa)", + }, + }, + "calendarColorIconFinance": { + "active": { + "name": "--vkui--calendar_color_icon_finance--active", + "value": "var(--vkui--calendar_color_icon_finance--active, #40CC8F)", + }, + "hover": { + "name": "--vkui--calendar_color_icon_finance--hover", + "value": "var(--vkui--calendar_color_icon_finance--hover, #37CA8A)", + }, + "normal": { + "name": "--vkui--calendar_color_icon_finance", + "value": "var(--vkui--calendar_color_icon_finance, #2fc885)", + }, + }, + "calendarColorIconOrder": { + "active": { + "name": "--vkui--calendar_color_icon_order--active", + "value": "var(--vkui--calendar_color_icon_order--active, #FF62B1)", + }, + "hover": { + "name": "--vkui--calendar_color_icon_order--hover", + "value": "var(--vkui--calendar_color_icon_order--hover, #FF5BAD)", + }, + "normal": { + "name": "--vkui--calendar_color_icon_order", + "value": "var(--vkui--calendar_color_icon_order, #ff54aa)", + }, + }, + "calendarColorIconOthers": { + "active": { + "name": "--vkui--calendar_color_icon_others--active", + "value": "var(--vkui--calendar_color_icon_others--active, #146CF9)", + }, + "hover": { + "name": "--vkui--calendar_color_icon_others--hover", + "value": "var(--vkui--calendar_color_icon_others--hover, #0A65F9)", + }, + "normal": { + "name": "--vkui--calendar_color_icon_others", + "value": "var(--vkui--calendar_color_icon_others, #005FF9)", + }, + }, "calendarColorIconPrimary": { "active": { "name": "--vkui--calendar_color_icon_primary--active", @@ -13686,6 +13930,20 @@ exports[`shapshots calendarDark theme should match cssVars snapshot 1`] = ` "value": "var(--vkui--calendar_color_icon_primary, #B4B4B4)", }, }, + "calendarColorIconTravel": { + "active": { + "name": "--vkui--calendar_color_icon_travel--active", + "value": "var(--vkui--calendar_color_icon_travel--active, #C044FC)", + }, + "hover": { + "name": "--vkui--calendar_color_icon_travel--hover", + "value": "var(--vkui--calendar_color_icon_travel--hover, #BD3CFC)", + }, + "normal": { + "name": "--vkui--calendar_color_icon_travel", + "value": "var(--vkui--calendar_color_icon_travel, #ba34fc)", + }, + }, "calendarColorOverlayBackground": { "active": { "name": "--vkui--calendar_color_overlay_background--active", @@ -19147,11 +19405,41 @@ exports[`shapshots calendarDark theme should match pixelify theme snapshot 1`] = "hover": "rgba(255, 255, 255, 0.34)", "normal": "rgba(255, 255, 255, 0.3)", }, + "calendarColorIconAppointment": { + "active": "#F9C018", + "hover": "#F8BD0E", + "normal": "#F8BA04", + }, + "calendarColorIconEvent": { + "active": "#1DADFA", + "hover": "#13AAFA", + "normal": "#09a6fa", + }, + "calendarColorIconFinance": { + "active": "#40CC8F", + "hover": "#37CA8A", + "normal": "#2fc885", + }, + "calendarColorIconOrder": { + "active": "#FF62B1", + "hover": "#FF5BAD", + "normal": "#ff54aa", + }, + "calendarColorIconOthers": { + "active": "#146CF9", + "hover": "#0A65F9", + "normal": "#005FF9", + }, "calendarColorIconPrimary": { "active": "#BABABA", "hover": "#B7B7B7", "normal": "#B4B4B4", }, + "calendarColorIconTravel": { + "active": "#C044FC", + "hover": "#BD3CFC", + "normal": "#ba34fc", + }, "calendarColorOverlayBackground": { "active": "rgba(255, 255, 255, 0.08)", "hover": "rgba(255, 255, 255, 0.04)", @@ -21143,11 +21431,41 @@ exports[`shapshots calendarDark theme should match pseudo theme from CssVars 1`] "hover": "var(--vkui--calendar_color_headeron_widget_alpha--hover, rgba(255, 255, 255, 0.34))", "normal": "var(--vkui--calendar_color_headeron_widget_alpha, rgba(255, 255, 255, 0.3))", }, + "calendarColorIconAppointment": { + "active": "var(--vkui--calendar_color_icon_appointment--active, #F9C018)", + "hover": "var(--vkui--calendar_color_icon_appointment--hover, #F8BD0E)", + "normal": "var(--vkui--calendar_color_icon_appointment, #F8BA04)", + }, + "calendarColorIconEvent": { + "active": "var(--vkui--calendar_color_icon_event--active, #1DADFA)", + "hover": "var(--vkui--calendar_color_icon_event--hover, #13AAFA)", + "normal": "var(--vkui--calendar_color_icon_event, #09a6fa)", + }, + "calendarColorIconFinance": { + "active": "var(--vkui--calendar_color_icon_finance--active, #40CC8F)", + "hover": "var(--vkui--calendar_color_icon_finance--hover, #37CA8A)", + "normal": "var(--vkui--calendar_color_icon_finance, #2fc885)", + }, + "calendarColorIconOrder": { + "active": "var(--vkui--calendar_color_icon_order--active, #FF62B1)", + "hover": "var(--vkui--calendar_color_icon_order--hover, #FF5BAD)", + "normal": "var(--vkui--calendar_color_icon_order, #ff54aa)", + }, + "calendarColorIconOthers": { + "active": "var(--vkui--calendar_color_icon_others--active, #146CF9)", + "hover": "var(--vkui--calendar_color_icon_others--hover, #0A65F9)", + "normal": "var(--vkui--calendar_color_icon_others, #005FF9)", + }, "calendarColorIconPrimary": { "active": "var(--vkui--calendar_color_icon_primary--active, #BABABA)", "hover": "var(--vkui--calendar_color_icon_primary--hover, #B7B7B7)", "normal": "var(--vkui--calendar_color_icon_primary, #B4B4B4)", }, + "calendarColorIconTravel": { + "active": "var(--vkui--calendar_color_icon_travel--active, #C044FC)", + "hover": "var(--vkui--calendar_color_icon_travel--hover, #BD3CFC)", + "normal": "var(--vkui--calendar_color_icon_travel, #ba34fc)", + }, "calendarColorOverlayBackground": { "active": "var(--vkui--calendar_color_overlay_background--active, rgba(255, 255, 255, 0.08))", "hover": "var(--vkui--calendar_color_overlay_background--hover, rgba(255, 255, 255, 0.04))", @@ -23139,11 +23457,41 @@ exports[`shapshots calendarDark theme should match root theme snapshot 1`] = ` "hover": "rgba(255, 255, 255, 0.34)", "normal": "rgba(255, 255, 255, 0.3)", }, + "calendarColorIconAppointment": { + "active": "#F9C018", + "hover": "#F8BD0E", + "normal": "#F8BA04", + }, + "calendarColorIconEvent": { + "active": "#1DADFA", + "hover": "#13AAFA", + "normal": "#09a6fa", + }, + "calendarColorIconFinance": { + "active": "#40CC8F", + "hover": "#37CA8A", + "normal": "#2fc885", + }, + "calendarColorIconOrder": { + "active": "#FF62B1", + "hover": "#FF5BAD", + "normal": "#ff54aa", + }, + "calendarColorIconOthers": { + "active": "#146CF9", + "hover": "#0A65F9", + "normal": "#005FF9", + }, "calendarColorIconPrimary": { "active": "#BABABA", "hover": "#B7B7B7", "normal": "#B4B4B4", }, + "calendarColorIconTravel": { + "active": "#C044FC", + "hover": "#BD3CFC", + "normal": "#ba34fc", + }, "calendarColorOverlayBackground": { "active": "rgba(255, 255, 255, 0.08)", "hover": "rgba(255, 255, 255, 0.04)", diff --git a/src/interfaces/themes/calendar/index.ts b/src/interfaces/themes/calendar/index.ts index 91feb34a..b5f9621e 100644 --- a/src/interfaces/themes/calendar/index.ts +++ b/src/interfaces/themes/calendar/index.ts @@ -192,6 +192,14 @@ export interface LocalCalendarColorDescriptionStruct { // цвет заливки иконок calendarColorIconPrimary: ColorDescription; // #endregion Grid + + // Категории событий + calendarColorIconOrder: ColorDescription; + calendarColorIconFinance: ColorDescription; + calendarColorIconTravel: ColorDescription; + calendarColorIconEvent: ColorDescription; + calendarColorIconOthers: ColorDescription; + calendarColorIconAppointment: ColorDescription; } export type CalendarLocalColors = { diff --git a/src/themeDescriptions/themes/calendar/index.ts b/src/themeDescriptions/themes/calendar/index.ts index e1b798a6..64ba5ef6 100644 --- a/src/themeDescriptions/themes/calendar/index.ts +++ b/src/themeDescriptions/themes/calendar/index.ts @@ -74,6 +74,14 @@ export const calendarTheme: ThemeCalendarDescription = { colorBackgroundSecondary: '#EBECEF', colorIconSecondary: '#B6B8BE', + // Цвета категорий ML писем + calendarColorIconOrder: '#ff54aa', + calendarColorIconFinance: '#2fc885', + calendarColorIconTravel: '#ba34fc', + calendarColorIconEvent: '#09a6fa', + calendarColorIconOthers: '#005FF9', + calendarColorIconAppointment: '#F8BA04', + // для кнопок, которые голубые в светлой теме и серые в темной calendarColorBackgroundAccentTintThemed: { normal: '#E3F0FD',