IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Explore: use GrafanaTheme2 (#37305)

Browse Source 
* Explore: refactor to use GrafanaTheme2

* Explore: change style values

* Explore: change styles

* Explore: change last style values to the correct ones

* Explore: remove stylesFactory

* Update public/app/features/explore/Logs.tsx

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>

* Update public/app/features/explore/Logs.tsx

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>

* Update public/app/features/explore/Logs.tsx

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
This commit is contained in:
Olof Bourghardt 2021-08-02 15:47:41 +02:00 committed by GitHub
parent e5f52a05f2
commit bc6e7d32e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
public/app/features/explore/Logs.tsx
View File

@ -16,9 +16,9 @@ import {
LogsSortOrder,
LinkModel,
Field,
GrafanaTheme,
DataQuery,
DataFrame,
GrafanaTheme2,
} from '@grafana/data';
import {
RadioButtonGroup,
@ -27,9 +27,9 @@ import {
InlineField,
InlineFieldRow,
InlineSwitch,
withTheme,
stylesFactory,
withTheme2,
TooltipDisplayMode,
Themeable2,
} from '@grafana/ui';
import store from 'app/core/store';
import { dedupLogRows, filterLogLevels } from 'app/core/logs_model';
@ -45,14 +45,14 @@ const SETTINGS_KEYS = {
prettifyLogMessage: 'grafana.explore.logs.prettifyLogMessage',
};
interface Props {
interface Props extends Themeable2 {
width: number;
logRows: LogRowModel[];
logsMeta?: LogsMetaItem[];
logsSeries?: DataFrame[];
logsQueries?: DataQuery[];
visibleRange?: AbsoluteTimeRange;
theme: GrafanaTheme;
theme: GrafanaTheme2;
highlighterExpressions?: string[];
loading: boolean;
absoluteRange: AbsoluteTimeRange;
@ -418,9 +418,9 @@ export class UnthemedLogs extends PureComponent<Props, State> {
}
}
export const Logs = withTheme(UnthemedLogs);
export const Logs = withTheme2(UnthemedLogs);
const getStyles = stylesFactory((theme: GrafanaTheme) => {
const getStyles = (theme: GrafanaTheme2) => {
return {
noData: css`
> * {
@ -432,17 +432,17 @@ const getStyles = stylesFactory((theme: GrafanaTheme) => {
justify-content: space-between;
align-items: baseline;
flex-wrap: wrap;
background-color: ${theme.colors.bg1};
padding: ${theme.spacing.sm} ${theme.spacing.md};
border-radius: ${theme.border.radius.md};
margin: ${theme.spacing.md} 0 ${theme.spacing.sm};
border: 1px solid ${theme.colors.border2};
background-color: ${theme.colors.background.primary};
padding: ${theme.spacing(1, 2)};
border-radius: ${theme.shape.borderRadius()};
margin: ${theme.spacing(2, 0, 1)};
border: 1px solid ${theme.colors.border.medium};
`,
flipButton: css`
margin: ${theme.spacing.xs} 0 0 ${theme.spacing.sm};
margin: ${theme.spacing(0.5, 0, 0, 1)};
`,
radioButtons: css`
margin: 0 ${theme.spacing.sm};
margin: 0 ${theme.spacing(1)};
`,
logsSection: css`
display: flex;
@ -455,7 +455,7 @@ const getStyles = stylesFactory((theme: GrafanaTheme) => {
`,
infoText: css`
font-size: ${theme.typography.size.sm};
color: ${theme.colors.textWeak};
color: ${theme.colors.text.secondary};
`,
};
});
};