Merge branch 'master' into production

HejdaJakub · HejdaJakub · commit 692f3ac5b4a9 · 2023-10-10T06:58:47.000+02:00
diff --git a/apps/admin-gui/src/_styles.scss b/apps/admin-gui/src/_styles.scss
@@ -442,7 +442,7 @@ mat.$theme-ignore-duplication-warnings: true;
   color: var(--admin-color-text);
 
   &:hover {
-    color: #000000;
+    color: var(--admin-color-text);
   }
 }
 
diff --git a/apps/admin-gui/src/app/core/services/common/admin-gui-config.service.ts b/apps/admin-gui/src/app/core/services/common/admin-gui-config.service.ts
@@ -98,7 +98,7 @@ export class AdminGuiConfigService {
     },
     {
       configValue: 'sidemenu_submenu_active_text_color',
-      cssVariable: '--sidemenu-submenu-active-test-color',
+      cssVariable: '--sidemenu-submenu-active-text-color',
     },
     {
       configValue: 'sidemenu_submenu_hover_text_color',

Original file line number	Diff line number	Diff line change
`@@ -442,7 +442,7 @@ mat.$theme-ignore-duplication-warnings: true;`
`442`	`442`	`color: var(--admin-color-text);`
`443`	`443`
`444`	`444`	`&:hover {`
`445`		`- color: #000000;`
	`445`	`+ color: var(--admin-color-text);`
`446`	`446`	`}`
`447`	`447`	`}`
`448`	`448`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ export class AdminGuiConfigService {`
`98`	`98`	`},`
`99`	`99`	`{`
`100`	`100`	`configValue: 'sidemenu_submenu_active_text_color',`
`101`		`- cssVariable: '--sidemenu-submenu-active-test-color',`
	`101`	`+ cssVariable: '--sidemenu-submenu-active-text-color',`
`102`	`102`	`},`
`103`	`103`	`{`
`104`	`104`	`configValue: 'sidemenu_submenu_hover_text_color',`