Skip to content

Font update, bug fixes #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 18, 2023
Merged

Font update, bug fixes #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bb1429
Fix grafana bugs
Spikatrix Sep 18, 2023
f430b26
Update grafana font to source sans pro
Spikatrix Sep 18, 2023
95b694c
Revert code format change
Spikatrix Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/grafana-data/src/themes/createTypography.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,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 {
Expand Down
3 changes: 2 additions & 1 deletion public/app/features/dashboard/containers/DashboardPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ export interface DashboardPageRouteParams {
type?: string;
slug?: string;
accessToken?: string;
version?: number;
}

export type DashboardPageRouteSearchParams = {
Expand Down Expand Up @@ -250,7 +251,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
Expand Down
2 changes: 1 addition & 1 deletion public/app/features/dashboard/containers/SoloPanelPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,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,
});
}

Expand Down
2 changes: 1 addition & 1 deletion public/app/features/dashboard/state/initDashboard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export interface InitDashboardArgs {
accessToken?: string;
routeName?: string;
fixUrl: boolean;
keybindingSrv: KeybindingSrv;
keybindingSrv?: KeybindingSrv;
}

async function fetchDashboard(
Expand Down