Skip to content

Commit 2b72716

Browse files
SpikatrixGurinderRawala
authored andcommitted
Font update, bug fixes (#85)
* Fix grafana bugs * Update grafana font to source sans pro * Revert code format change
1 parent 3daf0e9 commit 2b72716

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

packages/grafana-data/src/themes/createTypography.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ export interface ThemeTypographyInput {
5353
htmlFontSize?: number;
5454
}
5555

56-
const defaultFontFamily = 'Nunito, Roboto, Arial'; //'"Roboto", "Helvetica", "Arial", sans-serif';
57-
const defaultFontFamilyMonospace = "'Nunito Mono', monospace";
56+
const defaultFontFamily = '"Source Sans Pro", Nunito, Roboto, Arial'; //'"Roboto", "Helvetica", "Arial", sans-serif';
57+
const defaultFontFamilyMonospace = "'Nunito Mono', 'Roboto Mono', monospace"; // "'Roboto Mono', monospace";
5858

5959
export function createTypography(colors: ThemeColors, typographyInput: ThemeTypographyInput = {}): ThemeTypography {
6060
const {

public/app/features/dashboard/containers/DashboardPage.tsx

+9-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,14 @@ import { explicitlyControlledMigrationPanels, autoMigrateAngular } from '../stat
4747
import { cleanUpDashboardAndVariables } from '../state/actions';
4848
import { initDashboard } from '../state/initDashboard';
4949

50-
import { DashboardPageRouteParams, DashboardPageRouteSearchParams } from './types';
50+
import { DashboardPageRouteSearchParams } from './types';
51+
export interface DashboardPageRouteParams {
52+
uid?: string;
53+
type?: string;
54+
slug?: string;
55+
accessToken?: string;
56+
version?: number;
57+
}
5158

5259
import 'react-grid-layout/css/styles.css';
5360
import 'react-resizable/css/styles.css';
@@ -207,7 +214,7 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
207214
routeName: this.props.route.routeName,
208215
fixUrl: !isPublic && !FNDashboard,
209216
accessToken: match.params.accessToken,
210-
keybindingSrv: this.context.keybindings,
217+
keybindingSrv: this.context?.keybindings,
211218
});
212219

213220
// small delay to start live updates

public/app/features/dashboard/containers/SoloPanelPage.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export class SoloPanelPage extends Component<Props, State> {
5555
urlType: match.params.type,
5656
routeName: route.routeName,
5757
fixUrl: false,
58-
keybindingSrv: this.context.keybindings,
58+
keybindingSrv: this.context?.keybindings,
5959
});
6060
}
6161

public/app/features/dashboard/state/initDashboard.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export interface InitDashboardArgs {
4343
accessToken?: string;
4444
routeName?: string;
4545
fixUrl: boolean;
46-
keybindingSrv: KeybindingSrv;
46+
keybindingSrv?: KeybindingSrv;
4747
}
4848

4949
async function fetchDashboard(

0 commit comments

Comments
 (0)