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
84b2c044
Commit
84b2c044
authored
Feb 28, 2019
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed right side scrollbar margin on dashboard page
parent
1478f38d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
+10
-3
packages/grafana-ui/src/components/CustomScrollbar/CustomScrollbar.tsx
+2
-2
public/app/features/dashboard/containers/DashboardPage.tsx
+6
-1
public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap
+2
-0
No files found.
packages/grafana-ui/src/components/CustomScrollbar/CustomScrollbar.tsx
View file @
84b2c044
import
React
,
{
Pure
Component
}
from
'react'
;
import
React
,
{
Component
}
from
'react'
;
import
isNil
from
'lodash/isNil'
;
import
classNames
from
'classnames'
;
import
Scrollbars
from
'react-custom-scrollbars'
;
...
...
@@ -20,7 +20,7 @@ interface Props {
/**
* Wraps component into <Scrollbars> component from `react-custom-scrollbars`
*/
export
class
CustomScrollbar
extends
Pure
Component
<
Props
>
{
export
class
CustomScrollbar
extends
Component
<
Props
>
{
static
defaultProps
:
Partial
<
Props
>
=
{
autoHide
:
false
,
autoHideTimeout
:
200
,
...
...
public/app/features/dashboard/containers/DashboardPage.tsx
View file @
84b2c044
...
...
@@ -268,7 +268,12 @@ export class DashboardPage extends PureComponent<Props, State> {
onAddPanel=
{
this
.
onAddPanel
}
/>
<
div
className=
"scroll-canvas scroll-canvas--dashboard"
>
<
CustomScrollbar
autoHeightMin=
{
'100%'
}
setScrollTop=
{
this
.
setScrollTop
}
scrollTop=
{
scrollTop
}
>
<
CustomScrollbar
autoHeightMin=
{
'100%'
}
setScrollTop=
{
this
.
setScrollTop
}
scrollTop=
{
scrollTop
}
className=
"custom-scrollbar--page"
>
{
editview
&&
<
DashboardSettings
dashboard=
{
dashboard
}
/>
}
{
initError
&&
this
.
renderInitFailedState
()
}
...
...
public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap
View file @
84b2c044
...
...
@@ -109,6 +109,7 @@ exports[`DashboardPage Dashboard init completed Should render dashboard grid 1`
autoHide={false}
autoHideDuration={200}
autoHideTimeout={200}
className="custom-scrollbar--page"
hideTracksWhenNotNeeded={false}
scrollTop={0}
setScrollTop={[Function]}
...
...
@@ -344,6 +345,7 @@ exports[`DashboardPage When dashboard has editview url state should render setti
autoHide={false}
autoHideDuration={200}
autoHideTimeout={200}
className="custom-scrollbar--page"
hideTracksWhenNotNeeded={false}
scrollTop={0}
setScrollTop={[Function]}
...
...
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