diff --git a/frontend/src/constants/card.ts b/frontend/src/constants/card.ts new file mode 100644 index 0000000000..1832c1b7e8 --- /dev/null +++ b/frontend/src/constants/card.ts @@ -0,0 +1,4 @@ +export const CARD_BODY_STYLE = { + padding: '0', + height: '100%', +}; diff --git a/frontend/src/container/LiveLogs/LiveLogsList/index.tsx b/frontend/src/container/LiveLogs/LiveLogsList/index.tsx index 8f6405c78b..940b612379 100644 --- a/frontend/src/container/LiveLogs/LiveLogsList/index.tsx +++ b/frontend/src/container/LiveLogs/LiveLogsList/index.tsx @@ -2,6 +2,7 @@ import { Card, Typography } from 'antd'; import ListLogView from 'components/Logs/ListLogView'; import RawLogView from 'components/Logs/RawLogView'; import Spinner from 'components/Spinner'; +import { CARD_BODY_STYLE } from 'constants/card'; import { LOCALSTORAGE } from 'constants/localStorage'; import { OptionFormatTypes } from 'constants/optionsFormatTypes'; import InfinityTableView from 'container/LogsExplorerList/InfinityTableView'; @@ -9,7 +10,6 @@ import { InfinityWrapperStyled } from 'container/LogsExplorerList/styles'; import { convertKeysToColumnFields } from 'container/LogsExplorerList/utils'; import { Heading } from 'container/LogsTable/styles'; import { useOptionsMenu } from 'container/OptionsMenu'; -import { contentStyle } from 'container/Trace/Search/config'; import { useCopyLogLink } from 'hooks/logs/useCopyLogLink'; import useFontFaceObserver from 'hooks/useFontObserver'; import { useEventSource } from 'providers/EventSource'; @@ -112,10 +112,9 @@ function LiveLogsList({ logs }: LiveLogsListProps): JSX.Element { }} /> ) : ( - + ( return ( <> + - + + ); }, [getItemContent, linesPerRow, logs, onSetActiveLog, selected, viewMode]); diff --git a/frontend/src/container/LogsTable/logsTable.styles.scss b/frontend/src/container/LogsTable/logsTable.styles.scss new file mode 100644 index 0000000000..ba6b436ad9 --- /dev/null +++ b/frontend/src/container/LogsTable/logsTable.styles.scss @@ -0,0 +1,3 @@ +.logs-card { + flex: 1; +} \ No newline at end of file diff --git a/frontend/src/container/LogsTable/styles.ts b/frontend/src/container/LogsTable/styles.ts index a7c843fa51..e935022909 100644 --- a/frontend/src/container/LogsTable/styles.ts +++ b/frontend/src/container/LogsTable/styles.ts @@ -6,6 +6,9 @@ export const Container = styled.div` width: 100%; margin-bottom: 1rem; margin-top: 0.5rem; + display: flex; + flex-direction: column; + flex: 1; `; export const Heading = styled(Card)` diff --git a/frontend/src/pages/Logs/index.tsx b/frontend/src/pages/Logs/index.tsx index f9ebd04bb7..edae696519 100644 --- a/frontend/src/pages/Logs/index.tsx +++ b/frontend/src/pages/Logs/index.tsx @@ -1,3 +1,5 @@ +import './logs.styles.scss'; + import { Button, Col, Divider, Popover, Row, Select, Space } from 'antd'; import { QueryParams } from 'constants/query'; import LogControls from 'container/LogControls'; @@ -93,7 +95,7 @@ function Logs(): JSX.Element { - + diff --git a/frontend/src/pages/Logs/logs.styles.scss b/frontend/src/pages/Logs/logs.styles.scss new file mode 100644 index 0000000000..5b7775f9b9 --- /dev/null +++ b/frontend/src/pages/Logs/logs.styles.scss @@ -0,0 +1,4 @@ +.logs-col-container { + display: flex; + flex-direction: column; +} \ No newline at end of file