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
8f1115c6
Unverified
Commit
8f1115c6
authored
Jul 07, 2020
by
Peter Holmberg
Committed by
GitHub
Jul 07, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: Icon and Tooltip on Variables editor (#26086)
parent
6b0d7537
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
packages/grafana-ui/src/components/FormLabel/FormLabel.tsx
+1
-1
packages/grafana-ui/src/components/Forms/Legacy/Switch/Switch.tsx
+2
-1
public/app/features/variables/editor/SelectionOptionsEditor.tsx
+1
-1
No files found.
packages/grafana-ui/src/components/FormLabel/FormLabel.tsx
View file @
8f1115c6
...
...
@@ -34,7 +34,7 @@ export const FormLabel: FunctionComponent<Props> = ({
{
tooltip
&&
(
<
Tooltip
placement=
"top"
content=
{
tooltip
}
theme=
{
'info'
}
>
<
div
className=
"gf-form-help-icon gf-form-help-icon--right-normal"
>
<
Icon
name=
"info-circle"
size=
"
xs
"
style=
{
{
marginLeft
:
'10px'
}
}
/>
<
Icon
name=
"info-circle"
size=
"
sm
"
style=
{
{
marginLeft
:
'10px'
}
}
/>
</
div
>
</
Tooltip
>
)
}
...
...
packages/grafana-ui/src/components/Forms/Legacy/Switch/Switch.tsx
View file @
8f1115c6
...
...
@@ -2,6 +2,7 @@ import React, { PureComponent } from 'react';
import
uniqueId
from
'lodash/uniqueId'
;
import
{
Tooltip
}
from
'../../../Tooltip/Tooltip'
;
import
*
as
PopperJS
from
'popper.js'
;
import
{
Icon
}
from
'../../..'
;
export
interface
Props
{
label
:
string
;
...
...
@@ -54,7 +55,7 @@ export class Switch extends PureComponent<Props, State> {
{
tooltip
&&
(
<
Tooltip
placement=
{
tooltipPlacement
?
tooltipPlacement
:
'auto'
}
content=
{
tooltip
}
theme=
{
'info'
}
>
<
div
className=
"gf-form-help-icon gf-form-help-icon--right-normal"
>
<
i
className=
"fa fa-info-circle"
/>
<
Icon
name=
"info-circle"
size=
"sm"
style=
{
{
marginLeft
:
'10px'
}
}
/>
</
div
>
</
Tooltip
>
)
}
...
...
public/app/features/variables/editor/SelectionOptionsEditor.tsx
View file @
8f1115c6
...
...
@@ -53,7 +53,7 @@ export const SelectionOptionsEditor: FunctionComponent<SelectionOptionsEditorPro
labelClass=
"width-10"
checked=
{
props
.
variable
.
includeAll
}
onChange=
{
onIncludeAllChanged
}
tooltip=
{
'Enables
multiple values to be selected at the same time
'
}
tooltip=
{
'Enables
an option to include all variables
'
}
/>
</
div
>
</
div
>
...
...
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