RichHistory: Design Tweaks (#22703)

* design tweaks

* RichHistory: Design tweaks
This commit is contained in:
Torkel Ödegaard 2020-03-11 09:37:35 +01:00 committed by GitHub
parent 4845321b43
commit bbed213115
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 34 deletions

View File

@ -2,7 +2,7 @@ import React, { useState } from 'react';
import { connect } from 'react-redux';
import { hot } from 'react-hot-loader';
import { css, cx } from 'emotion';
import { stylesFactory, useTheme, Forms } from '@grafana/ui';
import { stylesFactory, useTheme, Forms, styleMixins } from '@grafana/ui';
import { GrafanaTheme, AppEvents, DataSourceApi } from '@grafana/data';
import { RichHistoryQuery, ExploreId } from 'app/types/explore';
import { copyStringToClipboard, createUrlFromRichHistory, createDataQuery } from 'app/core/utils/richHistory';
@ -22,20 +22,17 @@ interface Props {
const getStyles = stylesFactory((theme: GrafanaTheme, hasComment?: boolean) => {
const bgColor = theme.isLight ? theme.colors.gray5 : theme.colors.dark4;
const cardColor = theme.isLight ? theme.colors.white : theme.colors.dark7;
const cardBottomPadding = hasComment ? theme.spacing.sm : theme.spacing.xs;
const cardBoxShadow = theme.isLight ? `0px 2px 2px ${bgColor}` : `0px 2px 4px black`;
return {
queryCard: css`
${styleMixins.listItem(theme)}
display: flex;
border: 1px solid ${bgColor};
padding: ${theme.spacing.sm} ${theme.spacing.sm} ${cardBottomPadding};
margin: ${theme.spacing.sm} 0;
box-shadow: ${cardBoxShadow};
background-color: ${cardColor};
border-radius: ${theme.border.radius};
.starred {
color: ${theme.colors.blue77};
color: ${theme.colors.orange};
}
`,
queryCardLeft: css`
@ -47,16 +44,14 @@ const getStyles = stylesFactory((theme: GrafanaTheme, hasComment?: boolean) => {
width: 150px;
display: flex;
justify-content: flex-end;
i {
font-size: ${theme.typography.size.lg};
font-weight: ${theme.typography.weight.bold};
margin: 3px;
margin: ${theme.spacing.xs};
cursor: pointer;
}
`,
queryRow: css`
border-top: 1px solid ${bgColor};
font-weight: ${theme.typography.weight.bold};
word-break: break-all;
padding: 4px 2px;
:first-child {

View File

@ -22,10 +22,13 @@ import { RichHistory, Tabs } from './RichHistory';
import { deleteRichHistory } from '../state/actions';
const getStyles = stylesFactory((theme: GrafanaTheme) => {
const bgColor = theme.isLight ? theme.colors.gray5 : theme.colors.dark4;
const bgColor = theme.isLight ? theme.colors.gray5 : theme.colors.gray15;
const bg = theme.isLight ? theme.colors.gray7 : theme.colors.dark2;
const borderColor = theme.isLight ? theme.colors.gray5 : theme.colors.dark6;
const handleShadow = theme.isLight ? `0px 2px 2px ${bgColor}` : `0px 2px 4px black`;
const handleHover = theme.isLight ? theme.colors.gray10 : theme.colors.gray33;
const handleDots = theme.isLight ? theme.colors.gray70 : theme.colors.gray33;
const handleDotsHover = theme.isLight ? theme.colors.gray33 : theme.colors.dark7;
return {
container: css`
position: fixed !important;
@ -44,20 +47,31 @@ const getStyles = stylesFactory((theme: GrafanaTheme) => {
opacity: 0;
transform: translateY(150px);
`,
handle: css`
background-color: ${borderColor};
height: 10px;
width: 202px;
border-radius: 10px;
position: absolute;
top: -5px;
left: calc(50% - 101px);
padding: ${theme.spacing.xs};
box-shadow: ${handleShadow};
rzHandle: css`
background: ${bgColor};
transition: 0.3s background ease-in-out;
position: relative;
width: 200px !important;
left: calc(50% - 100px) !important;
cursor: grab;
hr {
border-top: 2px dotted ${theme.colors.gray70};
margin: 0;
border-radius: 4px;
&:hover {
background-color: ${handleHover};
&:after {
border-color: ${handleDotsHover};
}
}
&:after {
content: '';
display: block;
height: 2px;
position: relative;
top: 4px;
border-top: 4px dotted ${handleDots};
margin: 0 4px;
}
`,
};
@ -86,16 +100,11 @@ function RichHistoryContainer(props: Props) {
const styles = getStyles(theme);
const drawerWidth = `${width + 31.5}px`;
const drawerHandle = (
<div className={styles.handle}>
<hr />
</div>
);
return (
<Resizable
className={cx(styles.container, visible ? styles.drawerActive : styles.drawerNotActive)}
defaultSize={{ width: drawerWidth, height: '400px' }}
handleClasses={{ top: styles.rzHandle }}
enable={{
top: true,
right: false,
@ -110,7 +119,6 @@ function RichHistoryContainer(props: Props) {
maxWidth={drawerWidth}
minWidth={drawerWidth}
>
{drawerHandle}
<RichHistory
richHistory={richHistory}
firstTab={firstTab}