From 9f50dee72bbb96696bec7094f6ec9c7318d22071 Mon Sep 17 00:00:00 2001 From: typescreep Date: Tue, 5 Aug 2025 19:14:01 +0300 Subject: [PATCH] buttons alignment fix --- package-lock.json | 8 +-- package.json | 2 +- .../PaddingContainer/PaddingContainer.ts | 9 +++ .../atoms/PaddingContainer/index.ts | 1 + src/components/atoms/index.ts | 1 + .../TableBuiltinInfo/TableBuiltinInfo.tsx | 66 ++++++++--------- .../molecules/ResourceInfo/ResourceInfo.tsx | 70 ++++++++++--------- .../TableNonCrdInfo/TableNonCrdInfo.tsx | 70 ++++++++++--------- src/constants/blocksSizes.ts | 2 +- 9 files changed, 123 insertions(+), 106 deletions(-) create mode 100644 src/components/atoms/PaddingContainer/PaddingContainer.ts create mode 100644 src/components/atoms/PaddingContainer/index.ts diff --git a/package-lock.json b/package-lock.json index 9bf9ffe..8c12dcf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "@ant-design/icons": "5.6.0", "@monaco-editor/react": "4.6.0", "@originjs/vite-plugin-federation": "1.3.6", - "@prorobotech/openapi-k8s-toolkit": "^0.0.1-alpha.82", + "@prorobotech/openapi-k8s-toolkit": "^0.0.1-alpha.83", "@readme/openapi-parser": "4.0.0", "@reduxjs/toolkit": "2.2.5", "@tanstack/react-query": "5.62.2", @@ -2802,9 +2802,9 @@ } }, "node_modules/@prorobotech/openapi-k8s-toolkit": { - "version": "0.0.1-alpha.82", - "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-0.0.1-alpha.82.tgz", - "integrity": "sha512-x/MSSpud6mYYgCdoiPTNzaRvUvZVTtbecf6212s+QNov32UvaoewBfcVM7blvDSgq0jo59VLmaD3uJ7M8pE8HA==", + "version": "0.0.1-alpha.83", + "resolved": "https://registry.npmjs.org/@prorobotech/openapi-k8s-toolkit/-/openapi-k8s-toolkit-0.0.1-alpha.83.tgz", + "integrity": "sha512-5FXbKM+1jD30gxgu6xCMcvq00ZBZY2gnZEDjZ086EMepu6vgz4u9lo69uwQa76JndG78NFV0ceiOw+t6unazrQ==", "license": "MIT", "dependencies": { "@monaco-editor/react": "4.6.0", diff --git a/package.json b/package.json index d4f90ca..3d36b48 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "@ant-design/icons": "5.6.0", "@monaco-editor/react": "4.6.0", "@originjs/vite-plugin-federation": "1.3.6", - "@prorobotech/openapi-k8s-toolkit": "0.0.1-alpha.82", + "@prorobotech/openapi-k8s-toolkit": "0.0.1-alpha.83", "@readme/openapi-parser": "4.0.0", "@reduxjs/toolkit": "2.2.5", "@tanstack/react-query": "5.62.2", diff --git a/src/components/atoms/PaddingContainer/PaddingContainer.ts b/src/components/atoms/PaddingContainer/PaddingContainer.ts new file mode 100644 index 0000000..850fbfd --- /dev/null +++ b/src/components/atoms/PaddingContainer/PaddingContainer.ts @@ -0,0 +1,9 @@ +import styled from 'styled-components' + +type TPaddingContainerProps = { + $padding: string +} + +export const PaddingContainer = styled.div` + padding: ${({ $padding }) => $padding}; +` diff --git a/src/components/atoms/PaddingContainer/index.ts b/src/components/atoms/PaddingContainer/index.ts new file mode 100644 index 0000000..9e73e80 --- /dev/null +++ b/src/components/atoms/PaddingContainer/index.ts @@ -0,0 +1 @@ +export * from './PaddingContainer' diff --git a/src/components/atoms/index.ts b/src/components/atoms/index.ts index c74ce34..ba44548 100644 --- a/src/components/atoms/index.ts +++ b/src/components/atoms/index.ts @@ -14,3 +14,4 @@ export * from './NavigationContainer' export * from './EntrySelect' export * from './OverflowMaxHeightContainer' export * from './MarginTopContainer' +export * from './PaddingContainer' diff --git a/src/components/organisms/TableBuiltinInfo/TableBuiltinInfo.tsx b/src/components/organisms/TableBuiltinInfo/TableBuiltinInfo.tsx index 4c9164b..54901a7 100644 --- a/src/components/organisms/TableBuiltinInfo/TableBuiltinInfo.tsx +++ b/src/components/organisms/TableBuiltinInfo/TableBuiltinInfo.tsx @@ -12,7 +12,7 @@ import { checkIfBuiltInInstanceNamespaceScoped, useBuiltinResources, } from '@prorobotech/openapi-k8s-toolkit' -import { FlexGrow, OverflowMaxHeightContainer } from 'components' +import { FlexGrow, OverflowMaxHeightContainer, PaddingContainer } from 'components' import { TABLE_PROPS } from 'constants/tableProps' import { HEAD_FIRST_ROW, @@ -193,38 +193,40 @@ export const TableBuiltinInfo: FC = ({ namespace, typeNa )} */} - - + + + - {selectedRowKeys.length > 0 && ( - - - - - )} - + {selectedRowKeys.length > 0 && ( + + + + + )} + + {isDeleteModalOpen && ( = ({ )} */} - - - {selectedRowKeys.length > 0 && ( - - - - - )} - + + + + {selectedRowKeys.length > 0 && ( + + + + + )} + + {isDeleteModalOpen && ( = ({ )} */} - - - {selectedRowKeys.length > 0 && ( - - - - - )} - + + + + {selectedRowKeys.length > 0 && ( + + + + + )} + + {isDeleteModalOpen && (