From fd59d407525bf92212347903d84453ec5571f7fe Mon Sep 17 00:00:00 2001 From: albinAppsmith <87797149+albinAppsmith@users.noreply.github.com> Date: Wed, 8 May 2024 17:47:34 +0530 Subject: [PATCH] feat: font update - PT root UI medium (#33008) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description This PR update default font to PT Root UI. Fixes #32720 ## Automation /ok-to-test tags="@tag.Sanity" ### :mag: Cypress test results > [!TIP] > 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉 > Workflow run: > Commit: 491aaf0d92f123482c88c6ec13999e0356dbea53 > Cypress dashboard url: Click here! ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [x] No ## Summary by CodeRabbit - **Style** - Removed font smoothing properties from the body styling to enhance text clarity and appearance across web browsers. --- app/client/package.json | 4 ++-- app/client/public/404.css | 3 +-- .../js/skins/content/default/content.css | 2 +- .../ErrorLogs/components/LogCollapseData.tsx | 3 +-- .../editorComponents/Debugger/LogItem.tsx | 3 +-- app/client/src/constants/Fonts.tsx | 3 +-- app/client/src/index.css | 2 -- app/client/yarn.lock | 20 +++++++++---------- 8 files changed, 17 insertions(+), 23 deletions(-) diff --git a/app/client/package.json b/app/client/package.json index b54b317847..bda37257e6 100644 --- a/app/client/package.json +++ b/app/client/package.json @@ -113,8 +113,8 @@ "d3-geo": "^3.1.0", "dayjs": "^1.10.6", "deep-diff": "^1.0.2", - "design-system": "npm:@appsmithorg/design-system@2.1.39", - "design-system-old": "npm:@appsmithorg/design-system-old@1.1.16", + "design-system": "npm:@appsmithorg/design-system@2.1.40", + "design-system-old": "npm:@appsmithorg/design-system-old@1.1.17", "downloadjs": "^1.4.7", "echarts": "^5.4.2", "fast-deep-equal": "^3.1.3", diff --git a/app/client/public/404.css b/app/client/public/404.css index 1cb1ba9c0b..91e58203d2 100644 --- a/app/client/public/404.css +++ b/app/client/public/404.css @@ -6,8 +6,7 @@ html { background-color: #fff; margin: 0; color: #182026; - font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, - Ubuntu, Cantarell, Open Sans, Helvetica Neue, Icons16, sans-serif; + font-family: var(--ads-v2-font-family); font-size: 14px; font-weight: 400; letter-spacing: 0; diff --git a/app/client/public/static/js/skins/content/default/content.css b/app/client/public/static/js/skins/content/default/content.css index dd6a5c1ca9..a67d15e105 100644 --- a/app/client/public/static/js/skins/content/default/content.css +++ b/app/client/public/static/js/skins/content/default/content.css @@ -5,7 +5,7 @@ * For commercial licenses see https://www.tiny.cloud/ */ body { - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; + font-family: var(--ads-v2-font-family); line-height: 1.4; margin: 1rem; } diff --git a/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogCollapseData.tsx b/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogCollapseData.tsx index 5e015b20e0..492f695c0b 100644 --- a/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogCollapseData.tsx +++ b/app/client/src/components/editorComponents/Debugger/ErrorLogs/components/LogCollapseData.tsx @@ -54,8 +54,7 @@ export const reactJsonProps = { displayObjectSize: false, displayDataTypes: false, style: { - fontFamily: - "-apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue", + fontFamily: "var(--ads-v2-font-family)", fontSize: "11px", fontWeight: "400", letterSpacing: "-0.195px", diff --git a/app/client/src/components/editorComponents/Debugger/LogItem.tsx b/app/client/src/components/editorComponents/Debugger/LogItem.tsx index 2b4fd412d6..8d96eb14c6 100644 --- a/app/client/src/components/editorComponents/Debugger/LogItem.tsx +++ b/app/client/src/components/editorComponents/Debugger/LogItem.tsx @@ -237,8 +237,7 @@ function LogItem(props: LogItemProps) { displayObjectSize: false, displayDataTypes: false, style: { - fontFamily: - "-apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue", + fontFamily: "var(--ads-v2-font-family)", fontSize: "11px", fontWeight: "400", letterSpacing: "-0.195px", diff --git a/app/client/src/constants/Fonts.tsx b/app/client/src/constants/Fonts.tsx index 4376f18d1d..4a9dd8e02c 100644 --- a/app/client/src/constants/Fonts.tsx +++ b/app/client/src/constants/Fonts.tsx @@ -1,4 +1,3 @@ -export const TextFonts = - "-apple-system, BlinkMacSystemFont, “Segoe UI”, “Roboto”, “Oxygen”, “Ubuntu”, “Cantarell”, “Fira Sans”, “Droid Sans”, “Helvetica Neue”, sans-serif"; +export const TextFonts = "var(--ads-v2-font-family)"; export const CodeFonts = 'ui-monospace, Menlo, Monaco, "Cascadia Code", "Cascadia Mono", "Segoe UI Mono", "Roboto Mono", "Oxygen Mono", "Ubuntu Monospace", "Source Code Pro", "Fira Mono", "Droid Sans Mono", Consolas, "Courier New", monospace'; diff --git a/app/client/src/index.css b/app/client/src/index.css index c42309263b..c8b89ff825 100755 --- a/app/client/src/index.css +++ b/app/client/src/index.css @@ -17,8 +17,6 @@ body { margin: 0; padding: 0; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; background-color: #fff !important; color: var(--ads-v2-color-fg); } diff --git a/app/client/yarn.lock b/app/client/yarn.lock index e7cf2d57db..2d6f4d7821 100644 --- a/app/client/yarn.lock +++ b/app/client/yarn.lock @@ -13134,8 +13134,8 @@ __metadata: d3-geo: ^3.1.0 dayjs: ^1.10.6 deep-diff: ^1.0.2 - design-system: "npm:@appsmithorg/design-system@2.1.39" - design-system-old: "npm:@appsmithorg/design-system-old@1.1.16" + design-system: "npm:@appsmithorg/design-system@2.1.40" + design-system-old: "npm:@appsmithorg/design-system-old@1.1.17" diff: ^5.0.0 dotenv: ^8.1.0 downloadjs: ^1.4.7 @@ -17155,9 +17155,9 @@ __metadata: languageName: node linkType: hard -"design-system-old@npm:@appsmithorg/design-system-old@1.1.16": - version: 1.1.16 - resolution: "@appsmithorg/design-system-old@npm:1.1.16" +"design-system-old@npm:@appsmithorg/design-system-old@1.1.17": + version: 1.1.17 + resolution: "@appsmithorg/design-system-old@npm:1.1.17" dependencies: emoji-mart: 3.0.1 peerDependencies: @@ -17177,13 +17177,13 @@ __metadata: remixicon-react: ^1.0.0 styled-components: 5.3.6 tinycolor2: ^1.4.2 - checksum: 8fbfba86e54bdcbbb30b8e8b1902408ba0cb13f4d33d36c794f3bc0e281d0e2db8f716c10c6e0a3118f010db24f97c72606885bff4c320f41f5df9564ab6b214 + checksum: f4e4faf58412912ca95e50ccf8554fa480bdfd8fb4628131f9a35df663207aec35469f340920f4ebe63568f29cc1e01a97c0f223ac753e0d574e099434588f06 languageName: node linkType: hard -"design-system@npm:@appsmithorg/design-system@2.1.39": - version: 2.1.39 - resolution: "@appsmithorg/design-system@npm:2.1.39" +"design-system@npm:@appsmithorg/design-system@2.1.40": + version: 2.1.40 + resolution: "@appsmithorg/design-system@npm:2.1.40" dependencies: "@radix-ui/react-dialog": ^1.0.2 "@radix-ui/react-dropdown-menu": ^2.0.4 @@ -17215,7 +17215,7 @@ __metadata: react-dom: ^17.0.2 react-router-dom: ^5.0.0 styled-components: ^5.3.6 - checksum: 7b9ed99c41a8fc0b45db101b18bd87a5dde5ef54291843196d1e26bb60d217c7e552be01c914a859717a294caf2637aef7149afd07b6e224d81cb92f2c3b91b4 + checksum: 0c45edd67a958fb0f192e405216b3103eb751197b49bb49c9377e9a6185f4a3de007142d5af2df03c9f2b2a9ac337604ca69d1065aac219d97e671f55ef37435 languageName: node linkType: hard