Skip to content

1193 font stack #31426

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 20 commits into from
Oct 27, 2025
Merged

1193 font stack #31426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
f711575
Update base font family in _colors.scss for improved typography consi…
dmalykh-devexpress Sep 17, 2025
2c9a722
Update base font family in _colors.scss to enhance cross-platform typ…
dmalykh-devexpress Sep 23, 2025
b251c94
Update font family in compile-manager tests for improved cross-platfo…
dmalykh-devexpress Sep 23, 2025
d035d8b
Update font family in compile-manager tests for enhanced cross-platfo…
dmalykh-devexpress Sep 23, 2025
7dc91ea
Update base font family in _colors.scss and compilation results for i…
dmalykh-devexpress Sep 23, 2025
b9d8f6e
Update font family in compilation results and tests for improved cros…
dmalykh-devexpress Sep 23, 2025
1609a60
Update font family in compiler tests for enhanced cross-platform typo…
dmalykh-devexpress Sep 24, 2025
7067602
Update image asset for T1221037 cell template in treeList tests
dmalykh-devexpress Sep 24, 2025
9e34f59
Update image asset for DataGrid right-to-left support in testing
dmalykh-devexpress Sep 24, 2025
49edbf2
Merge branch '25_2' into 1193-font-stack
pomahtri Sep 26, 2025
eed6027
Revert "Update image asset for T1221037 cell template in treeList tests"
pomahtri Sep 26, 2025
66cd3cf
Merge branch '25_2' into 1193-font-stack
dmalykh-devexpress Oct 17, 2025
fcf0987
Update font-family to include 'system-ui' across various stylesheets …
dmalykh-devexpress Oct 17, 2025
46f09bd
Merge branch '25_2' into 1193-font-stack
dmalykh-devexpress Oct 17, 2025
3505361
Refactor font-family declarations to remove 'system-ui' for consisten…
dmalykh-devexpress Oct 17, 2025
b3e881d
Add .stylelintrc.json for stylelint configuration and update font-fam…
dmalykh-devexpress Oct 22, 2025
45db63f
Merge branch '25_2' into 1193-font-stack
dmalykh-devexpress Oct 22, 2025
9e4a307
Merge branch '25_2' into 1193-font-stack
dmalykh-devexpress Oct 23, 2025
3f4b95a
Merge branch '25_2' into 1193-font-stack
dmalykh-devexpress Oct 23, 2025
9f0b789
Apply suggestion from @Copilot
dmalykh-devexpress Oct 24, 2025
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
9 changes: 9 additions & 0 deletions .stylelintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"rules": {
"function-name-case": null,
"no-empty-source": null,
"at-rule-no-unknown": null,
"value-keyword-case": null
}
}

2 changes: 1 addition & 1 deletion packages/devextreme-scss/.stylelintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"shorthand-property-no-redundant-values": null,
"string-quotes": null,
"value-no-vendor-prefix": true,
"value-keyword-case": ["lower", {"camelCaseSvgKeywords": true}],
"value-keyword-case": null,
"selector-not-notation": null,
"keyframe-selector-notation": null,
"media-feature-range-notation": null,
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme-scss/scss/widgets/fluent/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ $fluent-color-theme-modificator: null !default;
* $name 10. Font family
* $type text
*/
Copy link

Copilot AI Oct 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] The stylelint disable comment was removed, but the line no longer violates value-keyword-case since the rule has been disabled in the stylelint configuration. The change is correct, but consider adding a comment explaining why mixed-case font names are intentionally used here (e.g., '// Using proper PascalCase for BlinkMacSystemFont').

Suggested change
*/
*/
// Using proper casing for font family names as required by platforms (e.g., PascalCase for BlinkMacSystemFont)

Copilot uses AI. Check for mistakes.
$base-font-family: segoe ui, -apple-system, blinkmacsystemfont, avenir next, avenir, helvetica neue, adwaita sans, cantarell, ubuntu, roboto, noto, helvetica, arial, sans-serif !default; // stylelint-disable-line value-keyword-case
$base-font-family: segoe ui, -apple-system, BlinkMacSystemFont, avenir next, avenir, helvetica neue, adwaita sans, cantarell, ubuntu, roboto, noto, helvetica, arial, sans-serif !default;
Copy link

Copilot AI Oct 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The inline stylelint-disable comment was removed. Ensure this removal is intentional, as it may have been suppressing legitimate linting warnings for the lowercase 'segoe ui' value, which remains in the font stack.

