diff --git a/graylog2-web-interface/package.json b/graylog2-web-interface/package.json index b95b807b33a6..0309321542eb 100644 --- a/graylog2-web-interface/package.json +++ b/graylog2-web-interface/package.json @@ -43,7 +43,7 @@ ] }, "dependencies": { - "@graylog/sawmill": "^2.0.19", + "@graylog/sawmill": "^2.0.20", "@mantine/core": "^7.5.2", "@mantine/dropzone": "^7.5.2", "@mantine/hooks": "^7.5.2", diff --git a/graylog2-web-interface/src/components/authentication/directoryServices/BackendWizard/Sidebar.tsx b/graylog2-web-interface/src/components/authentication/directoryServices/BackendWizard/Sidebar.tsx index 1981576a4ec7..f19602de7688 100644 --- a/graylog2-web-interface/src/components/authentication/directoryServices/BackendWizard/Sidebar.tsx +++ b/graylog2-web-interface/src/components/authentication/directoryServices/BackendWizard/Sidebar.tsx @@ -38,7 +38,7 @@ const StyledPanelGroup = styled(PanelGroup)` background-color: ${(props) => props.theme.colors.global.contentBackground}; .panel-heading { - background-color: ${(props) => props.theme.colors.table.row.backgroundAlt}; + background-color: ${(props) => props.theme.colors.table.row.backgroundStriped}; } &:not(:first-child) { diff --git a/graylog2-web-interface/src/components/bootstrap/Table.jsx b/graylog2-web-interface/src/components/bootstrap/Table.jsx index 4f3c19a3b682..1f890a98050c 100644 --- a/graylog2-web-interface/src/components/bootstrap/Table.jsx +++ b/graylog2-web-interface/src/components/bootstrap/Table.jsx @@ -84,14 +84,14 @@ const tableCss = css(({ theme }) => css` > tfoot > tr { > th, > td { - border-top-color: ${theme.colors.table.row.backgroundAlt}; + border-top-color: ${theme.colors.table.row.backgroundStriped}; } } > thead > tr > th { background: ${theme.colors.table.head.background}; white-space: nowrap; - border-bottom-color: ${theme.colors.table.row.border}; + border-bottom-color: ${theme.colors.table.row.divider}; } > tbody > tr { @@ -100,7 +100,7 @@ const tableCss = css(({ theme }) => css` } > tbody + tbody { - border-top-color: ${theme.colors.table.row.backgroundAlt}; + border-top-color: ${theme.colors.table.row.backgroundStriped}; } .table { @@ -109,20 +109,20 @@ const tableCss = css(({ theme }) => css` } &.table-bordered { - border-color: ${theme.colors.table.row.backgroundAlt}; + border-color: ${theme.colors.table.row.backgroundStriped}; > thead > tr, > tfoot > tr, > tbody > tr { > td, > th { - border-color: ${theme.colors.table.row.backgroundAlt}; + border-color: ${theme.colors.table.row.backgroundStriped}; } } } &.table-striped > tbody > tr:nth-of-type(odd) { - background-color: ${theme.colors.table.row.backgroundAlt}; + background-color: ${theme.colors.table.row.backgroundStriped}; } &.table-hover > tbody > tr:hover { diff --git a/graylog2-web-interface/src/components/common/EntityDataTable/EntityDataTable.tsx b/graylog2-web-interface/src/components/common/EntityDataTable/EntityDataTable.tsx index 4f9ecc0389b5..faf23442048b 100644 --- a/graylog2-web-interface/src/components/common/EntityDataTable/EntityDataTable.tsx +++ b/graylog2-web-interface/src/components/common/EntityDataTable/EntityDataTable.tsx @@ -54,7 +54,7 @@ const StyledTable = styled(Table)(({ theme }) => css` && { > tbody:nth-of-type(even) > tr { - background-color: ${theme.colors.table.row.backgroundAlt}; + background-color: ${theme.colors.table.row.backgroundStriped}; } > tbody:nth-of-type(odd) > tr { diff --git a/graylog2-web-interface/src/components/common/PaginatedItemOverview/PaginatedItem.tsx b/graylog2-web-interface/src/components/common/PaginatedItemOverview/PaginatedItem.tsx index c442bbe8ad04..8cba1612a8ee 100644 --- a/graylog2-web-interface/src/components/common/PaginatedItemOverview/PaginatedItem.tsx +++ b/graylog2-web-interface/src/components/common/PaginatedItemOverview/PaginatedItem.tsx @@ -33,7 +33,7 @@ const Container = styled.span(({ theme }) => css` background-color: ${theme.colors.table.row.background}; &:nth-of-type(even) { - background-color: ${theme.colors.table.row.backgroundAlt}; + background-color: ${theme.colors.table.row.backgroundStriped}; } `); diff --git a/graylog2-web-interface/src/components/datanode/migrations/InPlaceMigration.tsx b/graylog2-web-interface/src/components/datanode/migrations/InPlaceMigration.tsx index 962de8d69d00..752f14dde380 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/InPlaceMigration.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/InPlaceMigration.tsx @@ -48,7 +48,7 @@ const StyledPanelGroup = styled(PanelGroup)` background-color: ${(props) => props.theme.colors.global.contentBackground}; .panel-heading { - background-color: ${(props) => props.theme.colors.table.row.backgroundAlt}; + background-color: ${(props) => props.theme.colors.table.row.backgroundStriped}; } &:not(:first-child) { diff --git a/graylog2-web-interface/src/components/datanode/migrations/RemoteReindexingMigration.tsx b/graylog2-web-interface/src/components/datanode/migrations/RemoteReindexingMigration.tsx index 5f7b3371affe..0eca00731f26 100644 --- a/graylog2-web-interface/src/components/datanode/migrations/RemoteReindexingMigration.tsx +++ b/graylog2-web-interface/src/components/datanode/migrations/RemoteReindexingMigration.tsx @@ -47,7 +47,7 @@ const StyledPanelGroup = styled(PanelGroup)` background-color: ${(props) => props.theme.colors.global.contentBackground}; .panel-heading { - background-color: ${(props) => props.theme.colors.table.row.backgroundAlt}; + background-color: ${(props) => props.theme.colors.table.row.backgroundStriped}; } &:not(:first-child) { diff --git a/graylog2-web-interface/src/components/permissions/GranteesList.tsx b/graylog2-web-interface/src/components/permissions/GranteesList.tsx index 076bf300d1ff..b7efbea00610 100644 --- a/graylog2-web-interface/src/components/permissions/GranteesList.tsx +++ b/graylog2-web-interface/src/components/permissions/GranteesList.tsx @@ -39,7 +39,7 @@ const Header = styled.div` const List = styled.div(({ theme }) => ` >:nth-child(even) { - background: ${theme.colors.table.row.backgroundAlt}; + background: ${theme.colors.table.row.backgroundStriped}; }; >:nth-child(odd) { diff --git a/graylog2-web-interface/src/components/rules/rule-builder/RuleBuilder.tsx b/graylog2-web-interface/src/components/rules/rule-builder/RuleBuilder.tsx index 4423f6df7d7f..a506b3d552a8 100644 --- a/graylog2-web-interface/src/components/rules/rule-builder/RuleBuilder.tsx +++ b/graylog2-web-interface/src/components/rules/rule-builder/RuleBuilder.tsx @@ -53,7 +53,7 @@ const StyledPanel = styled(Panel)(({ theme }) => css` const StyledPanelHeading = styled(Panel.Heading)(({ theme }) => css` display: flex; justify-content: space-between; - background-color: ${theme.colors.table.row.backgroundAlt} !important; + background-color: ${theme.colors.table.row.backgroundStriped} !important; border: 0; `); diff --git a/graylog2-web-interface/src/views/components/datatable/TableHeaderCell.tsx b/graylog2-web-interface/src/views/components/datatable/TableHeaderCell.tsx index ddb081581340..5ad92395b089 100644 --- a/graylog2-web-interface/src/views/components/datatable/TableHeaderCell.tsx +++ b/graylog2-web-interface/src/views/components/datatable/TableHeaderCell.tsx @@ -20,7 +20,7 @@ const TableHeaderCell = styled.th<{ $isNumeric?: boolean, $borderedHeader?: bool && { background-color: ${theme.colors.table.head.background}; min-width: 50px; - border: ${$borderedHeader ? `1px solid ${theme.colors.table.row.backgroundAlt}` : '0'}; + border: ${$borderedHeader ? `1px solid ${theme.colors.table.row.backgroundStriped}` : '0'}; padding: 0 5px; vertical-align: middle; white-space: nowrap; diff --git a/graylog2-web-interface/src/views/components/searchbar/time-range-filter/TimeRangeDisplay.tsx b/graylog2-web-interface/src/views/components/searchbar/time-range-filter/TimeRangeDisplay.tsx index 4bd5cac14769..7ccc144f3b2e 100644 --- a/graylog2-web-interface/src/views/components/searchbar/time-range-filter/TimeRangeDisplay.tsx +++ b/graylog2-web-interface/src/views/components/searchbar/time-range-filter/TimeRangeDisplay.tsx @@ -38,7 +38,7 @@ const TimeRangeWrapper = styled.div(({ theme }) => css` padding: 3px 13px; display: flex; justify-content: space-around; - background-color: ${theme.colors.table.row.backgroundAlt}; + background-color: ${theme.colors.table.row.backgroundStriped}; align-items: center; > span { diff --git a/graylog2-web-interface/src/views/components/widgets/MessageTable.tsx b/graylog2-web-interface/src/views/components/widgets/MessageTable.tsx index a66a09a6443f..6ff6f435bd87 100644 --- a/graylog2-web-interface/src/views/components/widgets/MessageTable.tsx +++ b/graylog2-web-interface/src/views/components/widgets/MessageTable.tsx @@ -45,7 +45,7 @@ const Table = styled.table(({ theme }) => css` word-break: break-all; > tbody > tr > td { - border-color: ${theme.colors.table.row.border}; + border-color: ${theme.colors.table.row.divider}; } @media print { diff --git a/graylog2-web-interface/src/views/components/widgets/events/EventsList/EventsTableRow.tsx b/graylog2-web-interface/src/views/components/widgets/events/EventsList/EventsTableRow.tsx index 9d511708edb4..0bcdc34907c2 100644 --- a/graylog2-web-interface/src/views/components/widgets/events/EventsList/EventsTableRow.tsx +++ b/graylog2-web-interface/src/views/components/widgets/events/EventsList/EventsTableRow.tsx @@ -25,7 +25,7 @@ import useEventAttributes from 'views/components/widgets/events/hooks/useEventAt const Td = styled.td(({ theme }) => css` && { - border-color: ${theme.colors.table.row.border}; + border-color: ${theme.colors.table.row.divider}; } `); diff --git a/graylog2-web-interface/yarn.lock b/graylog2-web-interface/yarn.lock index 542eff846ca6..8c9311f23949 100644 --- a/graylog2-web-interface/yarn.lock +++ b/graylog2-web-interface/yarn.lock @@ -1923,7 +1923,7 @@ resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.1.tgz#16308cea045f0fc777b6ff20a9f25474dd8293d2" integrity sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q== -"@graylog/sawmill@2.0.19", "@graylog/sawmill@^2.0.19": +"@graylog/sawmill@2.0.19": version "2.0.19" resolved "https://registry.yarnpkg.com/@graylog/sawmill/-/sawmill-2.0.19.tgz#2f9135bbd89adcc8619ac6498413c07bb3366cbd" integrity sha512-RxYGJCt+ylTmAyZDlFFX0zKzEz1ygLNrS+00YXAuTfE+ubYes2S5vf+vHSpFnPl4IdHOKwXVTOV4+bvhis6lPw== @@ -1934,6 +1934,17 @@ chroma-js "^2.1.2" lodash "^4.17.21" +"@graylog/sawmill@^2.0.20": + version "2.0.20" + resolved "https://registry.yarnpkg.com/@graylog/sawmill/-/sawmill-2.0.20.tgz#1217620f1c4391de2a4b8ab219291fe5ebdd0878" + integrity sha512-Ca4J6tAK4Qm6ZN8RdCU4joL2Uxh8MiCU907zpLgby6vGXT0Vxc6NFoKgddN8lWaFkx4z3IP4NPszldmniFyy2Q== + dependencies: + "@openfonts/dm-sans_latin" "^1.0.2" + "@openfonts/source-sans-pro_latin" "^1.44.2" + "@openfonts/ubuntu-mono_latin" "^1.44.1" + chroma-js "^2.1.2" + lodash "^4.17.21" + "@humanwhocodes/config-array@^0.11.14": version "0.11.14" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"