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
d3c50692
Unverified
Commit
d3c50692
authored
Feb 25, 2020
by
Agnès Toulet
Committed by
GitHub
Feb 25, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Admin: fix images on license page (#22413)
parent
e4d2b6c2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
9 deletions
+7
-9
public/app/features/admin/LicenseChrome.tsx
+2
-4
public/app/features/admin/UpgradePage.tsx
+5
-5
No files found.
public/app/features/admin/LicenseChrome.tsx
View file @
d3c50692
...
@@ -6,9 +6,7 @@ import { GrafanaTheme } from '@grafana/data';
...
@@ -6,9 +6,7 @@ import { GrafanaTheme } from '@grafana/data';
const
title
=
{
fontWeight
:
500
,
fontSize
:
'26px'
,
lineHeight
:
'123%'
};
const
title
=
{
fontWeight
:
500
,
fontSize
:
'26px'
,
lineHeight
:
'123%'
};
const
getStyles
=
stylesFactory
((
theme
:
GrafanaTheme
)
=>
{
const
getStyles
=
stylesFactory
((
theme
:
GrafanaTheme
)
=>
{
const
backgroundUrl
=
theme
.
isDark
const
backgroundUrl
=
theme
.
isDark
?
'public/img/licensing/header_dark.svg'
:
'public/img/licensing/header_light.svg'
;
?
'/public/img/licensing/header_dark.svg'
:
'/public/img/licensing/header_light.svg'
;
const
footerBg
=
theme
.
isDark
?
theme
.
colors
.
dark9
:
theme
.
colors
.
gray6
;
const
footerBg
=
theme
.
isDark
?
theme
.
colors
.
dark9
:
theme
.
colors
.
gray6
;
return
{
return
{
...
@@ -57,7 +55,7 @@ export const LicenseChrome: React.FC<Props> = ({ header, editionNotice, subheade
...
@@ -57,7 +55,7 @@ export const LicenseChrome: React.FC<Props> = ({ header, editionNotice, subheade
}
}
}
}
>
>
<
img
<
img
src=
"
/
public/img/grafana_icon.svg"
src=
"public/img/grafana_icon.svg"
alt=
"Grafana"
alt=
"Grafana"
width=
"80px"
width=
"80px"
style=
{
{
position
:
'absolute'
,
left
:
'23px'
,
top
:
'20px'
}
}
style=
{
{
position
:
'absolute'
,
left
:
'23px'
,
top
:
'20px'
}
}
...
...
public/app/features/admin/UpgradePage.tsx
View file @
d3c50692
...
@@ -85,9 +85,9 @@ const ServiceInfo: React.FC = () => {
...
@@ -85,9 +85,9 @@ const ServiceInfo: React.FC = () => {
<
h4
>
At your service
</
h4
>
<
h4
>
At your service
</
h4
>
<
List
>
<
List
>
<
Item
title=
"Enterprise Plugins"
image=
"
/
public/img/licensing/plugin_enterprise.svg"
/>
<
Item
title=
"Enterprise Plugins"
image=
"public/img/licensing/plugin_enterprise.svg"
/>
<
Item
title=
"Critical SLA: 2 hours"
image=
"
/
public/img/licensing/sla.svg"
/>
<
Item
title=
"Critical SLA: 2 hours"
image=
"public/img/licensing/sla.svg"
/>
<
Item
title=
"Unlimited Expert Support"
image=
"
/
public/img/licensing/customer_support.svg"
>
<
Item
title=
"Unlimited Expert Support"
image=
"public/img/licensing/customer_support.svg"
>
24x7x365 support via
24x7x365 support via
<
List
nested=
{
true
}
>
<
List
nested=
{
true
}
>
<
Item
title=
"Email"
/>
<
Item
title=
"Email"
/>
...
@@ -95,7 +95,7 @@ const ServiceInfo: React.FC = () => {
...
@@ -95,7 +95,7 @@ const ServiceInfo: React.FC = () => {
<
Item
title=
"Phone"
/>
<
Item
title=
"Phone"
/>
</
List
>
</
List
>
</
Item
>
</
Item
>
<
Item
title=
"Hand-in-hand support"
image=
"
/
public/img/licensing/handinhand_support.svg"
>
<
Item
title=
"Hand-in-hand support"
image=
"public/img/licensing/handinhand_support.svg"
>
in the upgrade process
in the upgrade process
</
Item
>
</
Item
>
</
List
>
</
List
>
...
@@ -167,7 +167,7 @@ interface ItemProps {
...
@@ -167,7 +167,7 @@ interface ItemProps {
}
}
const
Item
:
React
.
FC
<
ItemProps
>
=
({
children
,
title
,
image
})
=>
{
const
Item
:
React
.
FC
<
ItemProps
>
=
({
children
,
title
,
image
})
=>
{
const
imageUrl
=
image
?
image
:
'
/
public/img/licensing/checkmark.svg'
;
const
imageUrl
=
image
?
image
:
'public/img/licensing/checkmark.svg'
;
const
itemStyle
=
css
`
const
itemStyle
=
css
`
display: flex;
display: flex;
...
...
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