diff --git a/frontend/src/components/Logs/TableView/config.ts b/frontend/src/components/Logs/TableView/config.ts index 73b5f9a4c3..7a267dc624 100644 --- a/frontend/src/components/Logs/TableView/config.ts +++ b/frontend/src/components/Logs/TableView/config.ts @@ -14,12 +14,12 @@ export function getDefaultCellStyle(isDarkMode?: boolean): CSSProperties { lineHeight: '18px', letterSpacing: '-0.07px', marginBottom: '0px', + minWidth: '10rem', }; } export const defaultTableStyle: CSSProperties = { minWidth: '40rem', - maxWidth: '40rem', }; export const defaultListViewPanelStyle: CSSProperties = { diff --git a/frontend/src/container/LogsExplorerList/LogsExplorerList.style.scss b/frontend/src/container/LogsExplorerList/LogsExplorerList.style.scss index a6033da1ff..29dc383b7d 100644 --- a/frontend/src/container/LogsExplorerList/LogsExplorerList.style.scss +++ b/frontend/src/container/LogsExplorerList/LogsExplorerList.style.scss @@ -1,4 +1,7 @@ .logs-list-view-container { + flex: 1; + display: flex; + flex-direction: column; font-family: 'Space Mono', monospace; font-size: 14px; font-weight: 400; diff --git a/frontend/src/container/LogsExplorerList/styles.ts b/frontend/src/container/LogsExplorerList/styles.ts index e9054bf3ef..8fbbf74733 100644 --- a/frontend/src/container/LogsExplorerList/styles.ts +++ b/frontend/src/container/LogsExplorerList/styles.ts @@ -1,6 +1,7 @@ import styled from 'styled-components'; export const InfinityWrapperStyled = styled.div` + flex: 1; height: 40rem !important; display: flex; height: 100%; diff --git a/frontend/src/container/LogsExplorerViews/LogsExplorerViews.styles.scss b/frontend/src/container/LogsExplorerViews/LogsExplorerViews.styles.scss index 501ae4d0d3..47cbf28738 100644 --- a/frontend/src/container/LogsExplorerViews/LogsExplorerViews.styles.scss +++ b/frontend/src/container/LogsExplorerViews/LogsExplorerViews.styles.scss @@ -1,7 +1,15 @@ .logs-explorer-views-container { margin-bottom: 24px; + flex: 1; + display: flex; + flex-direction: column; .logs-explorer-views-types { + width: -webkit-fill-available; + display: flex; + flex-direction: column; + flex: 1; + .views-tabs-container { padding: 8px 16px; border: 1px solid var(--text-slate-400); @@ -85,6 +93,10 @@ } .logs-explorer-views-type-content { + flex: 1; + display: flex; + flex-direction: column; + .ant-card { border: none !important; } diff --git a/frontend/src/pages/LogsExplorer/LogsExplorer.styles.scss b/frontend/src/pages/LogsExplorer/LogsExplorer.styles.scss new file mode 100644 index 0000000000..95d53fe9a4 --- /dev/null +++ b/frontend/src/pages/LogsExplorer/LogsExplorer.styles.scss @@ -0,0 +1,11 @@ +.log-explorer-query-container { + display: flex; + flex-direction: column; + flex: 1; + + .logs-explorer-views { + flex: 1; + display: flex; + flex-direction: column; + } +} \ No newline at end of file diff --git a/frontend/src/pages/LogsExplorer/index.tsx b/frontend/src/pages/LogsExplorer/index.tsx index 8b91b955ea..0cc2c07b4d 100644 --- a/frontend/src/pages/LogsExplorer/index.tsx +++ b/frontend/src/pages/LogsExplorer/index.tsx @@ -1,8 +1,8 @@ -import { Col, Row } from 'antd'; +import './LogsExplorer.styles.scss'; + import ExplorerCard from 'components/ExplorerCard/ExplorerCard'; import LogExplorerQuerySection from 'container/LogExplorerQuerySection'; import LogsExplorerViews from 'container/LogsExplorerViews'; -// import LogsTopNav from 'container/LogsTopNav'; import LeftToolbarActions from 'container/QueryBuilder/components/ToolbarActions/LeftToolbarActions'; import RightToolbarActions from 'container/QueryBuilder/components/ToolbarActions/RightToolbarActions'; import Toolbar from 'container/Toolbar/Toolbar'; @@ -87,19 +87,19 @@ function LogsExplorer(): JSX.Element { /> - - +
+
- - +
+
- - +
+
); diff --git a/frontend/src/pages/LogsExplorer/styles.ts b/frontend/src/pages/LogsExplorer/styles.ts index 3e479cc001..54d553bc3c 100644 --- a/frontend/src/pages/LogsExplorer/styles.ts +++ b/frontend/src/pages/LogsExplorer/styles.ts @@ -3,6 +3,9 @@ import { themeColors } from 'constants/theme'; import styled from 'styled-components'; export const WrapperStyled = styled.div` + display: flex; + flex-direction: column; + flex: 1; color: ${themeColors.lightWhite}; `; diff --git a/frontend/src/pages/LogsModulePage/LogsModulePage.styles.scss b/frontend/src/pages/LogsModulePage/LogsModulePage.styles.scss index 144264b532..9465594ccb 100644 --- a/frontend/src/pages/LogsModulePage/LogsModulePage.styles.scss +++ b/frontend/src/pages/LogsModulePage/LogsModulePage.styles.scss @@ -5,6 +5,14 @@ // margin: 0 -1rem; // } + flex: 1; + display: flex; + flex-direction: column; + + .ant-tabs { + flex: 1; + } + .ant-tabs-nav { padding: 0 16px; margin-bottom: 0px; @@ -14,6 +22,22 @@ } } + .ant-tabs-content-holder { + display: flex; + + .ant-tabs-content { + flex: 1; + display: flex; + flex-direction: column; + + .ant-tabs-tabpane { + flex: 1; + display: flex; + flex-direction: column; + } + } + } + .tab-item { display: flex; justify-content: center;