Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update sawmill to version 2.0.20. #19778

Merged
merged 2 commits into from
Jul 1, 2024
Merged

Update sawmill to version 2.0.20. #19778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
868e70e
Update table colors.
linuspahl Jun 28, 2024
bf88b1f
Update sawmill
linuspahl Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion graylog2-web-interface/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ...2-web-interface/src/components/authentication/directoryServices/BackendWizard/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
12 changes: 6 additions & 6 deletions graylog2-web-interface/src/components/bootstrap/Table.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion graylog2-web-interface/src/components/common/EntityDataTable/EntityDataTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion graylog2-web-interface/src/components/common/PaginatedItemOverview/PaginatedItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
}
`);

Expand Down
2 changes: 1 addition & 1 deletion graylog2-web-interface/src/components/datanode/migrations/InPlaceMigration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion graylog2-web-interface/src/components/datanode/migrations/RemoteReindexingMigration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion graylog2-web-interface/src/components/permissions/GranteesList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion graylog2-web-interface/src/components/rules/rule-builder/RuleBuilder.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
`);

Expand Down
2 changes: 1 addition & 1 deletion graylog2-web-interface/src/views/components/datatable/TableHeaderCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion graylog2-web-interface/src/views/components/searchbar/time-range-filter/TimeRangeDisplay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion graylog2-web-interface/src/views/components/widgets/MessageTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion graylog2-web-interface/src/views/components/widgets/events/EventsList/EventsTableRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
}
`);

Expand Down
13 changes: 12 additions & 1 deletion graylog2-web-interface/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]", "@graylog/sawmill@^2.0.19":
"@graylog/[email protected]":
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==
Expand All @@ -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"
Expand Down
Loading