Skip to content

Commit 62ae185

Browse files
authoredSep 18, 2023
Font update, bug fixes (#85)
* Fix grafana bugs * Update grafana font to source sans pro * Revert code format change
1 parent 03dd9cc commit 62ae185

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed
 

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ export interface ThemeTypographyInput {
6363
htmlFontSize?: number;
6464
}
6565

66-
const defaultFontFamily = 'Nunito, Roboto, Arial'; //'"Roboto", "Helvetica", "Arial", sans-serif';
67-
const defaultFontFamilyMonospace = "'Nunito Mono', monospace";
66+
const defaultFontFamily = '"Source Sans Pro", Nunito, Roboto, Arial'; //'"Roboto", "Helvetica", "Arial", sans-serif';
67+
const defaultFontFamilyMonospace = "'Nunito Mono', 'Roboto Mono', monospace"; // "'Roboto Mono', monospace";
6868

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

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ export interface DashboardPageRouteParams {
6060
type?: string;
6161
slug?: string;
6262
accessToken?: string;
63+
version?: number;
6364
}
6465

6566
export type DashboardPageRouteSearchParams = {
@@ -250,7 +251,7 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
250251
routeName: this.props.route.routeName,
251252
fixUrl: !isPublic && !FNDashboard,
252253
accessToken: match.params.accessToken,
253-
keybindingSrv: this.context.keybindings,
254+
keybindingSrv: this.context?.keybindings,
254255
});
255256

256257
// small delay to start live updates

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

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export interface InitDashboardArgs {
4141
accessToken?: string;
4242
routeName?: string;
4343
fixUrl: boolean;
44-
keybindingSrv: KeybindingSrv;
44+
keybindingSrv?: KeybindingSrv;
4545
}
4646

4747
async function fetchDashboard(

0 commit comments

Comments
 (0)
Failed to load comments.