Font update, bug fixes (#85)

* Fix grafana bugs * Update grafana font to source sans pro * Revert code format change
coderabbitai · Aug 27, 2024 · 2b72716 · 2b72716
1 parent 3daf0e9
commit 2b72716
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/packages/grafana-data/src/themes/createTypography.ts b/packages/grafana-data/src/themes/createTypography.ts
@@ -53,8 +53,8 @@ export interface ThemeTypographyInput {
   htmlFontSize?: number;
 }
 
-const defaultFontFamily = 'Nunito, Roboto, Arial'; //'"Roboto", "Helvetica", "Arial", sans-serif';
-const defaultFontFamilyMonospace = "'Nunito Mono', monospace";
+const defaultFontFamily = '"Source Sans Pro", Nunito, Roboto, Arial'; //'"Roboto", "Helvetica", "Arial", sans-serif';
+const defaultFontFamilyMonospace = "'Nunito Mono', 'Roboto Mono', monospace"; // "'Roboto Mono', monospace";
 
 export function createTypography(colors: ThemeColors, typographyInput: ThemeTypographyInput = {}): ThemeTypography {
   const {

diff --git a/public/app/features/dashboard/containers/DashboardPage.tsx b/public/app/features/dashboard/containers/DashboardPage.tsx
@@ -47,7 +47,14 @@ import { explicitlyControlledMigrationPanels, autoMigrateAngular } from '../stat
 import { cleanUpDashboardAndVariables } from '../state/actions';
 import { initDashboard } from '../state/initDashboard';
 
-import { DashboardPageRouteParams, DashboardPageRouteSearchParams } from './types';
+import { DashboardPageRouteSearchParams } from './types';
+export interface DashboardPageRouteParams {
+  uid?: string;
+  type?: string;
+  slug?: string;
+  accessToken?: string;
+  version?: number;
+}
 
 import 'react-grid-layout/css/styles.css';
 import 'react-resizable/css/styles.css';
@@ -207,7 +214,7 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
       routeName: this.props.route.routeName,
       fixUrl: !isPublic && !FNDashboard,
       accessToken: match.params.accessToken,
-      keybindingSrv: this.context.keybindings,
+      keybindingSrv: this.context?.keybindings,
     });
 
     // small delay to start live updates

diff --git a/public/app/features/dashboard/containers/SoloPanelPage.tsx b/public/app/features/dashboard/containers/SoloPanelPage.tsx
@@ -55,7 +55,7 @@ export class SoloPanelPage extends Component<Props, State> {
       urlType: match.params.type,
       routeName: route.routeName,
       fixUrl: false,
-      keybindingSrv: this.context.keybindings,
+      keybindingSrv: this.context?.keybindings,
     });
   }
 

diff --git a/public/app/features/dashboard/state/initDashboard.ts b/public/app/features/dashboard/state/initDashboard.ts
@@ -43,7 +43,7 @@ export interface InitDashboardArgs {
   accessToken?: string;
   routeName?: string;
   fixUrl: boolean;
-  keybindingSrv: KeybindingSrv;
+  keybindingSrv?: KeybindingSrv;
 }
 
 async function fetchDashboard(