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
936594f5
Unverified
Commit
936594f5
authored
Mar 26, 2020
by
Torkel Ödegaard
Committed by
GitHub
Mar 26, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DashboardSettings: Fixed scrolling (#23108)
parent
4c5005e5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
+4
-1
public/sass/components/_dashboard_settings.scss
+4
-2
public/sass/components/_navbar.scss
+1
-1
No files found.
public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
View file @
936594f5
...
...
@@ -9,6 +9,7 @@ import { DashboardModel } from '../../state/DashboardModel';
import
{
BackButton
}
from
'app/core/components/BackButton/BackButton'
;
import
{
e2e
}
from
'@grafana/e2e'
;
import
{
updateLocation
}
from
'app/core/actions'
;
import
{
CustomScrollbar
}
from
'@grafana/ui'
;
export
interface
Props
{
dashboard
:
DashboardModel
|
null
;
...
...
@@ -57,7 +58,9 @@ export class DashboardSettings extends PureComponent<Props> {
<
span
>
{
dashboard
.
title
}
/ Settings
</
span
>
</
div
>
</
div
>
<
div
className=
"dashboard-settings__body1"
ref=
{
element
=>
(
this
.
element
=
element
)
}
/>
<
CustomScrollbar
>
<
div
className=
"dashboard-settings__body1"
ref=
{
element
=>
(
this
.
element
=
element
)
}
/>
</
CustomScrollbar
>
</
div
>
);
}
...
...
public/sass/components/_dashboard_settings.scss
View file @
936594f5
...
...
@@ -8,15 +8,17 @@
bottom
:
0
;
z-index
:
$zindex-modal
;
background
:
$body-bg
;
display
:
flex
;
flex-direction
:
column
;
}
.dashboard-settings__body1
{
height
:
calc
(
100%
-
#{
$navbarHeight
}
)
;
min-height
:
100%
;
width
:
100%
;
}
.dashboard-settings__body2
{
height
:
100%
;
min-
height
:
100%
;
width
:
100%
;
display
:
flex
;
flex-direction
:
row
;
...
...
public/sass/components/_navbar.scss
View file @
936594f5
...
...
@@ -4,7 +4,7 @@
height
:
$navbarHeight
;
padding
:
0
16px
0
60px
;
display
:
flex
;
flex-grow
:
1
;
flex-grow
:
0
;
border-bottom
:
1px
solid
transparent
;
transition-duration
:
350ms
;
transition-timing-function
:
ease-in-out
;
...
...
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