Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

4.35.0 #518

Merged
merged 23 commits into from
May 17, 2023
Merged

4.35.0 #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
8467389
build(deps-dev): bump @vkontakte/appearance from v10.1.2 to v10.1.4
dependabot[bot] May 4, 2023
a6dfbfb
build(deps-dev): bump @babel/core from 7.21.4 to 7.21.8
dependabot[bot] May 4, 2023
985e5ff
build(deps-dev): bump @vkontakte/vkui from 5.1.0 to 5.4.1
dependabot[bot] May 4, 2023
2a55c88
build(deps-dev): bump prettier from 2.8.7 to 2.8.8
dependabot[bot] May 4, 2023
2cf1ae4
adds calendar colors for events, text-events, event-backgrounds
May 4, 2023
da17171
updates snapshots
May 4, 2023
35a4aaa
cleanup
May 4, 2023
ce23ea8
Add new colors for Palette and Text
Zaycevq May 5, 2023
0a09c0d
Add new colors for Palette and Text fix
Zaycevq May 5, 2023
52ab5f6
build(deps-dev): bump @vkontakte/icons from 2.28.0 to 2.34.0
dependabot[bot] May 16, 2023
2691ae4
Merge pull request #509 from VKCOM/dependabot/npm_and_yarn/babel/core…
8coon May 17, 2023
9ae0494
Merge pull request #510 from VKCOM/dependabot/npm_and_yarn/vkontakte/…
8coon May 17, 2023
4ba7015
Merge pull request #511 from VKCOM/dependabot/npm_and_yarn/prettier-2…
8coon May 17, 2023
d45c2d7
Merge pull request #516 from VKCOM/dependabot/npm_and_yarn/vkontakte/…
8coon May 17, 2023
8d50c8d
dependabot/npm_and_yarn/vkontakte/appearance-v10.1.4: update snaps
8coon May 17, 2023
f060486
Merge pull request #512 from Motherships/clnd-9275
8coon May 17, 2023
7390958
Merge pull request #514 from Zaycevq/master
8coon May 17, 2023
18100a2
feat/new-palette-colors: update snaps
8coon May 17, 2023
bab4fb6
Merge branch '4.35.0' into dependabot/npm_and_yarn/vkontakte/appearan…
8coon May 17, 2023
0aa89f6
Merge pull request #507 from VKCOM/dependabot/npm_and_yarn/vkontakte/…
8coon May 17, 2023
895ce52
feat/new-palette-colors: fix snaps
8coon May 17, 2023
59ba1cf
Merge pull request #517 from VKCOM/feat/new-palette-colors
8coon May 17, 2023
bea0031
4.35.0
8coon May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vkontakte/vkui-tokens",
"version": "4.34.1",
"version": "4.35.0",
"description": "Репозиторий, который содержит в себе дизайн-токены и другие инструменты объединенной дизайн-системы VKUI и Paradigm",
"license": "MIT",
"main": "utils/descriptions.js",
Expand Down Expand Up @@ -33,7 +33,7 @@
"csstype": "^3.1.1"
},
"devDependencies": {
"@babel/core": "7.21.4",
"@babel/core": "7.21.8",
"@svgr/webpack": "7.0.0",
"@types/color": "3.0.3",
"@types/common-tags": "1.8.1",
Expand All @@ -43,12 +43,12 @@
"@types/react": "18.2.0",
"@typescript-eslint/eslint-plugin": "4.33.0",
"@typescript-eslint/parser": "4.33.0",
"@vkontakte/appearance": "https://github.com/VKCOM/Appearance#v10.1.2",
"@vkontakte/icons": "2.28.0",
"@vkontakte/appearance": "https://github.com/VKCOM/Appearance#v10.1.4",
"@vkontakte/icons": "2.34.0",
"@vkontakte/prettier-config": "0.1.0",
"@vkontakte/vk-bridge": "2.7.2",
"@vkontakte/vkjs": "0.32.2",
"@vkontakte/vkui": "5.1.0",
"@vkontakte/vkui": "5.4.1",
"babel-jest": "29.5.0",
"babel-loader": "9.1.2",
"clean-webpack-plugin": "4.0.0",
Expand All @@ -73,7 +73,7 @@
"jest": "29.5.0",
"jest-junit": "16.0.0",
"lodash": "4.17.21",
"prettier": "2.8.7",
"prettier": "2.8.8",
"react": "18.2.0",
"react-dom": "18.2.0",
"rimraf": "5.0.0",
Expand Down
6,432 changes: 6,348 additions & 84 deletions src/build/__snapshots__/snapthots.test.ts.snap
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions src/interfaces/general/colors/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,12 @@ export interface ColorsDescriptionStruct {
*/
colorTextLinkThemed: ColorDescription;

/**
* @desc Третичный цвет текста ссылок
* @tags color, text
*/
colorTextLinkTint: ColorDescription;

/**
* @desc Цвет текста посещенных ссылок
* @tags color, text
Expand Down Expand Up @@ -457,6 +463,12 @@ export interface ColorsDescriptionStruct {
*/
colorAccentOrange: ColorDescription;

/**
* @desc Палитра цветов. Огненно оранжевый цвет
* @tags color, palette
*/
colorAccentOrangeFire: ColorDescription;

/**
* @desc Палитра цветов. Фиолетовый цвет
* @tags color, palette
Expand Down
86 changes: 84 additions & 2 deletions src/interfaces/themes/calendar/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,98 @@ export interface ThemeCalendarOverValues {
}

export interface LocalCalendarColorDescriptionStruct {
calendarColorBackgroundPositiveTintAlpha4: ColorDescription;
calendarColorBackgroundAccentTintThemed: ColorDescription;
calendarColorButtonGroupBackgroundPositiveTint: ColorDescription;
calendarColorButtonGroupBackgroundNegativeTint: ColorDescription;
calendarColorButtonGroupBackgroundAccentTint: ColorDescription;
calendarColorButtonGroupTextPositive: ColorDescription;
calendarColorButtonGroupTextNegative: ColorDescription;

// #region Event
// Цвета событий
calendarColorEventRed: ColorDescription;
calendarColorEventSalmon: ColorDescription;
calendarColorEventOrange: ColorDescription;
calendarColorEventYellow: ColorDescription;
calendarColorEventLemon: ColorDescription;
calendarColorEventLime: ColorDescription;
calendarColorEventGrass: ColorDescription;
calendarColorEventMint: ColorDescription;
calendarColorEventSea: ColorDescription;
calendarColorEventTurquoise: ColorDescription;
calendarColorEventLightSky: ColorDescription;
calendarColorEventMainSky: ColorDescription;
calendarColorEventSky: ColorDescription;
calendarColorEventMidnightSky: ColorDescription;
calendarColorEventViolet: ColorDescription;
calendarColorEventPurple: ColorDescription;
calendarColorEventMagenta: ColorDescription;
calendarColorEventPink: ColorDescription;
// #endregion Event

// #region Text-Event
calendarColorEventTextRed: ColorDescription;
calendarColorEventTextOrange: ColorDescription;
calendarColorEventTextYellow: ColorDescription;
calendarColorEventTextLemon: ColorDescription;
calendarColorEventTextLime: ColorDescription;
calendarColorEventTextGrass: ColorDescription;
calendarColorEventTextMint: ColorDescription;
calendarColorEventTextSea: ColorDescription;
calendarColorEventTextTurquoise: ColorDescription;
calendarColorEventTextLightSky: ColorDescription;
calendarColorEventTextMainSky: ColorDescription;
calendarColorBackgroundMainSkyTint: ColorDescription;
calendarColorEventTextSky: ColorDescription;
calendarColorEventTextMidnightSky: ColorDescription;
calendarColorEventTextViolet: ColorDescription;
calendarColorEventTextPurple: ColorDescription;
calendarColorEventTextMagenta: ColorDescription;
calendarColorEventTextPink: ColorDescription;
// #endregion Text-Event

// #region Background-TintAlpha20-Alpha
calendarColorBackgroundRedTintAlpha20: ColorDescription;
calendarColorBackgroundSalmonTintAlpha20: ColorDescription;
calendarColorBackgroundOrangeTintAlpha20: ColorDescription;
calendarColorBackgroundYellowTintAlpha20: ColorDescription;
calendarColorBackgroundLemonTintAlpha20: ColorDescription;
calendarColorBackgroundLimeTintAlpha20: ColorDescription;
calendarColorBackgroundGrassTintAlpha20: ColorDescription;
calendarColorBackgroundMintTintAlpha20: ColorDescription;
calendarColorBackgroundSeaTintAlpha20: ColorDescription;
calendarColorBackgroundTurquoiseTintAlpha20: ColorDescription;
calendarColorBackgroundLightSkyTintAlpha20: ColorDescription;
calendarColorBackgroundMainSkyTintAlpha20: ColorDescription;
calendarColorBackgroundSkyTintAlpha20: ColorDescription;
calendarColorBackgroundMidnightSkyTintAlpha20: ColorDescription;
calendarColorBackgroundVioletTintAlpha20: ColorDescription;
calendarColorBackgroundPurpleTintAlpha20: ColorDescription;
calendarColorBackgroundMagentaTintAlpha20: ColorDescription;
calendarColorBackgroundPinkTintAlpha20: ColorDescription;
calendarColorBackgroundPositiveTintAlpha4: ColorDescription;
// #endregion Background-TintAlpha20

// #region Background-Tint
// Тинтовые цвета событий без прозрачности. Нужны для растягивания событий, т.к. если под растягиваемым событие есть событие того же цвета, они сливаются
calendarColorBackgroundRedTint: ColorDescription;
calendarColorBackgroundSalmonTint: ColorDescription;
calendarColorBackgroundOrangeTint: ColorDescription;
calendarColorBackgroundYellowTint: ColorDescription;
calendarColorBackgroundLemonTint: ColorDescription;
calendarColorBackgroundLimeTint: ColorDescription;
calendarColorBackgroundGrassTint: ColorDescription;
calendarColorBackgroundMintTint: ColorDescription;
calendarColorBackgroundSeaTint: ColorDescription;
calendarColorBackgroundTurquoiseTint: ColorDescription;
calendarColorBackgroundLightSkyTint: ColorDescription;
calendarColorBackgroundMainSkyTint: ColorDescription;
calendarColorBackgroundSkyTint: ColorDescription;
calendarColorBackgroundMidnightSkyTint: ColorDescription;
calendarColorBackgroundVioletTint: ColorDescription;
calendarColorBackgroundPurpleTint: ColorDescription;
calendarColorBackgroundMagentaTint: ColorDescription;
calendarColorBackgroundPinkTint: ColorDescription;
// #endregion Background-Tint

// Фон страницы (отличается от colorBackground)
calendarColorBackground: ColorDescription;
Expand Down
4 changes: 4 additions & 0 deletions src/themeDescriptions/base/paradigm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export const lightColors: ColorsDescription = {
colorTextAccentThemed: '#005FF9',
colorTextNegative: '#ED0A34',
colorTextLink: '#005BD1',
colorTextLinkTint: '#71AAEB',
colorTextLinkThemed: '#005BD1',
colorTextMuted: '#2C2D2E',
colorTextPrimary: '#2C2D2E',
Expand Down Expand Up @@ -114,6 +115,7 @@ export const lightColors: ColorsDescription = {
colorAccentRed: '#ED0A34',
colorAccentGreen: '#0DC268',
colorAccentOrange: '#FF9E00',
colorAccentOrangeFire: '#F05C44',
colorAccentPurple: '#4F6DDC',
colorAccentViolet: '#C15DF3',
colorAccentRaspberryPink: '#E03FAB',
Expand Down Expand Up @@ -185,6 +187,7 @@ export const darkColors: ColorsDescription = {
colorTextAccentThemed: '#FFFFFF',
colorTextNegative: '#FF5C5C',
colorTextLink: '#589BFF',
colorTextLinkTint: '#71AAEB',
colorTextLinkThemed: '#FFFFFF',
colorTextMuted: '#E7E8EA',
colorTextPrimary: '#E7E8EA',
Expand Down Expand Up @@ -235,6 +238,7 @@ export const darkColors: ColorsDescription = {
colorAccentRed: '#ED0A34',
colorAccentGreen: '#0DC268',
colorAccentOrange: '#FF9E00',
colorAccentOrangeFire: '#F05C44',
colorAccentPurple: '#4F6DDC',
colorAccentViolet: '#C15DF3',
colorAccentRaspberryPink: '#F060C0',
Expand Down
4 changes: 4 additions & 0 deletions src/themeDescriptions/base/vk.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ export const lightColors: ColorsDescription = {
colorTextNegative: '#E64646',
colorTextLink: '#2D81E0',
colorTextLinkThemed: '#2D81E0',
colorTextLinkTint: '#71AAEB',
colorTextLinkVisited: '#4986CC',
colorTextMuted: '#2C2D2E',
colorLinkContrast: '#FFFFFF',
Expand Down Expand Up @@ -117,6 +118,7 @@ export const lightColors: ColorsDescription = {
colorAccentRed: '#FF3347',
colorAccentGreen: '#4BB34B',
colorAccentOrange: '#FFA000',
colorAccentOrangeFire: '#F05C44',
colorAccentPurple: '#735CE6',
colorAccentViolet: '#792EC0',
colorAccentRaspberryPink: '#E03FAB',
Expand Down Expand Up @@ -211,6 +213,7 @@ export const darkColors: ColorsDescription = {
colorTextNegative: '#FF5C5C',
colorTextLink: '#529EF4',
colorTextLinkThemed: '#FFFFFF',
colorTextLinkTint: '#71AAEB',
colorTextLinkVisited: '#4986CC',
colorTextMuted: '#E1E3E6',
colorLinkContrast: '#FFFFFF',
Expand Down Expand Up @@ -252,6 +255,7 @@ export const darkColors: ColorsDescription = {
colorAccentRed: '#FF3347',
colorAccentGreen: '#4BB34B',
colorAccentOrange: '#FFA000',
colorAccentOrangeFire: '#F05C44',
colorAccentPurple: '#735CE6',
colorAccentViolet: '#792EC0',
colorAccentRaspberryPink: '#F060C0',
Expand Down
Loading