Explorar o código

remove styles from theme

sergei %!s(int64=3) %!d(string=hai) anos
pai
achega
7b284343a8

+ 3 - 4
kafka-ui-react-app/package-lock.json

@@ -3027,10 +3027,9 @@
       "dev": true
       "dev": true
     },
     },
     "@types/styled-components": {
     "@types/styled-components": {
-      "version": "5.1.13",
-      "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.13.tgz",
-      "integrity": "sha512-nIIsiQ+Ag/4xnYf9mhzO3zIZ/zOmKN6HImEZifKh2TLibYz8OudzJbvzDu1uvMfX/+bs0B0RDPB2OIcbrrptVQ==",
-      "dev": true,
+      "version": "5.1.14",
+      "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.14.tgz",
+      "integrity": "sha512-d6P1/tyNytqKwam3cQXq7a9uPtovc/mdAs7dBiz1YbDdNIT3X4WmuFU78YdSYh84TXVuhOwezZ3EeKuNBhwsHQ==",
       "requires": {
       "requires": {
         "@types/hoist-non-react-statics": "*",
         "@types/hoist-non-react-statics": "*",
         "@types/react": "*",
         "@types/react": "*",

+ 1 - 1
kafka-ui-react-app/src/components/Nav/ClusterMenu.tsx

@@ -60,7 +60,7 @@ const ClusterMenu: React.FC<Props> = ({
           </li>
           </li>
 
 
           <ClusterMenuItem
           <ClusterMenuItem
-            liType="primary"
+            liType="primary1"
             to={clusterTopicsPath(name)}
             to={clusterTopicsPath(name)}
             activeClassName="is-active"
             activeClassName="is-active"
             title="Topics"
             title="Topics"

+ 5 - 4
kafka-ui-react-app/src/components/Nav/ClusterMenuItem/ClusterMenuItem.styled.ts

@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 import styled from 'styled-components';
 
 
 export interface Props {
 export interface Props {
-  liType: 'primary' | 'secondary';
+  liType: 'primary1';
   to?: string;
   to?: string;
   activeClassName?: string;
   activeClassName?: string;
   title?: string;
   title?: string;
@@ -12,17 +12,18 @@ const StyledMenuItem = styled('li')<Props>`
   a {
   a {
     cursor: pointer;
     cursor: pointer;
     text-decoration: none;
     text-decoration: none;
-    color: #73848c;
     margin: 0px 0px;
     margin: 0px 0px;
     font-family: Inter, sans-serif;
     font-family: Inter, sans-serif;
     font-style: normal;
     font-style: normal;
     font-weight: normal;
     font-weight: normal;
     font-size: 14px;
     font-size: 14px;
     line-height: 20px;
     line-height: 20px;
+    background: '#fff';
+    color: '#73848C';
 
 
     &.is-active {
     &.is-active {
-      background: #e3e6e8;
-      color: #171a1c;
+      background: '#E3E6E8';
+      color: '#171A1C';
     }
     }
   }
   }
 `;
 `;

+ 2 - 2
kafka-ui-react-app/src/components/Nav/ClusterMenuItem/ClusterMenuItem.tsx

@@ -7,11 +7,11 @@ import { NavLink } from 'react-router-dom';
 type Props = MenuItemProps;
 type Props = MenuItemProps;
 
 
 export const ClusterMenuItem: React.FC<Props> = (props) => {
 export const ClusterMenuItem: React.FC<Props> = (props) => {
-  const { to, activeClassName, title, children, ...rest } = props;
+  const { to, activeClassName, title, children, liType, ...rest } = props;
 
 
   if (to) {
   if (to) {
     return (
     return (
-      <StyledMenuItem {...rest}>
+      <StyledMenuItem liType={liType} {...rest}>
         <NavLink to={to} activeClassName={activeClassName} title={title}>
         <NavLink to={to} activeClassName={activeClassName} title={title}>
           {children}
           {children}
         </NavLink>
         </NavLink>

+ 1 - 0
kafka-ui-react-app/src/theme/theme.ts

@@ -1,3 +1,4 @@
+/* eslint-disable import/prefer-default-export */
 export const Colors = {
 export const Colors = {
   neutral: {
   neutral: {
     '0': '#FFFFFF',
     '0': '#FFFFFF',