Skip to content

Commit

Permalink
Merge branch 'improvement/ARTESCA-13495-bump-core-ui' into tmp/octopu…
Browse files Browse the repository at this point in the history
…s/w/129.0/improvement/ARTESCA-13495-bump-core-ui
  • Loading branch information
bert-e committed Sep 25, 2024
2 parents 0088cfe + df46a50 commit 606cfdf
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 21 deletions.
14 changes: 7 additions & 7 deletions shell-ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion shell-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"ts-node": "^10.9.2"
},
"dependencies": {
"@scality/core-ui": "0.138.0",
"@scality/core-ui": "0.142.0",
"@scality/module-federation": "^1.3.2",
"downshift": "^8.0.0",
"jest-environment-jsdom": "^29.7.0",
Expand Down
14 changes: 7 additions & 7 deletions ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"@hookform/resolvers": "^3.1.0",
"@js-temporal/polyfill": "^0.4.4",
"@kubernetes/client-node": "github:scality/kubernetes-client-javascript.git#browser-0.10.4-64-ge7c6721",
"@scality/core-ui": "0.138.0",
"@scality/core-ui": "0.142.0",
"@scality/module-federation": "^1.3.2",
"axios": "^0.21.1",
"formik": "2.2.5",
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/HealthItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ const HealthItem = ({
{showArrow && (
<Icon
name="Angle-right"
// @ts-expect-error - FIXME when you are working on it
style={{
// @ts-expect-error - FIXME when you are working on it
selfAlign: 'flex-end',
}}
/>
Expand Down
7 changes: 3 additions & 4 deletions ui/src/components/TableRow.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import styled from 'styled-components';
import { Tooltip, ConstrainedText, Icon } from '@scality/core-ui';
import { fontWeight, padding } from '@scality/core-ui/dist/style/theme';
import { Tooltip, ConstrainedText, Icon, spacing } from '@scality/core-ui';
import { fontWeight } from '@scality/core-ui/dist/style/theme';
import { useIntl } from 'react-intl';
const TableRowStyle = styled.div`
&:hover,
Expand Down Expand Up @@ -37,10 +37,9 @@ export const UnknownIcon = ({ name }) => {
<Icon
name={name}
color="textSecondary"
// @ts-expect-error - FIXME when you are working on it
style={{
height: 30,
paddingTop: padding.base,
paddingTop: spacing.r16,
}}
/>
);
Expand Down

0 comments on commit 606cfdf

Please sign in to comment.