IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-16 18:34:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:grafana/grafana

Browse Source
This commit is contained in:
Torkel Ödegaard 2019-02-21 12:18:34 +01:00
commit b21eb36909
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grafana-ui/src/components/CustomScrollbar/__snapshots__/CustomScrollbar.test.tsx.snap
View File

@ -2,7 +2,7 @@
exports[`CustomScrollbar renders correctly 1`] = `
<div
className="custom-scrollbars"
className="custom-scrollbar"
style={
Object {
"height": "auto",

2
public/app/features/admin/__snapshots__/ServerStats.test.tsx.snap
View File

@ -5,7 +5,7 @@ exports[`ServerStats Should render table with stats 1`] = `
className="page-scrollbar-wrapper"
>
<div
className="custom-scrollbars"
className="custom-scrollbar custom-scrollbar--page"
style={
Object {
"height": "auto",

2
public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap
View File

@ -109,7 +109,6 @@ exports[`DashboardPage Dashboard init completed Should render dashboard grid 1`
autoHide={false}
autoHideDuration={200}
autoHideTimeout={200}
customClassName="custom-scrollbars"
hideTracksWhenNotNeeded={false}
scrollTop={0}
setScrollTop={[Function]}
@ -345,7 +344,6 @@ exports[`DashboardPage When dashboard has editview url state should render setti
autoHide={false}
autoHideDuration={200}
autoHideTimeout={200}
customClassName="custom-scrollbars"
hideTracksWhenNotNeeded={false}
scrollTop={0}
setScrollTop={[Function]}