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
e4e40867
Commit
e4e40867
authored
Dec 05, 2018
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of github.com:grafana/grafana into develop
parents
e01c196d
aa6c52a1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
44 additions
and
24 deletions
+44
-24
public/app/core/components/Tooltip/withPopper.tsx
+0
-1
public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx
+1
-0
public/sass/components/_popper.scss
+43
-23
No files found.
public/app/core/components/Tooltip/withPopper.tsx
View file @
e4e40867
...
...
@@ -60,7 +60,6 @@ export default function withPopper(WrappedComponent) {
};
renderContent
(
content
)
{
console
.
log
(
'render content'
);
if
(
typeof
content
===
'function'
)
{
// If it's a function we assume it's a React component
const
ReactComponent
=
content
;
...
...
public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx
View file @
e4e40867
...
...
@@ -76,6 +76,7 @@ export class PanelHeaderCorner extends PureComponent<Props> {
content=
{
this
.
getInfoContent
}
className=
"popper__manager--block"
refClassName=
{
`panel-info-corner panel-info-corner--${infoMode.toLowerCase()}`
}
placement=
"bottom-start"
>
<
i
className=
"fa"
/>
<
span
className=
"panel-info-corner-inner"
/>
...
...
public/sass/components/_popper.scss
View file @
e4e40867
$popper-margin-from-ref
:
5px
;
.popper
{
position
:
absolute
;
z-index
:
$zindex-tooltip
;
...
...
@@ -11,17 +13,24 @@
height
:
0
;
border-style
:
solid
;
position
:
absolute
;
margin
:
5
px
;
margin
:
0
px
;
}
.popper
.popper__arrow
{
border-color
:
$tooltipBackground
;
}
.popper
[
data-placement
^=
'top'
]
{
margin-bottom
:
5px
;
.popper__background
{
background
:
$tooltipBackground
;
border-radius
:
$border-radius
;
box-shadow
:
0
0
2px
rgba
(
0
,
0
,
0
,
0
.5
);
padding
:
10px
;
}
// Top
.popper
[
data-placement
^=
'top'
]
{
padding-bottom
:
$popper-margin-from-ref
;
}
.popper
[
data-placement
^=
'top'
]
.popper__arrow
{
border-width
:
5px
5px
0
5px
;
border-left-color
:
transparent
;
...
...
@@ -29,34 +38,49 @@
border-bottom-color
:
transparent
;
bottom
:
-5px
;
left
:
calc
(
50%
-
5px
);
margin-top
:
0
;
margin-bottom
:
0
;
padding-top
:
5px
;
}
// Bottom
.popper
[
data-placement
^=
'bottom'
]
{
padding-top
:
5px
;
padding-top
:
$popper-margin-from-ref
;
}
.popper
[
data-placement
^=
'bottom'
]
.popper__arrow
{
border-width
:
0
5px
5px
5px
;
border-left-color
:
transparent
;
border-right-color
:
transparent
;
border-top-color
:
transparent
;
top
:
0
;
left
:
calc
(
50%
-
5px
);
}
.popper__background
{
background
:
$tooltipBackground
;
border-radius
:
3px
;
box-shadow
:
0
0
2px
rgba
(
0
,
0
,
0
,
0
.5
);
padding
:
10px
;
.popper
[
data-placement
^=
'bottom-start'
]
{
padding-top
:
$popper-margin-from-ref
;
}
.popper
[
data-placement
^=
'bottom-start'
]
.popper__arrow
{
border-width
:
0
5px
5px
5px
;
border-left-color
:
transparent
;
border-right-color
:
transparent
;
border-top-color
:
transparent
;
top
:
0
;
left
:
5px
;
}
.popper
[
data-placement
^=
'bottom'
]
.popper__arrow
{
.popper
[
data-placement
^=
'bottom-end'
]
{
padding-top
:
$popper-margin-from-ref
;
}
.popper
[
data-placement
^=
'bottom-end'
]
.popper__arrow
{
border-width
:
0
5px
5px
5px
;
border-left-color
:
transparent
;
border-right-color
:
transparent
;
border-top-color
:
transparent
;
top
:
0
;
left
:
calc
(
50%
-
8px
);
margin-top
:
0
;
margin-bottom
:
0
;
left
:
calc
(
100%
-
5px
);
}
// Right
.popper
[
data-placement
^=
'right'
]
{
padding-left
:
5px
;
padding-left
:
$popper-margin-from-ref
;
}
.popper
[
data-placement
^=
'right'
]
.popper__arrow
{
border-width
:
5px
5px
5px
0
;
...
...
@@ -64,15 +88,13 @@
border-top-color
:
transparent
;
border-bottom-color
:
transparent
;
left
:
0
;
top
:
calc
(
50%
-
8px
);
margin-left
:
0
;
margin-right
:
0
;
top
:
calc
(
50%
-
5px
);
}
// Left
.popper
[
data-placement
^=
'left'
]
{
margin-right
:
5px
;
padding-right
:
$popper-margin-from-ref
;
}
.popper
[
data-placement
^=
'left'
]
.popper__arrow
{
border-width
:
5px
0
5px
5px
;
border-top-color
:
transparent
;
...
...
@@ -80,8 +102,6 @@
border-bottom-color
:
transparent
;
right
:
-5px
;
top
:
calc
(
50%
-
5px
);
margin-left
:
0
;
margin-right
:
0
;
}
.popper__target
,
...
...
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