From d25d19a121b74c5bbf342e6aa5fbef9509026fc4 Mon Sep 17 00:00:00 2001 From: dgaponov Date: Thu, 8 Aug 2024 13:27:08 +0300 Subject: [PATCH 1/5] fix: z-index for content in layout (#248) --- src/components/Layout/Layout.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Layout/Layout.scss b/src/components/Layout/Layout.scss index 95c923aa07de..ccca001631ad 100644 --- a/src/components/Layout/Layout.scss +++ b/src/components/Layout/Layout.scss @@ -21,6 +21,7 @@ $block: '.#{variables.$ns}layout'; flex-direction: column; flex-grow: 1; overflow: auto; + z-index: 1; } &__content { From 622e8bc2347644fcb65e0df20885abfa637ba60d Mon Sep 17 00:00:00 2001 From: dgaponov Date: Thu, 8 Aug 2024 13:47:00 +0300 Subject: [PATCH 2/5] fix: z-index for content in layout (#249) --- src/components/Layout/Layout.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Layout/Layout.scss b/src/components/Layout/Layout.scss index ccca001631ad..d57993f808f5 100644 --- a/src/components/Layout/Layout.scss +++ b/src/components/Layout/Layout.scss @@ -21,11 +21,11 @@ $block: '.#{variables.$ns}layout'; flex-direction: column; flex-grow: 1; overflow: auto; - z-index: 1; } &__content { position: relative; flex: 1; + z-index: 1; } } From 85172b356fb7cab87dd9f30cff5008b039e46205 Mon Sep 17 00:00:00 2001 From: dgaponov Date: Thu, 8 Aug 2024 14:46:16 +0300 Subject: [PATCH 3/5] fix: rename themes to themer (#250) --- public/locales/en/common.json | 2 +- public/locales/en/themes.json | 2 +- public/locales/ru/common.json | 2 +- public/locales/ru/themes.json | 2 +- src/[locale]/{themes => themer}/index.tsx | 0 src/content/menu.ts | 4 ++-- src/pages/themer.tsx | 2 ++ src/pages/themes.tsx | 2 -- 8 files changed, 8 insertions(+), 8 deletions(-) rename src/[locale]/{themes => themer}/index.tsx (100%) create mode 100644 src/pages/themer.tsx delete mode 100644 src/pages/themes.tsx diff --git a/public/locales/en/common.json b/public/locales/en/common.json index af08e007f8e3..6ac5a5515d25 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -8,7 +8,7 @@ "menu_components": "Components", "menu_design": "Design", "menu_icons": "Icons", - "menu_themes": "Themes", + "menu_themer": "Themer", "roadmap_inProgress": "In progress", "navigation_previous": "Previous", "navigation_next": "Next", diff --git a/public/locales/en/themes.json b/public/locales/en/themes.json index 6d4b05d103ad..8a9ba664f597 100644 --- a/public/locales/en/themes.json +++ b/public/locales/en/themes.json @@ -1,5 +1,5 @@ { - "title": "Themes", + "title": "Themer", "tags_colors": "Colors", "tags_typography": "Typography", "tags_borderRadius": "Border Radius", diff --git a/public/locales/ru/common.json b/public/locales/ru/common.json index 03868dceecc1..2bcff4b68778 100644 --- a/public/locales/ru/common.json +++ b/public/locales/ru/common.json @@ -8,7 +8,7 @@ "menu_components": "Компоненты", "menu_design": "Дизайн", "menu_icons": "Иконки", - "menu_themes": "Темы", + "menu_themer": "Темизатор", "roadmap_inProgress": "В работе", "navigation_previous": "Назад", "navigation_next": "Далее", diff --git a/public/locales/ru/themes.json b/public/locales/ru/themes.json index 09a7c078c348..6c017a5d3c5d 100644 --- a/public/locales/ru/themes.json +++ b/public/locales/ru/themes.json @@ -1,5 +1,5 @@ { - "title": "Темы", + "title": "Темизатор", "tags_colors": "Цвета", "tags_typography": "Шрифты", "tags_borderRadius": "Радиусы границ", diff --git a/src/[locale]/themes/index.tsx b/src/[locale]/themer/index.tsx similarity index 100% rename from src/[locale]/themes/index.tsx rename to src/[locale]/themer/index.tsx diff --git a/src/content/menu.ts b/src/content/menu.ts index 27ee9c12c70a..cf40a34008ec 100644 --- a/src/content/menu.ts +++ b/src/content/menu.ts @@ -23,7 +23,7 @@ export const menu: MenuItem[] = [ url: '/icons', }, { - titleKey: 'menu_themes', - url: '/themes', + titleKey: 'menu_themer', + url: '/themer', }, ]; diff --git a/src/pages/themer.tsx b/src/pages/themer.tsx new file mode 100644 index 000000000000..a7eaa92965aa --- /dev/null +++ b/src/pages/themer.tsx @@ -0,0 +1,2 @@ +// Support for default locale without path prefix +export {default, getStaticProps} from '../[locale]/themer'; diff --git a/src/pages/themes.tsx b/src/pages/themes.tsx deleted file mode 100644 index 9550d64b404c..000000000000 --- a/src/pages/themes.tsx +++ /dev/null @@ -1,2 +0,0 @@ -// Support for default locale without path prefix -export {default, getStaticProps} from '../[locale]/themes'; From 36b4e47a495d2cb1f0605c24044b4b092208f6fc Mon Sep 17 00:00:00 2001 From: vvtimofeev <108340247+vvtimofeev@users.noreply.github.com> Date: Thu, 8 Aug 2024 19:17:36 +0300 Subject: [PATCH 4/5] feat: added Themer news topic (#251) * feat: added Themer news topic * fix: deleted extra files --- public/locales/en/home.json | 6 +++--- public/locales/ru/home.json | 6 +++--- src/content/landing.ts | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/public/locales/en/home.json b/public/locales/en/home.json index 5a9d88516443..8eab1ee69e6b 100644 --- a/public/locales/en/home.json +++ b/public/locales/en/home.json @@ -2,9 +2,9 @@ "header_title": "Build modern interfaces with the Gravity design system and libraries", "header_actions_howToStart": "How to Start", "news_title": "Recent updates", - "news_items_item1": "500⭐️ for our UIKit! We just wanted to say thanks for all the support and feedback we've been getting. There's more to come, so stay tuned!", - "news_items_item2": "We've released the PinInput component. You may need it to enter OTP or confirmation codes.", - "news_items_item3": "We added a duration module to our date-utils library. It implements the ISO 8601 standard for durations. Here you can find more information about it.", + "news_items_item1": "We're thrilled to unveil Themer. Now you can easily customize our design system to your brand style and export your theme as a CSS file.", + "news_items_item2": "500⭐️ for our UIKit! We just wanted to say thanks for all the support and feedback we've been getting. There's more to come, so stay tuned!", + "news_items_item3": "We've released the PinInput component. You may need it to enter OTP or confirmation codes.", "features_feature1_title": "Built on real-life experience", "features_feature1_description": "Conceived as an in-house solution in response to real developers' needs, we released Gravity to the open-source community.", "features_feature2_title": "First class design", diff --git a/public/locales/ru/home.json b/public/locales/ru/home.json index f8c73e9967d2..aa05cd7071b7 100644 --- a/public/locales/ru/home.json +++ b/public/locales/ru/home.json @@ -2,9 +2,9 @@ "header_title": "Создавайте современные интерфейсы с дизайн‑системой Gravity", "header_actions_howToStart": "С чего начать", "news_title": "Новости", - "news_items_item1": "500⭐️ у UIKit! Просто хотим поблагодарить вас за поддержку и идеи. Впереди много нового, продолжайте следить за проектом!", - "news_items_item2": "Мы выложили компонент PinInput. Он может пригодиться для ввода OTP кодов или подтверждений.", - "news_items_item3": "Мы добавили модуль duration в библиотеку date-utils. Он реализует стандарт ISO 8601 для временных интервалов. Тут об этом можно почитать подробнее.", + "news_items_item1": "Мы запустили новый раздел Themer. В нём вы можете легко адаптировать нашу дизайн-систему к своему бренду и экспортировать результат в CSS файл.", + "news_items_item2": "500⭐️ у UIKit! Просто хотим поблагодарить вас за поддержку и идеи. Впереди много нового, продолжайте следить за проектом!", + "news_items_item3": "Мы выложили компонент PinInput. Он может пригодиться для ввода OTP кодов или подтверждений.", "features_feature1_title": "Основано на реальном опыте использования", "features_feature1_description": "Внутреннее решение в ответ на реальные потребности разработчиков: мы выпустили Gravity для open-source сообщества.", "features_feature2_title": "Отличный дизайн", diff --git a/src/content/landing.ts b/src/content/landing.ts index 4c70468109e8..4e5cfc8580f0 100644 --- a/src/content/landing.ts +++ b/src/content/landing.ts @@ -68,15 +68,15 @@ export const getLanding = (t: TFunction): CustomPageContent => ({ title: t('home:news_title'), items: [ { - date: '2024-06-27T07:00:00.000Z', + date: '2024-08-08T16:00:00.000Z', content: t('home:news_items_item1'), }, { - date: '2024-06-13T14:30:00.000Z', + date: '2024-06-27T07:00:00.000Z', content: t('home:news_items_item2'), }, { - date: '2024-05-03T14:00:00.000Z', + date: '2024-06-13T14:30:00.000Z', content: t('home:news_items_item3'), }, ], From 868e7caaf7bd0f9dea90148c56ca347952b7739e Mon Sep 17 00:00:00 2001 From: dgaponov Date: Thu, 8 Aug 2024 21:47:57 +0300 Subject: [PATCH 5/5] fix: always export utility colors (#252) --- src/components/Themes/lib/themeCreatorExport.ts | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/components/Themes/lib/themeCreatorExport.ts b/src/components/Themes/lib/themeCreatorExport.ts index 27f3c21be1a3..67838e081b0d 100644 --- a/src/components/Themes/lib/themeCreatorExport.ts +++ b/src/components/Themes/lib/themeCreatorExport.ts @@ -9,7 +9,7 @@ import { createUtilityColorCssVariable, isPrivateColorToken, } from './themeCreatorUtils'; -import type {ColorOption, ThemeCreatorState, ThemeVariant} from './types'; +import type {ThemeCreatorState, ThemeVariant} from './types'; const COMMON_VARIABLES_TEMPLATE_NAME = '%COMMON_VARIABLES%'; const LIGHT_THEME_VARIABLES_TEMPLATE_NAME = '%LIGHT_THEME_VARIABLES%'; @@ -115,14 +115,6 @@ export function exportTheme({ Object.entries(themeState.colors[themeVariant]).forEach( ([colorName, colorOrPrivateToken]) => { - if ( - ignoreDefaultValues && - DEFAULT_THEME.colors[themeVariant][colorName as ColorOption] === - colorOrPrivateToken - ) { - return; - } - const color = isPrivateColorToken(colorOrPrivateToken) ? `var(${createPrivateColorCssVariableFromToken(colorOrPrivateToken)})` : colorOrPrivateToken;