Merge branch 'main' into feature/fix-horizontal-scroll

gravity-ui · Aug 9, 2024 · b6de7ea · b6de7ea
2 parents f5f581a + 868e7ca
commit b6de7ea
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 26 deletions.
diff --git 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/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 <a href=\"/libraries/uikit\">UIKit</a>! We just wanted to say thanks for all the support and <a href=\"https://github.com/gravity-ui/uikit/issues\">feedback</a> we've been getting. There's more to come, so stay tuned!",
-    "news_items_item2": "We've released the <a href=\"/components/uikit/pin-input\">PinInput component</a>. You may need it to enter OTP or confirmation codes.",
-    "news_items_item3": "We added a duration module to our <a href=\"/libraries/date-utils\">date-utils library</a>. It implements the ISO 8601 standard for durations. <a href=\"https://github.com/gravity-ui/date-utils/blob/main/src/typings/duration.ts#L9\">Here</a> you can find more information about it.",
+    "news_items_item1": "We're thrilled to unveil <a href=\"/themer\">Themer</a>. 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 <a href=\"/libraries/uikit\">UIKit</a>! We just wanted to say thanks for all the support and <a href=\"https://github.com/gravity-ui/uikit/issues\">feedback</a> we've been getting. There's more to come, so stay tuned!",
+    "news_items_item3": "We've released the <a href=\"/components/uikit/pin-input\">PinInput component</a>. 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/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
@@ -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/home.json b/public/locales/ru/home.json
@@ -2,9 +2,9 @@
     "header_title": "Создавайте современные интерфейсы с дизайн‑системой Gravity",
     "header_actions_howToStart": "С чего начать",
     "news_title": "Новости",
-    "news_items_item1": "500⭐️ у <a href=\"/libraries/uikit\">UIKit</a>! Просто хотим поблагодарить вас за поддержку и <a href=\"https://github.com/gravity-ui/uikit/issues\">идеи</a>. Впереди много нового, продолжайте следить за проектом!",
-    "news_items_item2": "Мы выложили <a href=\"/components/uikit/pin-input\">компонент PinInput</a>. Он может пригодиться для ввода OTP кодов или подтверждений.",
-    "news_items_item3": "Мы добавили модуль duration в <a href=\"/libraries/date-utils\">библиотеку date-utils</a>. Он реализует стандарт ISO 8601 для временных интервалов. <a href=\"https://github.com/gravity-ui/date-utils/blob/main/src/typings/duration.ts#L9\">Тут</a> об этом можно почитать подробнее.",
+    "news_items_item1": "Мы запустили новый раздел <a href=\"/themer\">Themer</a>. В нём вы можете легко адаптировать нашу дизайн-систему к своему бренду и экспортировать результат в CSS файл.",
+    "news_items_item2": "500⭐️ у <a href=\"/libraries/uikit\">UIKit</a>! Просто хотим поблагодарить вас за поддержку и <a href=\"https://github.com/gravity-ui/uikit/issues\">идеи</a>. Впереди много нового, продолжайте следить за проектом!",
+    "news_items_item3": "Мы выложили <a href=\"/components/uikit/pin-input\">компонент PinInput</a>. Он может пригодиться для ввода OTP кодов или подтверждений.",
     "features_feature1_title": "Основано на реальном опыте использования",
     "features_feature1_description": "Внутреннее решение в ответ на реальные потребности разработчиков: мы выпустили Gravity для open-source сообщества.",
     "features_feature2_title": "Отличный дизайн",

diff --git 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 → src/[locale]/themer/index.tsx b/src/[locale]/themes/index.tsx → src/[locale]/themer/index.tsx
diff --git a/src/components/Layout/Layout.scss b/src/components/Layout/Layout.scss
@@ -26,5 +26,6 @@ $block: '.#{variables.$ns}layout';
     &__content {
         position: relative;
         flex: 1;
+        z-index: 1;
     }
 }
diff --git 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;

diff --git 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'),
                     },
                 ],

diff --git 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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		// Support for default locale without path prefix
		export {default, getStaticProps} from '../[locale]/themer';