Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/issue/1195' into issue/1195
Browse files Browse the repository at this point in the history
  • Loading branch information
Dimfacion committed Aug 28, 2024
2 parents 6197126 + 0cfbe1a commit b766741
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import {
} from '@mui/material';
import { makeStyles, useTheme } from '@mui/styles';
import { Edge, MarkerType, ReactFlow, ReactFlowProvider, useEdgesState, useNodesState, useReactFlow } from '@xyflow/react';
import '@xyflow/react/dist/style.css';
import { AddBoxOutlined, MoreVertOutlined } from '@mui/icons-material';
import type { InjectResultDTO, InjectTargetWithResult, InjectExpectationResult } from '../../../../utils/api-types';
import { fetchInjectResultDto, fetchTargetResult } from '../../../../actions/atomic_testings/atomic-testing-actions';
Expand Down
4 changes: 2 additions & 2 deletions openbas-front/src/components/nodes/NodePhantom.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { FunctionComponent, memo } from 'react';
import { makeStyles } from '@mui/styles';
import AddCircleOutlineIcon from '@mui/icons-material/AddCircleOutline';
import { AddCircleOutline } from '@mui/icons-material';
import type { Theme } from '../Theme';

const useStyles = makeStyles<Theme>(() => ({
Expand Down Expand Up @@ -47,7 +47,7 @@ const NodePhantomComponent: FunctionComponent<Props> = (props) => {
<div style={{ width: '500px', height: '50px' }}>
<div className={classes.node} style={{ color: 'white' }}>
<div className={classes.iconContainer}>
<AddCircleOutlineIcon className={classes.icon} style={{ fontSize: '30px' }}/>
<AddCircleOutline className={classes.icon} style={{ fontSize: '30px' }}/>
</div>
</div>
<span className={classes.time}>
Expand Down
1 change: 1 addition & 0 deletions openbas-front/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react';
import '@fontsource/ibm-plex-sans';
import '@fontsource/geologica';
import { createRoot } from 'react-dom/client';
import '@xyflow/react/dist/style.css';
import App from './app';
import './static/css/index.css';
import './static/css/CKEditorDark.css';
Expand Down

0 comments on commit b766741

Please sign in to comment.