Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add sans-serif to default font settings #1776

Merged
merged 1 commit into from
Nov 17, 2020
Merged

Add sans-serif to default font settings #1776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/defaultConfig.js
View file
Open in desktop
Expand Up @@ -57,11 +57,11 @@ const config = {
/**
*| Parameter | Description |Type | Required | Values|
*| --- | --- | --- | --- | --- |
*|fontFamily | specifies the font to be used in the rendered diagrams| String | Required | Verdana, Arial, Trebuchet MS,|
*|fontFamily | specifies the font to be used in the rendered diagrams| String | Required | Trebuchet MS, Verdana, Arial, Sans-Serif |
*
***notes: Default value is \\"trebuchet ms\\".
*/
fontFamily: '"trebuchet ms", verdana, arial;',
fontFamily: '"trebuchet ms", verdana, arial, sans-serif;',

/**
*| Parameter | Description |Type | Required | Values|
Expand Down Expand Up @@ -391,12 +391,12 @@ const config = {
/**
*| Parameter | Description |Type | Required | Values|
*| --- | --- | --- | --- | --- |
*| noteFontFamily| This sets the font family of actor-attached notes. | String | Required | trebuchet ms, verdana, arial |
*| noteFontFamily| This sets the font family of actor-attached notes. | String | Required | trebuchet ms, verdana, arial, sans-serif |
*
***Notes:**
***Default value: trebuchet ms **.
*/
noteFontFamily: '"trebuchet ms", verdana, arial',
noteFontFamily: '"trebuchet ms", verdana, arial, sans-serif',
/**
* This sets the font weight of the note's description
* **Default value 400.
Expand All @@ -423,12 +423,12 @@ const config = {
/**
*| Parameter | Description |Type | Required | Values|
*| --- | --- | --- | --- | --- |
*| messageFontFamily | This sets the font family of actor messages. | String| Required | trebuchet ms", verdana, aria |
*| messageFontFamily | This sets the font family of actor messages. | String| Required | trebuchet ms", verdana, arial, sans-serif |
*
***Notes:**
***Default value:"trebuchet ms**.
***Default value: "trebuchet ms**.
*/
messageFontFamily: '"trebuchet ms", verdana, arial',
messageFontFamily: '"trebuchet ms", verdana, arial, sans-serif',
/**
* This sets the font weight of the message's description
* **Default value 400.
Expand Down
10 changes: 5 additions & 5 deletions src/diagrams/gantt/styles.js
View file
Open in desktop
@@ -1,7 +1,7 @@
const getStyles = options =>
`
.mermaid-main-font {
font-family: "trebuchet ms", verdana, arial;
font-family: "trebuchet ms", verdana, arial, sans-serif;
font-family: var(--mermaid-font-family);
}

Expand Down Expand Up @@ -44,7 +44,7 @@ const getStyles = options =>
text-anchor: start;
font-size: 11px;
text-height: 14px;
font-family: 'trebuchet ms', verdana, arial;
font-family: 'trebuchet ms', verdana, arial, sans-serif;
font-family: var(--mermaid-font-family);

}
Expand Down Expand Up @@ -86,7 +86,7 @@ const getStyles = options =>

.taskText {
text-anchor: middle;
font-family: 'trebuchet ms', verdana, arial;
font-family: 'trebuchet ms', verdana, arial, sans-serif;
font-family: var(--mermaid-font-family);
}

Expand All @@ -98,7 +98,7 @@ const getStyles = options =>
fill: ${options.taskTextDarkColor};
text-anchor: start;
font-size: 11px;
font-family: 'trebuchet ms', verdana, arial;
font-family: 'trebuchet ms', verdana, arial, sans-serif;
font-family: var(--mermaid-font-family);

}
Expand Down Expand Up @@ -253,7 +253,7 @@ const getStyles = options =>
text-anchor: middle;
font-size: 18px;
fill: ${options.textColor} ;
font-family: 'trebuchet ms', verdana, arial;
font-family: 'trebuchet ms', verdana, arial, sans-serif;
font-family: var(--mermaid-font-family);
}
`;
Expand Down
2 changes: 1 addition & 1 deletion src/diagrams/git/styles.js
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ const getStyles = () =>
.branch-label {
fill: lightgrey;
color: lightgrey;
font-family: 'trebuchet ms', verdana, arial;
font-family: 'trebuchet ms', verdana, arial, sans-serif;
font-family: var(--mermaid-font-family);
}
`;
Expand Down
4 changes: 2 additions & 2 deletions src/diagrams/user-journey/styles.js
View file
Open in desktop
@@ -1,6 +1,6 @@
const getStyles = options =>
`.label {
font-family: 'trebuchet ms', verdana, arial;
font-family: 'trebuchet ms', verdana, arial, sans-serif;
font-family: var(--mermaid-font-family);
color: ${options.textColor};
}
Expand Down Expand Up @@ -79,7 +79,7 @@ const getStyles = options =>
text-align: center;
max-width: 200px;
padding: 2px;
font-family: 'trebuchet ms', verdana, arial;
font-family: 'trebuchet ms', verdana, arial, sans-serif;
font-family: var(--mermaid-font-family);
font-size: 12px;
background: ${options.tertiaryColor};
Expand Down
2 changes: 1 addition & 1 deletion src/themes/theme-base.js
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@ class Theme {
// this.secondaryColor = '#dfdfde';
// this.tertiaryColor = '#CCCCFF';

this.fontFamily = '"trebuchet ms", verdana, arial';
this.fontFamily = '"trebuchet ms", verdana, arial, sans-serif';
this.fontSize = '16px';
// this.updateColors();
}
Expand Down
2 changes: 1 addition & 1 deletion src/themes/theme-dark.js
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@ class Theme {
this.border1 = '#81B1DB';
this.border2 = rgba(255, 255, 255, 0.25);
this.arrowheadColor = 'calculated';
this.fontFamily = '"trebuchet ms", verdana, arial';
this.fontFamily = '"trebuchet ms", verdana, arial, sans-serif';
this.fontSize = '16px';
this.labelBackground = '#181818';
this.textColor = '#ccc';
Expand Down
2 changes: 1 addition & 1 deletion src/themes/theme-default.js
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@ class Theme {
this.border1 = '#9370DB';
this.border2 = '#aaaa33';
this.arrowheadColor = '#333333';
this.fontFamily = '"trebuchet ms", verdana, arial';
this.fontFamily = '"trebuchet ms", verdana, arial, sans-serif';
this.fontSize = '16px';
this.labelBackground = '#e8e8e8';
this.textColor = '#333';
Expand Down
2 changes: 1 addition & 1 deletion src/themes/theme-forest.js
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ class Theme {
this.border1 = '#13540c';
this.border2 = '#6eaa49';
this.arrowheadColor = 'green';
this.fontFamily = '"trebuchet ms", verdana, arial';
this.fontFamily = '"trebuchet ms", verdana, arial, sans-serif';
this.fontSize = '16px';

this.tertiaryColor = lighten('#cde498', 10);
Expand Down
2 changes: 1 addition & 1 deletion src/themes/theme-neutral.js
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ class Theme {
this.critical = '#d42';
this.done = '#bbb';
this.arrowheadColor = '#333333';
this.fontFamily = '"trebuchet ms", verdana, arial';
this.fontFamily = '"trebuchet ms", verdana, arial, sans-serif';
this.fontSize = '16px';

/* Flowchart variables */
Expand Down