Suggested change
$base-font-family: segoe ui, -apple-system, BlinkMacSystemFont, avenir next, avenir, helvetica neue, adwaita sans, cantarell, ubuntu, roboto, noto, helvetica, arial, sans-serif !default;
$base-font-family: Segoe UI, -apple-system, BlinkMacSystemFont, avenir next, avenir, helvetica neue, adwaita sans, cantarell, ubuntu, roboto, noto, helvetica, arial, sans-serif !default;

Copilot uses AI. Check for mistakes.

/**
* $name 30. Page background color
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme-scss/scss/widgets/generic/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ $generic-color-postfix: null !default;
* $name 10. Font family
* $type text
*/
$base-font-family: -apple-system, blinkmacsystemfont, avenir next, avenir, segoe ui, helvetica neue, adwaita sans, cantarell, ubuntu, roboto, noto, helvetica, arial, sans-serif !default;
$base-font-family: -apple-system, BlinkMacSystemFont, avenir next, avenir, segoe ui, helvetica neue, adwaita sans, cantarell, ubuntu, roboto, noto, helvetica, arial, sans-serif !default;

/**
* $name 10. Accent color
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme-scss/scss/widgets/material/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ $material-color-theme-modificator: null !default;
* $name 10. Font family
* $type text
*/
$base-font-family: roboto, -apple-system, blinkmacsystemfont, avenir next, avenir, segoe ui, helvetica neue, adwaita sans, cantarell, ubuntu, noto, helvetica, arial, sans-serif !default;
$base-font-family: roboto, -apple-system, BlinkMacSystemFont, avenir next, avenir, segoe ui, helvetica neue, adwaita sans, cantarell, ubuntu, noto, helvetica, arial, sans-serif !default;

