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

DashboardSettings: Fixed scrolling (#23108)

Browse Source
This commit is contained in:
Torkel Ödegaard 2020-03-26 14:36:24 +01:00 committed by GitHub
parent 4c5005e575
commit 936594f5d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
View File

@ -9,6 +9,7 @@ import { DashboardModel } from '../../state/DashboardModel';
import { BackButton } from 'app/core/components/BackButton/BackButton'; import { BackButton } from 'app/core/components/BackButton/BackButton';
import { e2e } from '@grafana/e2e'; import { e2e } from '@grafana/e2e';
import { updateLocation } from 'app/core/actions'; import { updateLocation } from 'app/core/actions';
import { CustomScrollbar } from '@grafana/ui';
export interface Props { export interface Props {
dashboard: DashboardModel | null; dashboard: DashboardModel | null;
@ -57,7 +58,9 @@ export class DashboardSettings extends PureComponent<Props> {
<span>{dashboard.title} / Settings</span> <span>{dashboard.title} / Settings</span>
</div> </div>
</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> </div>
); );
} }

6
public/sass/components/_dashboard_settings.scss
View File

@ -8,15 +8,17 @@
bottom: 0; bottom: 0;
z-index: $zindex-modal; z-index: $zindex-modal;
background: $body-bg; background: $body-bg;
display: flex;
flex-direction: column;
} }
.dashboard-settings__body1 { .dashboard-settings__body1 {
height: calc(100% - #{$navbarHeight}); min-height: 100%;
width: 100%; width: 100%;
} }
.dashboard-settings__body2 { .dashboard-settings__body2 {
height: 100%; min-height: 100%;
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;

2
public/sass/components/_navbar.scss
View File

@ -4,7 +4,7 @@
height: $navbarHeight; height: $navbarHeight;
padding: 0 16px 0 60px; padding: 0 16px 0 60px;
display: flex; display: flex;
flex-grow: 1; flex-grow: 0;
border-bottom: 1px solid transparent; border-bottom: 1px solid transparent;
transition-duration: 350ms; transition-duration: 350ms;
transition-timing-function: ease-in-out; transition-timing-function: ease-in-out;