From cb1f21d48f135ebd537c6b4a33fa221c3f1c8de9 Mon Sep 17 00:00:00 2001 From: Linus Pahl <46300478+linuspahl@users.noreply.github.com> Date: Mon, 1 Jul 2024 09:50:45 +0200 Subject: [PATCH 1/5] Update sawmill to version 2.0.20. (#19778) * Update table colors. * Update sawmill --- graylog2-web-interface/package.json | 2 +- .../directoryServices/BackendWizard/Sidebar.tsx | 2 +- .../src/components/bootstrap/Table.jsx | 12 ++++++------ .../common/EntityDataTable/EntityDataTable.tsx | 2 +- .../common/PaginatedItemOverview/PaginatedItem.tsx | 2 +- .../datanode/migrations/InPlaceMigration.tsx | 2 +- .../migrations/RemoteReindexingMigration.tsx | 2 +- .../src/components/permissions/GranteesList.tsx | 2 +- .../components/rules/rule-builder/RuleBuilder.tsx | 2 +- .../views/components/datatable/TableHeaderCell.tsx | 2 +- .../time-range-filter/TimeRangeDisplay.tsx | 2 +- .../src/views/components/widgets/MessageTable.tsx | 2 +- .../widgets/events/EventsList/EventsTableRow.tsx | 2 +- graylog2-web-interface/yarn.lock | 13 ++++++++++++- 14 files changed, 30 insertions(+), 19 deletions(-) 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" From d6f383820b81668f41ea0b5248defc204c92a810 Mon Sep 17 00:00:00 2001 From: Linus Pahl <46300478+linuspahl@users.noreply.github.com> Date: Mon, 1 Jul 2024 12:08:13 +0200 Subject: [PATCH 2/5] Update `ListGroup` style. (#19777) --- .../{ListGroupItem.md => ListGroup.md} | 10 ++-- .../{ListGroup.jsx => ListGroup.tsx} | 11 +++-- .../{ListGroupItem.jsx => ListGroupItem.tsx} | 46 ++++++++++--------- .../common/SortableList/ListItem.tsx | 2 +- 4 files changed, 37 insertions(+), 32 deletions(-) rename graylog2-web-interface/src/components/bootstrap/{ListGroupItem.md => ListGroup.md} (78%) rename graylog2-web-interface/src/components/bootstrap/{ListGroup.jsx => ListGroup.tsx} (75%) rename graylog2-web-interface/src/components/bootstrap/{ListGroupItem.jsx => ListGroupItem.tsx} (83%) diff --git a/graylog2-web-interface/src/components/bootstrap/ListGroupItem.md b/graylog2-web-interface/src/components/bootstrap/ListGroup.md similarity index 78% rename from graylog2-web-interface/src/components/bootstrap/ListGroupItem.md rename to graylog2-web-interface/src/components/bootstrap/ListGroup.md index c45765332aa1..6d11aca50b7f 100644 --- a/graylog2-web-interface/src/components/bootstrap/ListGroupItem.md +++ b/graylog2-web-interface/src/components/bootstrap/ListGroup.md @@ -1,6 +1,6 @@ ### Normal List ```js -import { ListGroup } from 'components/bootstrap'; +import { ListGroup, ListGroupItem } from 'components/bootstrap'; Item 1 @@ -11,7 +11,7 @@ import { ListGroup } from 'components/bootstrap'; ### Linked Items ```js -import { ListGroup } from 'components/bootstrap'; +import { ListGroup, ListGroupItem } from 'components/bootstrap'; Link 1 @@ -22,7 +22,7 @@ import { ListGroup } from 'components/bootstrap'; ### Stateful Items ```js -import { ListGroup } from 'components/bootstrap'; +import { ListGroup, ListGroupItem } from 'components/bootstrap'; Link 1 @@ -33,7 +33,7 @@ import { ListGroup } from 'components/bootstrap'; ### Variant Items ```js -import { ListGroup } from 'components/bootstrap'; +import { ListGroup, ListGroupItem } from 'components/bootstrap'; const styles = ['Danger', 'Warning', 'Success', 'Info']; @@ -45,7 +45,7 @@ const styles = ['Danger', 'Warning', 'Success', 'Info']; ### w/ Headers ```js -import { ListGroup } from 'components/bootstrap'; +import { ListGroup, ListGroupItem } from 'components/bootstrap'; Some body text diff --git a/graylog2-web-interface/src/components/bootstrap/ListGroup.jsx b/graylog2-web-interface/src/components/bootstrap/ListGroup.tsx similarity index 75% rename from graylog2-web-interface/src/components/bootstrap/ListGroup.jsx rename to graylog2-web-interface/src/components/bootstrap/ListGroup.tsx index d277f8851bc9..b804e340bfce 100644 --- a/graylog2-web-interface/src/components/bootstrap/ListGroup.jsx +++ b/graylog2-web-interface/src/components/bootstrap/ListGroup.tsx @@ -15,18 +15,19 @@ * . */ import React from 'react'; -import PropTypes from 'prop-types'; // eslint-disable-next-line no-restricted-imports import { ListGroup as BootstrapListGroup } from 'react-bootstrap'; -const ListGroup = ({ className, ...props }) => ; +type Props = React.PropsWithChildren<{ + className?: string, + componentClass?: React.ElementType | undefined +}> -ListGroup.propTypes = { - className: PropTypes.string, -}; +const ListGroup = ({ className, children, ...props }: Props) => {children}; ListGroup.defaultProps = { className: undefined, + componentClass: undefined, }; /** @component */ diff --git a/graylog2-web-interface/src/components/bootstrap/ListGroupItem.jsx b/graylog2-web-interface/src/components/bootstrap/ListGroupItem.tsx similarity index 83% rename from graylog2-web-interface/src/components/bootstrap/ListGroupItem.jsx rename to graylog2-web-interface/src/components/bootstrap/ListGroupItem.tsx index 36cb59e151d6..e8a251f9b355 100644 --- a/graylog2-web-interface/src/components/bootstrap/ListGroupItem.jsx +++ b/graylog2-web-interface/src/components/bootstrap/ListGroupItem.tsx @@ -14,30 +14,20 @@ * along with this program. If not, see * . */ -import React, { forwardRef } from 'react'; +import * as React from 'react'; +import { forwardRef } from 'react'; import styled, { css } from 'styled-components'; -import PropTypes from 'prop-types'; // eslint-disable-next-line no-restricted-imports import { ListGroupItem as BootstrapListGroupItem } from 'react-bootstrap'; -const RefContainer = styled.span(({ theme }) => ` +const RefContainer = styled.span(({ theme }) => css` display: block; - border: 1px solid ${theme.colors.variant.lighter.default}; - margin-bottom: -1px; - - &:first-child { - border-top-left-radius: 4px; - border-top-right-radius: 4px; - } - - &:last-child { - margin-bottom: 0; - border-bottom-right-radius: 4px; - border-bottom-left-radius: 4px; + &:not(:last-child) { + border-bottom: 1px solid ${theme.colors.table.row.border}; } `); -const variantStyles = css(({ bsStyle, theme }) => { +const variantStyles = css<{ bsStyle: string }>(({ bsStyle, theme }) => { if (!bsStyle) { return undefined; } @@ -151,18 +141,32 @@ const StyledListGroupItem = styled(BootstrapListGroupItem)(({ theme }) => css` ${variantStyles} `); -const ListGroupItem = forwardRef(({ containerProps, ...rest }, ref) => ( +type Props = React.PropsWithChildren<{ + active?: boolean + bsStyle?: string, + className?: string, + containerProps?: object, + disabled?: boolean, + header?: React.ReactNode, + href?: string, + onClick?:() => void +}> + +const ListGroupItem = forwardRef(({ containerProps, ...rest }, ref) => ( )); -ListGroupItem.propTypes = { - containerProps: PropTypes.object, -}; - ListGroupItem.defaultProps = { + active: undefined, + bsStyle: undefined, + className: undefined, containerProps: {}, + disabled: undefined, + header: undefined, + href: undefined, + onClick: undefined, }; export default ListGroupItem; diff --git a/graylog2-web-interface/src/components/common/SortableList/ListItem.tsx b/graylog2-web-interface/src/components/common/SortableList/ListItem.tsx index 95ad97f72930..0a8c95c014fa 100644 --- a/graylog2-web-interface/src/components/common/SortableList/ListItem.tsx +++ b/graylog2-web-interface/src/components/common/SortableList/ListItem.tsx @@ -36,7 +36,7 @@ type Props = { item: ItemType, }; -const StyledListGroupItem = styled(ListGroupItem)(({ $alignItemContent }: { $alignItemContent: 'flex-start' | 'center' }) => css` +const StyledListGroupItem = styled(ListGroupItem)<{ $alignItemContent: 'flex-start' | 'center' }>(({ $alignItemContent }) => css` display: flex; align-items: ${$alignItemContent}; `); From 06132e7ca95af96276219a7bb74200e86841e7b7 Mon Sep 17 00:00:00 2001 From: Linus Pahl <46300478+linuspahl@users.noreply.github.com> Date: Mon, 1 Jul 2024 15:11:51 +0200 Subject: [PATCH 3/5] Always display input for widget title in widget edit mode. (#19737) * Always display input for widget title in widget edit mode. * Adding changelog. --- changelog/unreleased/issue-7396.toml | 5 +++ .../src/views/components/widgets/Widget.tsx | 1 + .../views/components/widgets/WidgetHeader.tsx | 39 ++++++++++++++++++- 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 changelog/unreleased/issue-7396.toml diff --git a/changelog/unreleased/issue-7396.toml b/changelog/unreleased/issue-7396.toml new file mode 100644 index 000000000000..c057db06b8bc --- /dev/null +++ b/changelog/unreleased/issue-7396.toml @@ -0,0 +1,5 @@ +type="c" +message="Always display input for widget title in widget edit mode." + +issues=["7396"] +pulls=["19737"] diff --git a/graylog2-web-interface/src/views/components/widgets/Widget.tsx b/graylog2-web-interface/src/views/components/widgets/Widget.tsx index 6d57c9f0013a..29fdfc74b25d 100644 --- a/graylog2-web-interface/src/views/components/widgets/Widget.tsx +++ b/graylog2-web-interface/src/views/components/widgets/Widget.tsx @@ -259,6 +259,7 @@ const Widget = ({ id, editing, widget, title, position, onPositionsChange }: Pro {!editing ? ( css` display: grid; grid-template-columns: minmax(35px, 1fr) max-content; align-items: center; + + .widget-title { + width: 100%; + max-width: 400px; + } `); const Col = styled.div` @@ -57,19 +63,48 @@ const WidgetActionDropdown = styled.span` position: relative; `; +const TitleInputWrapper = styled.div` + max-width: 400px; + width: 100%; + + .form-group { + margin-bottom: 5px; + width: 100%; + } +`; + +const TitleInput = styled(Input)(({ theme }) => css` + font-size: ${theme.fonts.size.large}; + width: 100%; +`); + type Props = { children: React.ReactNode, onRename: (newTitle: string) => unknown, hideDragHandle: boolean, title: string, loading: boolean, + editing: boolean, }; -const WidgetHeader = ({ children, onRename, hideDragHandle, title, loading }: Props) => ( +const WidgetHeader = ({ children, onRename, hideDragHandle, title, loading, editing }: Props) => ( {hideDragHandle || } - + {editing ? ( + + onRename(e.target.value)} + value={title} + required /> + + ) : ( + + )} {loading && } From 1024dacf1e5d8922f489792083246711e2ae0476 Mon Sep 17 00:00:00 2001 From: Linus Pahl <46300478+linuspahl@users.noreply.github.com> Date: Mon, 1 Jul 2024 15:21:49 +0200 Subject: [PATCH 4/5] Update theme usage in `ListGroupItem`. (#19789) --- .../src/components/bootstrap/ListGroupItem.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graylog2-web-interface/src/components/bootstrap/ListGroupItem.tsx b/graylog2-web-interface/src/components/bootstrap/ListGroupItem.tsx index e8a251f9b355..6338b2578f8d 100644 --- a/graylog2-web-interface/src/components/bootstrap/ListGroupItem.tsx +++ b/graylog2-web-interface/src/components/bootstrap/ListGroupItem.tsx @@ -23,7 +23,7 @@ import { ListGroupItem as BootstrapListGroupItem } from 'react-bootstrap'; const RefContainer = styled.span(({ theme }) => css` display: block; &:not(:last-child) { - border-bottom: 1px solid ${theme.colors.table.row.border}; + border-bottom: 1px solid ${theme.colors.table.row.divider}; } `); From 3f4f6a451de015ca1fd8f7b1cec340724e80e18d Mon Sep 17 00:00:00 2001 From: Linus Pahl <46300478+linuspahl@users.noreply.github.com> Date: Mon, 1 Jul 2024 19:10:05 +0200 Subject: [PATCH 5/5] Update sawmill to version 2.0.21 (#19788) --- graylog2-web-interface/package.json | 2 +- graylog2-web-interface/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/graylog2-web-interface/package.json b/graylog2-web-interface/package.json index 0309321542eb..01b46aa606a4 100644 --- a/graylog2-web-interface/package.json +++ b/graylog2-web-interface/package.json @@ -43,7 +43,7 @@ ] }, "dependencies": { - "@graylog/sawmill": "^2.0.20", + "@graylog/sawmill": "^2.0.21", "@mantine/core": "^7.5.2", "@mantine/dropzone": "^7.5.2", "@mantine/hooks": "^7.5.2", diff --git a/graylog2-web-interface/yarn.lock b/graylog2-web-interface/yarn.lock index 8c9311f23949..0948d86627fb 100644 --- a/graylog2-web-interface/yarn.lock +++ b/graylog2-web-interface/yarn.lock @@ -1934,10 +1934,10 @@ 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== +"@graylog/sawmill@^2.0.21": + version "2.0.21" + resolved "https://registry.yarnpkg.com/@graylog/sawmill/-/sawmill-2.0.21.tgz#6d13d0ae7eae5b274afe0939421f56793208073e" + integrity sha512-yWGmDT+uEIDhDIneZCJ5jtvSsEZQ2uf75Bybv0WMJ3cGffrHWmJX/tF/fBVCX6VqQ2HT7Fc0iLKkSVxkxo3J+A== dependencies: "@openfonts/dm-sans_latin" "^1.0.2" "@openfonts/source-sans-pro_latin" "^1.44.2"