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
40708bef
Unverified
Commit
40708bef
authored
Jun 25, 2019
by
Torkel Ödegaard
Committed by
GitHub
Jun 25, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
TimePicker: fixed minor issues with new timepicker (#17756)
parent
2c5400c6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletions
+12
-1
packages/grafana-ui/src/components/TimePicker/TimePickerCalendar.tsx
+9
-0
packages/grafana-ui/src/components/TimePicker/_TimePicker.scss
+3
-1
No files found.
packages/grafana-ui/src/components/TimePicker/TimePickerCalendar.tsx
View file @
40708bef
...
...
@@ -28,6 +28,14 @@ export class TimePickerCalendar extends PureComponent<Props> {
onChange
(
newDate
);
};
onDrilldown
=
(
props
:
any
)
=>
{
// this is to prevent clickout side wrapper from triggering when drilling down
if
(
window
.
event
)
{
// @ts-ignore
window
.
event
.
stopPropagation
();
}
};
render
()
{
const
{
value
,
roundup
,
timeZone
}
=
this
.
props
;
let
date
=
stringToDateTimeType
(
value
,
roundup
,
timeZone
);
...
...
@@ -44,6 +52,7 @@ export class TimePickerCalendar extends PureComponent<Props> {
className=
"time-picker-calendar"
tileClassName=
"time-picker-calendar-tile"
onChange=
{
this
.
onCalendarChange
}
onDrillDown=
{
this
.
onDrilldown
}
nextLabel=
{
<
span
className=
"fa fa-angle-right"
/>
}
prevLabel=
{
<
span
className=
"fa fa-angle-left"
/>
}
/>
...
...
packages/grafana-ui/src/components/TimePicker/_TimePicker.scss
View file @
40708bef
...
...
@@ -111,8 +111,9 @@ $arrowPadding: $arrowPaddingToBorder * 3;
}
.time-picker-calendar
{
border
:
1px
solid
$
popover
-border-color
;
border
:
1px
solid
$
input
-border-color
;
color
:
$black
;
width
:
260px
;
.react-calendar__navigation__label
,
.react-calendar__navigation__arrow
,
...
...
@@ -150,6 +151,7 @@ $arrowPadding: $arrowPaddingToBorder * 3;
background
:
$panel-editor-viz-item-bg-hover
;
border
:
$panel-editor-viz-item-border-hover
;
color
:
$text-color-strong
;
position
:
relative
;
}
}
...
...
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