Merge branch 'main' into release-please--branches--main--components--…

…navigation
gravity-ui · Dec 8, 2023 · 321416b · 321416b
2 parents 0e3efbf + 480a3ab
commit 321416b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1 +1 @@
-* @DarkGenius @Lunory
+* @DarkGenius @Lunory @sunduckcow
diff --git a/src/components/AsideHeader/__stories__/AsideHeader.stories.tsx b/src/components/AsideHeader/__stories__/AsideHeader.stories.tsx
@@ -32,7 +32,16 @@ MultipleTooltip.args = {
     initialCompact: true,
 };
 
-const CustomThemeTemplate: StoryFn = (args) => <AsideHeaderShowcase {...args} />;
+const CustomThemeTemplate: StoryFn = (args) => (
+    <React.Fragment>
+        <style>
+            {`.g-root {
+                --gn-aside-header-menu-item-icon-color: var(--g-color-text-primary);
+            }`}
+        </style>
+        <AsideHeaderShowcase {...args} />
+    </React.Fragment>
+);
 export const CustomTheme = CustomThemeTemplate.bind({});
 CustomTheme.args = {
     headerDecoration: false,

diff --git a/src/components/AsideHeader/__stories__/AsideHeaderShowcase.scss b/src/components/AsideHeader/__stories__/AsideHeaderShowcase.scss
@@ -85,8 +85,6 @@ body {
     }
 
     &__custom-background {
-        --gn-aside-header-menu-item-icon-color: var(--g-color-text-primary);
-
         opacity: 75%;
     }
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		* @DarkGenius @Lunory
		* @DarkGenius @Lunory @sunduckcow
-Original file line number
+Diff line change
@@ Expand Up / @@ -85,8 +85,6 @@ body { @@
         }
         &__custom-background {
-            --gn-aside-header-menu-item-icon-color: var(--g-color-text-primary);
             opacity: 75%;
         }
     }
@@ Expand Down @@