/**
* $name 20. Text color
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme-themebuilder/tests/data/compilation-results/no-changes-css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export default `.dx-accordion {
font-family: -apple-system,blinkmacsystemfont,avenir next,avenir,segoe ui,helvetica neue,adwaita sans,cantarell,ubuntu,roboto,noto,helvetica,arial,sans-serif;
font-family: -apple-system,BlinkMacSystemFont,avenir next,avenir,segoe ui,helvetica neue,adwaita sans,cantarell,ubuntu,roboto,noto,helvetica,arial,sans-serif;
color: #337ab7;
background-image: url(icons/icons.woff2);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme-themebuilder/tests/data/compilation-results/no-changes-meta.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const meta: { [key: string]: string } = {
'$base-font-family': "-apple-system, blinkmacsystemfont, avenir next, avenir, segoe ui, helvetica neue, adwaita sans, cantarell, ubuntu, roboto, noto, helvetica, arial, sans-serif",
'$base-font-family': "-apple-system, BlinkMacSystemFont, avenir next, avenir, segoe ui, helvetica neue, adwaita sans, cantarell, ubuntu, roboto, noto, helvetica, arial, sans-serif",
'$base-accent': '#337ab7',
'$accordion-title-color': '#337ab7',
'$accordion-item-title-opened-bg': 'transparent',
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme-themebuilder/tests/data/scss/widgets/generic/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ $base-accent: null !default;


@if $color == "light" {
$base-font-family: -apple-system, blinkmacsystemfont, avenir next, avenir, segoe ui, helvetica neue, adwaita sans, cantarell, ubuntu, roboto, noto, helvetica, arial, sans-serif !default;
$base-font-family: -apple-system, BlinkMacSystemFont, avenir next, avenir, segoe ui, helvetica neue, adwaita sans, cantarell, ubuntu, roboto, noto, helvetica, arial, sans-serif !default;

$base-accent: #337ab7 !default;
}
Expand Down
8 changes: 4 additions & 4 deletions packages/devextreme-themebuilder/tests/modules/compile-manager.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ describe('Compile manager - integration test on test sass', () => {
outColorScheme: 'test-theme',
}).then((result) => {
expect(result.css).toBe(`.dx-swatch-test-theme .dx-accordion {
font-family: -apple-system,blinkmacsystemfont,avenir next,avenir,segoe ui,helvetica neue,adwaita sans,cantarell,ubuntu,roboto,noto,helvetica,arial,sans-serif;
font-family: -apple-system,BlinkMacSystemFont,avenir next,avenir,segoe ui,helvetica neue,adwaita sans,cantarell,ubuntu,roboto,noto,helvetica,arial,sans-serif;
color: #337ab7;
background-image: url(icons/icons.woff2);
}
Expand All @@ -69,7 +69,7 @@ describe('Compile manager - integration test on test sass', () => {
assetsBasePath: 'base-path',
}).then((result) => {
expect(result.css).toBe(`.dx-accordion {
font-family: -apple-system,blinkmacsystemfont,avenir next,avenir,segoe ui,helvetica neue,adwaita sans,cantarell,ubuntu,roboto,noto,helvetica,arial,sans-serif;
font-family: -apple-system,BlinkMacSystemFont,avenir next,avenir,segoe ui,helvetica neue,adwaita sans,cantarell,ubuntu,roboto,noto,helvetica,arial,sans-serif;
color: #337ab7;
background-image: url(base-path/icons/icons.woff2);
}
Expand All @@ -88,7 +88,7 @@ describe('Compile manager - integration test on test sass', () => {
}).then((result) => {
expect(result.css).toBe('');
expect(result.compiledMetadata).toEqual({
"$base-font-family": "-apple-system, blinkmacsystemfont, avenir next, avenir, segoe ui, helvetica neue, adwaita sans, cantarell, ubuntu, roboto, noto, helvetica, arial, sans-serif",
"$base-font-family": "-apple-system, BlinkMacSystemFont, avenir next, avenir, segoe ui, helvetica neue, adwaita sans, cantarell, ubuntu, roboto, noto, helvetica, arial, sans-serif",
'$base-accent': '#337ab7',
});
});
Expand All @@ -100,7 +100,7 @@ describe('Compile manager - integration test on test sass', () => {
noClean: true,
}).then((result) => {
expect(result.css).toBe(`.dx-accordion {
font-family: -apple-system, blinkmacsystemfont, avenir next, avenir, segoe ui, helvetica neue, adwaita sans, cantarell, ubuntu, roboto, noto, helvetica, arial, sans-serif;
font-family: -apple-system, BlinkMacSystemFont, avenir next, avenir, segoe ui, helvetica neue, adwaita sans, cantarell, ubuntu, roboto, noto, helvetica, arial, sans-serif;
color: #337ab7;
background-image: url(icons/icons.woff2);
}
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-themebuilder/tests/modules/compiler.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const includePaths = [path.join(dataPath, 'scss', 'widgets', 'generic'), path.jo
const file = path.join(dataPath, 'scss', 'bundles', 'dx.light.scss');

const expectedCss = ({
fontFamily = '-apple-system, blinkmacsystemfont, avenir next, avenir, segoe ui, helvetica neue, adwaita sans, cantarell, ubuntu, roboto, noto, helvetica, arial, sans-serif',
fontFamily = '-apple-system, BlinkMacSystemFont, avenir next, avenir, segoe ui, helvetica neue, adwaita sans, cantarell, ubuntu, roboto, noto, helvetica, arial, sans-serif',
color = '#337ab7',
bgColor = 'transparent'
} = {}) => `.dx-accordion {
Expand Down Expand Up @@ -118,7 +118,7 @@ describe('compile', () => {
// compiled css
expect(data.result.css.toString()).toBe(
'.dx-accordion{font-family:'
+ '-apple-system,blinkmacsystemfont,avenir next,avenir,segoe ui,helvetica neue,adwaita sans,cantarell,ubuntu,roboto,noto,helvetica,arial,sans-serif;'
+ '-apple-system,BlinkMacSystemFont,avenir next,avenir,segoe ui,helvetica neue,adwaita sans,cantarell,ubuntu,roboto,noto,helvetica,arial,sans-serif;'
+ 'color:#337ab7;background-image:url(icons/icons.woff2)}.dx-accordion '
+ '.from-base{background-color:transparent;color:#337ab7}.extra-class{color:red}',
);
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme/js/__internal/core/license/trial_panel.client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ const textStyles = {
padding: '0px',
margin: '0px',
color: 'white',
'font-family': '-apple-system, blinkmacsystemfont, avenir next, avenir, helvetica neue, adwaita sans, cantarell, ubuntu, roboto, noto, helvetica, arial, sans-serif',
'font-family': '-apple-system, BlinkMacSystemFont, avenir next, avenir, helvetica neue, adwaita sans, cantarell, ubuntu, roboto, noto, helvetica, arial, sans-serif',
'font-size': '0.875rem',
'font-wight': '600',
'font-weight': '600',
};

function createImportantStyles(defaultStyles: StylesMap, customStyles?: StylesMap): string {
Expand Down
Loading