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
818a2f3d
Commit
818a2f3d
authored
Mar 19, 2020
by
Ivana Huckova
Committed by
Arve Knudsen
Mar 19, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Design tweaks (#22886)
(cherry picked from commit
8ba75e77
)
parent
7f52e023
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
public/app/features/explore/RichHistory/RichHistoryCard.test.tsx
+2
-2
public/app/features/explore/RichHistory/RichHistoryCard.tsx
+5
-5
No files found.
public/app/features/explore/RichHistory/RichHistoryCard.test.tsx
View file @
818a2f3d
...
@@ -71,9 +71,9 @@ describe('RichHistoryCard', () => {
...
@@ -71,9 +71,9 @@ describe('RichHistoryCard', () => {
const
wrapper
=
setup
();
const
wrapper
=
setup
();
expect
(
wrapper
.
find
({
'aria-label'
:
'Data source name'
}).
text
()).
toEqual
(
'Test datasource'
);
expect
(
wrapper
.
find
({
'aria-label'
:
'Data source name'
}).
text
()).
toEqual
(
'Test datasource'
);
});
});
it
(
'should render "
Not linked to existing data sourc
e" if removed data source'
,
()
=>
{
it
(
'should render "
Data source does not exist anymor
e" if removed data source'
,
()
=>
{
const
wrapper
=
setup
({
isRemoved
:
true
});
const
wrapper
=
setup
({
isRemoved
:
true
});
expect
(
wrapper
.
find
({
'aria-label'
:
'Data source name'
}).
text
()).
toEqual
(
'
Not linked to existing data sourc
e'
);
expect
(
wrapper
.
find
({
'aria-label'
:
'Data source name'
}).
text
()).
toEqual
(
'
Data source does not exist anymor
e'
);
});
});
describe
(
'commenting'
,
()
=>
{
describe
(
'commenting'
,
()
=>
{
...
...
public/app/features/explore/RichHistory/RichHistoryCard.tsx
View file @
818a2f3d
...
@@ -35,7 +35,7 @@ const getStyles = stylesFactory((theme: GrafanaTheme, isRemoved: boolean) => {
...
@@ -35,7 +35,7 @@ const getStyles = stylesFactory((theme: GrafanaTheme, isRemoved: boolean) => {
:
theme
.
colors
.
white
:
theme
.
colors
.
white
:
isRemoved
:
isRemoved
?
theme
.
colors
.
gray15
?
theme
.
colors
.
gray15
:
theme
.
colors
.
dark7
;
:
theme
.
colors
.
gray05
;
const
cardBoxShadow
=
theme
.
isLight
?
`0px 2px 2px
${
borderColor
}
`
:
`0px 2px 4px black`
;
const
cardBoxShadow
=
theme
.
isLight
?
`0px 2px 2px
${
borderColor
}
`
:
`0px 2px 4px black`
;
return
{
return
{
...
@@ -46,7 +46,7 @@ const getStyles = stylesFactory((theme: GrafanaTheme, isRemoved: boolean) => {
...
@@ -46,7 +46,7 @@ const getStyles = stylesFactory((theme: GrafanaTheme, isRemoved: boolean) => {
margin:
${
theme
.
spacing
.
sm
}
0;
margin:
${
theme
.
spacing
.
sm
}
0;
box-shadow:
${
cardBoxShadow
}
;
box-shadow:
${
cardBoxShadow
}
;
background-color:
${
cardColor
}
;
background-color:
${
cardColor
}
;
border-radius:
${
theme
.
border
.
radius
}
;
border-radius:
${
theme
.
border
.
radius
.
sm
}
;
.starred {
.starred {
color:
${
theme
.
colors
.
orange
}
;
color:
${
theme
.
colors
.
orange
}
;
}
}
...
@@ -71,7 +71,7 @@ const getStyles = stylesFactory((theme: GrafanaTheme, isRemoved: boolean) => {
...
@@ -71,7 +71,7 @@ const getStyles = stylesFactory((theme: GrafanaTheme, isRemoved: boolean) => {
display: flex;
display: flex;
align-items: center;
align-items: center;
font-size:
${
theme
.
typography
.
size
.
sm
}
;
font-size:
${
theme
.
typography
.
size
.
sm
}
;
font-weight:
${
theme
.
typography
.
weight
.
bold
}
;
font-weight:
${
theme
.
typography
.
weight
.
semi
bold
}
;
`
,
`
,
queryActionButtons
:
css
`
queryActionButtons
:
css
`
max-width:
${
rigtColumnContentWidth
}
;
max-width:
${
rigtColumnContentWidth
}
;
...
@@ -84,7 +84,7 @@ const getStyles = stylesFactory((theme: GrafanaTheme, isRemoved: boolean) => {
...
@@ -84,7 +84,7 @@ const getStyles = stylesFactory((theme: GrafanaTheme, isRemoved: boolean) => {
}
}
`
,
`
,
queryContainer
:
css
`
queryContainer
:
css
`
font-weight:
${
theme
.
typography
.
weight
.
bold
}
;
font-weight:
${
theme
.
typography
.
weight
.
semi
bold
}
;
width: calc(100% -
${
rigtColumnWidth
}
);
width: calc(100% -
${
rigtColumnWidth
}
);
`
,
`
,
queryRow
:
css
`
queryRow
:
css
`
...
@@ -236,7 +236,7 @@ export function RichHistoryCard(props: Props) {
...
@@ -236,7 +236,7 @@ export function RichHistoryCard(props: Props) {
<
div
className=
{
styles
.
datasourceContainer
}
>
<
div
className=
{
styles
.
datasourceContainer
}
>
<
img
src=
{
dsImg
}
aria
-
label=
"Data source icon"
/>
<
img
src=
{
dsImg
}
aria
-
label=
"Data source icon"
/>
<
div
aria
-
label=
"Data source name"
>
<
div
aria
-
label=
"Data source name"
>
{
isRemoved
?
'
Not linked to existing data sourc
e'
:
query
.
datasourceName
}
{
isRemoved
?
'
Data source does not exist anymor
e'
:
query
.
datasourceName
}
</
div
>
</
div
>
</
div
>
</
div
>
{
queryActionButtons
}
{
queryActionButtons
}
...
...
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