Skip to content

Commit ae509b3

Browse files
committed
Use the correct font in the help examples
1 parent be13e62 commit ae509b3

File tree

4 files changed

+18
-1
lines changed

4 files changed

+18
-1
lines changed

ui/frontend/HelpExample.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import * as actions from './actions';
66
import { useAppDispatch } from './hooks';
77

88
import * as styles from './HelpExample.module.css';
9+
import prismOverrides from './prismjs-overrides.css';
910
import prismTheme from 'prismjs/themes/prism-okaidia.css';
1011

1112
export interface HelpExampleProps {
@@ -23,6 +24,7 @@ const HelpExample: React.FC<HelpExampleProps> = ({ code }) => {
2324
</button>
2425
<root.div>
2526
<link href={prismTheme} rel="stylesheet" />
27+
<link href={prismOverrides} rel="stylesheet" />
2628

2729
<Prism language="rust">{code}</Prism>
2830
</root.div>

ui/frontend/declarations.d.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ declare module 'prismjs/themes/*.css' {
88
export default content;
99
}
1010

11+
declare module '*prismjs-overrides.css' {
12+
const content: string;
13+
export default content;
14+
}
15+
1116
declare module '*.svg' {
1217
const content: string;
1318
export default content;

ui/frontend/prismjs-overrides.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
code[class*='language-'],
2+
pre[class*='language-'] {
3+
font-family: 'Source Code Pro', monospace;
4+
font-optical-sizing: auto;
5+
}

ui/frontend/webpack.config.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,13 @@ module.exports = function(_, argv) {
9292
{
9393
test: /\.css$/,
9494
oneOf: [
95+
// Prism styles as separate files for the shadow DOM
9596
{
96-
test: /prismjs\/themes/,
97+
test: [/prismjs\/themes/, /prismjs-overrides.css$/],
9798
type: 'asset/resource',
9899
},
100+
101+
// Our normal CSS
99102
{
100103
test: /\.module.css$/,
101104
exclude: /node_modules/,
@@ -112,6 +115,8 @@ module.exports = function(_, argv) {
112115
"postcss-loader",
113116
],
114117
},
118+
119+
// Everything else
115120
{
116121
include: /node_modules/,
117122
use: [

0 commit comments

Comments
 (0)