Skip to content

Commit eb76dfb

Browse files
Merge pull request #6205 from mermaid-js/Refactor/fix-styles
fix: styles for Sankey, Gantt, and User Journey diagrams
2 parents 84b03f3 + 28d7ec0 commit eb76dfb

File tree

6 files changed

+20
-10
lines changed

6 files changed

+20
-10
lines changed

.changeset/stupid-dots-do.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'mermaid': patch
3+
---
4+
5+
fix: Gantt, Sankey and User Journey diagram are now able to pick font-family from mermaid config.

packages/mermaid/src/diagrams/gantt/styles.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const getStyles = (options) =>
22
`
33
.mermaid-main-font {
4-
font-family: var(--mermaid-font-family, "trebuchet ms", verdana, arial, sans-serif);
4+
font-family: ${options.fontFamily};
55
}
66
77
.exclude-range {
@@ -45,7 +45,7 @@ const getStyles = (options) =>
4545
4646
.sectionTitle {
4747
text-anchor: start;
48-
font-family: var(--mermaid-font-family, "trebuchet ms", verdana, arial, sans-serif);
48+
font-family: ${options.fontFamily};
4949
}
5050
5151
@@ -86,13 +86,13 @@ const getStyles = (options) =>
8686
8787
.taskText {
8888
text-anchor: middle;
89-
font-family: var(--mermaid-font-family, "trebuchet ms", verdana, arial, sans-serif);
89+
font-family: ${options.fontFamily};
9090
}
9191
9292
.taskTextOutsideRight {
9393
fill: ${options.taskTextDarkColor};
9494
text-anchor: start;
95-
font-family: var(--mermaid-font-family, "trebuchet ms", verdana, arial, sans-serif);
95+
font-family: ${options.fontFamily};
9696
}
9797
9898
.taskTextOutsideLeft {
@@ -248,7 +248,7 @@ const getStyles = (options) =>
248248
text-anchor: middle;
249249
font-size: 18px;
250250
fill: ${options.titleColor || options.textColor};
251-
font-family: var(--mermaid-font-family, "trebuchet ms", verdana, arial, sans-serif);
251+
font-family: ${options.fontFamily};
252252
}
253253
`;
254254

packages/mermaid/src/diagrams/sankey/sankeyDiagram.ts

+2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ import parser from './parser/sankey.jison';
44
import db from './sankeyDB.js';
55
import renderer from './sankeyRenderer.js';
66
import { prepareTextForParsing } from './sankeyUtils.js';
7+
import sankeyStyles from './styles.js';
78

89
const originalParse = parser.parse.bind(parser);
910
parser.parse = (text: string) => originalParse(prepareTextForParsing(text));
1011

1112
export const diagram: DiagramDefinition = {
13+
styles: sankeyStyles,
1214
parser,
1315
db,
1416
renderer,

packages/mermaid/src/diagrams/sankey/sankeyRenderer.ts

-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ export const draw = function (text: string, id: string, _version: string, diagOb
136136
svg
137137
.append('g')
138138
.attr('class', 'node-labels')
139-
.attr('font-family', 'sans-serif')
140139
.attr('font-size', 14)
141140
.selectAll('text')
142141
.data(graph.nodes)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
const getStyles = (options) =>
2+
`.label {
3+
font-family: ${options.fontFamily};
4+
}`;
5+
6+
export default getStyles;

packages/mermaid/src/diagrams/user-journey/styles.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
const getStyles = (options) =>
22
`.label {
3-
font-family: 'trebuchet ms', verdana, arial, sans-serif;
4-
font-family: var(--mermaid-font-family);
3+
font-family: ${options.fontFamily};
54
color: ${options.textColor};
65
}
76
.mouth {
@@ -79,8 +78,7 @@ const getStyles = (options) =>
7978
text-align: center;
8079
max-width: 200px;
8180
padding: 2px;
82-
font-family: 'trebuchet ms', verdana, arial, sans-serif;
83-
font-family: var(--mermaid-font-family);
81+
font-family: ${options.fontFamily};
8482
font-size: 12px;
8583
background: ${options.tertiaryColor};
8684
border: 1px solid ${options.border2};

0 commit comments

Comments
 (0)