Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
107a0d86
Unverified
Commit
107a0d86
authored
Mar 26, 2020
by
Lukas Siatka
Committed by
GitHub
Mar 26, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bugfix: updates highlighter passed style prop from string to object (#23112)
parent
936594f5
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
packages/grafana-ui/src/components/Logs/LogRowMessage.tsx
+6
-5
No files found.
packages/grafana-ui/src/components/Logs/LogRowMessage.tsx
View file @
107a0d86
...
...
@@ -52,10 +52,6 @@ const getStyles = stylesFactory((theme: GrafanaTheme) => {
.
setAlpha
(
0.7
)
.
toRgbString
()}
;
`
,
whiteSpacePreWrap
:
css
`
label: whiteSpacePreWrap;
white-space: pre-wrap;
`
,
horizontalScroll
:
css
`
label: verticalScroll;
white-space: nowrap;
...
...
@@ -93,6 +89,11 @@ class UnThemedLogRowMessage extends PureComponent<Props> {
?
cx
([
style
.
logsRowMatchHighLight
,
style
.
logsRowMatchHighLightPreview
])
:
cx
([
style
.
logsRowMatchHighLight
]);
const
styles
=
getStyles
(
theme
);
const
whiteSpacePreWrap
=
{
label
:
'white-space-pre-wrap'
,
whiteSpace
:
'pre-wrap'
,
};
return
(
<
td
className=
{
style
.
logsRowMessage
}
>
<
div
className=
{
cx
(
styles
.
positionRelative
,
{
[
styles
.
horizontalScroll
]:
!
wrapLogMessage
})
}
>
...
...
@@ -113,7 +114,7 @@ class UnThemedLogRowMessage extends PureComponent<Props> {
<
span
className=
{
cx
(
styles
.
positionRelative
,
{
[
styles
.
rowWithContext
]:
showContext
})
}
>
{
needsHighlighter
?
(
<
Highlighter
style=
{
styles
.
whiteSpacePreWrap
}
style=
{
whiteSpacePreWrap
}
textToHighlight=
{
entry
}
searchWords=
{
highlights
}
findChunks=
{
findHighlightChunksInText
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment