Skip to content
This repository was archived by the owner on Jul 31, 2024. It is now read-only.

Commit 11a4581

Browse files
authored
FDS-662 text tokens updated (#262)
1 parent b3aa2af commit 11a4581

File tree

5 files changed

+73
-67
lines changed

5 files changed

+73
-67
lines changed

packages/flow-core/CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
# Change Log
44

5+
## [2.9.8] - 2024-04-01
6+
7+
### Bug Fixes
8+
9+
- font tokens updated
10+
511
## [2.9.7] - 2024-03-28
612

713
### Improvements

packages/flow-core/figma/sync-colors.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function generateTokenScss(colorTokens) {
6969
prettier.format(scss, {
7070
printWidth: 100,
7171
singleQuote: false,
72-
tabWidth: 4,
72+
tabWidth: 2,
7373
parser: "css"
7474
})
7575
);
@@ -103,7 +103,7 @@ function generateTextScss(textTokens) {
103103
prettier.format(scss, {
104104
printWidth: 100,
105105
singleQuote: false,
106-
tabWidth: 4,
106+
tabWidth: 2,
107107
parser: "css"
108108
})
109109
);
@@ -118,7 +118,7 @@ function generateTextScss(textTokens) {
118118
prettier.format(scssContent, {
119119
printWidth: 100,
120120
singleQuote: false,
121-
tabWidth: 4,
121+
tabWidth: 2,
122122
parser: "css"
123123
})
124124
);

packages/flow-core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ollion/flow-core",
3-
"version": "2.9.7",
3+
"version": "2.9.8",
44
"description": "Core package of flow design system",
55
"module": "dist/flow-core.es.js",
66
"main": "dist/flow-core.cjs.js",

packages/flow-core/src/mixins/scss/_color-tokens.scss

+4-4
Original file line numberDiff line numberDiff line change
@@ -564,10 +564,6 @@
564564
--color-icon-subtle: #{$color-icon-subtle} !important;
565565
--color-icon-subtle-hover: #{getHover($color-icon-subtle)} !important;
566566
--color-icon-subtle-selected: #{getSelected($color-icon-subtle)} !important;
567-
$color-danger-subtle: #e4a4a4;
568-
--color-danger-subtle: #{$color-danger-subtle} !important;
569-
--color-danger-subtle-hover: #{getHover($color-danger-subtle)} !important;
570-
--color-danger-subtle-selected: #{getSelected($color-danger-subtle)} !important;
571567
$color-neutral-text: #1d1b16;
572568
--color-neutral-text: #{$color-neutral-text} !important;
573569
--color-neutral-text-hover: #{getHover($color-neutral-text)} !important;
@@ -732,6 +728,10 @@
732728
--color-color-5-surface: #{$color-color-5-surface} !important;
733729
--color-color-5-surface-hover: #{getHover($color-color-5-surface)} !important;
734730
--color-color-5-surface-selected: #{getSelected($color-color-5-surface)} !important;
731+
$color-danger-subtle: #d98282;
732+
--color-danger-subtle: #{$color-danger-subtle} !important;
733+
--color-danger-subtle-hover: #{getHover($color-danger-subtle)} !important;
734+
--color-danger-subtle-selected: #{getSelected($color-danger-subtle)} !important;
735735
}
736736

737737
[data-theme="f-ollion-dark"] {

packages/flow-core/src/mixins/scss/_text-tokens.scss

+59-59
Original file line numberDiff line numberDiff line change
@@ -247,127 +247,127 @@
247247

248248
--text-code-x-large-fontfamily: "Operator Mono", monospace;
249249

250-
--text-heading-small-font: 14px;
251-
252-
--text-heading-small-lineheight: 1.2;
253-
254-
--text-heading-small-medium: 350;
255-
256-
--text-heading-small-bold: 400;
257-
258-
--text-heading-small-regular: 325;
259-
260-
--text-heading-small-fontfamily: "Gotham", "Montserrat", sans-serif;
261-
262-
--text-heading-x-large-font: 24px;
250+
--text-heading-large-font: 20px;
263251

264-
--text-heading-x-large-lineheight: 1.2;
252+
--text-heading-large-lineheight: 1.2;
265253

266-
--text-heading-x-large-medium: 350;
254+
--text-heading-large-medium: 500;
267255

268-
--text-heading-x-large-bold: 400;
256+
--text-heading-large-bold: 700;
269257

270-
--text-heading-x-large-regular: 325;
258+
--text-heading-large-regular: 400;
271259

272-
--text-heading-x-large-fontfamily: "Gotham", "Montserrat", sans-serif;
260+
--text-heading-large-fontfamily: "GothamSSm", "Montserrat", sans-serif;
273261

274-
--text-heading-large-font: 20px;
262+
--text-heading-small-font: 14px;
275263

276-
--text-heading-large-lineheight: 1.2;
264+
--text-heading-small-lineheight: 1.2;
277265

278-
--text-heading-large-medium: 350;
266+
--text-heading-small-medium: 500;
279267

280-
--text-heading-large-bold: 400;
268+
--text-heading-small-bold: 700;
281269

282-
--text-heading-large-regular: 325;
270+
--text-heading-small-regular: 400;
283271

284-
--text-heading-large-fontfamily: "Gotham", "Montserrat", sans-serif;
272+
--text-heading-small-fontfamily: "GothamSSm", "Montserrat", sans-serif;
285273

286274
--text-heading-x-small-font: 12px;
287275

288276
--text-heading-x-small-lineheight: 1.2;
289277

290-
--text-heading-x-small-medium: 350;
278+
--text-heading-x-small-medium: 500;
291279

292-
--text-heading-x-small-bold: 400;
280+
--text-heading-x-small-bold: 700;
293281

294-
--text-heading-x-small-regular: 325;
282+
--text-heading-x-small-regular: 400;
295283

296-
--text-heading-x-small-fontfamily: "Gotham", "Montserrat", sans-serif;
284+
--text-heading-x-small-fontfamily: "GothamSSm", "Montserrat", sans-serif;
297285

298286
--text-heading-medium-font: 16px;
299287

300288
--text-heading-medium-lineheight: 1.2;
301289

302-
--text-heading-medium-medium: 350;
290+
--text-heading-medium-medium: 500;
303291

304-
--text-heading-medium-bold: 400;
292+
--text-heading-medium-bold: 700;
305293

306-
--text-heading-medium-regular: 325;
294+
--text-heading-medium-regular: 400;
307295

308-
--text-heading-medium-fontfamily: "Gotham", "Montserrat", sans-serif;
296+
--text-heading-medium-fontfamily: "GothamSSm", "Montserrat", sans-serif;
309297

310-
--text-para-x-small-font: 10px;
298+
--text-heading-x-large-font: 24px;
311299

312-
--text-para-x-small-lineheight: 1.4;
300+
--text-heading-x-large-lineheight: 1.2;
313301

314-
--text-para-x-small-medium: 350;
302+
--text-heading-x-large-medium: 500;
315303

316-
--text-para-x-small-bold: 400;
304+
--text-heading-x-large-bold: 700;
317305

318-
--text-para-x-small-regular: 325;
306+
--text-heading-x-large-regular: 400;
319307

320-
--text-para-x-small-fontfamily: "Gotham", "Montserrat", sans-serif;
308+
--text-heading-x-large-fontfamily: "GothamSSm", "Montserrat", sans-serif;
321309

322-
--text-para-x-large-font: 20px;
310+
--text-para-large-font: 16px;
323311

324-
--text-para-x-large-lineheight: 1.4;
312+
--text-para-large-lineheight: 1.4;
325313

326-
--text-para-x-large-medium: 350;
314+
--text-para-large-medium: 500;
327315

328-
--text-para-x-large-bold: 400;
316+
--text-para-large-bold: 700;
329317

330-
--text-para-x-large-regular: 325;
318+
--text-para-large-regular: 400;
331319

332-
--text-para-x-large-fontfamily: "Gotham", "Montserrat", sans-serif;
320+
--text-para-large-fontfamily: "GothamSSm", "Montserrat", sans-serif;
333321

334322
--text-para-small-font: 12px;
335323

336324
--text-para-small-lineheight: 1.4;
337325

338-
--text-para-small-medium: 350;
326+
--text-para-small-medium: 500;
339327

340-
--text-para-small-bold: 400;
328+
--text-para-small-bold: 700;
341329

342-
--text-para-small-regular: 325;
330+
--text-para-small-regular: 400;
343331

344-
--text-para-small-fontfamily: "Gotham", "Montserrat", sans-serif;
332+
--text-para-small-fontfamily: "GothamSSm", "Montserrat", sans-serif;
345333

346334
--text-para-medium-font: 14px;
347335

348336
--text-para-medium-lineheight: 1.4;
349337

350-
--text-para-medium-medium: 350;
338+
--text-para-medium-medium: 500;
351339

352-
--text-para-medium-bold: 400;
340+
--text-para-medium-bold: 700;
353341

354-
--text-para-medium-regular: 325;
342+
--text-para-medium-regular: 400;
355343

356-
--text-para-medium-fontfamily: "Gotham", "Montserrat", sans-serif;
344+
--text-para-medium-fontfamily: "GothamSSm", "Montserrat", sans-serif;
357345

358-
--text-para-large-font: 16px;
346+
--text-para-x-small-font: 10px;
359347

360-
--text-para-large-lineheight: 1.4;
348+
--text-para-x-small-lineheight: 1.4;
349+
350+
--text-para-x-small-medium: 500;
351+
352+
--text-para-x-small-bold: 700;
353+
354+
--text-para-x-small-regular: 400;
361355

362-
--text-para-large-medium: 350;
356+
--text-para-x-small-fontfamily: "GothamSSm", "Montserrat", sans-serif;
363357

364-
--text-para-large-bold: 400;
358+
--text-para-x-large-font: 20px;
359+
360+
--text-para-x-large-lineheight: 1.4;
361+
362+
--text-para-x-large-medium: 500;
363+
364+
--text-para-x-large-bold: 700;
365365

366-
--text-para-large-regular: 325;
366+
--text-para-x-large-regular: 400;
367367

368-
--text-para-large-fontfamily: "Gotham", "Montserrat", sans-serif;
368+
--text-para-x-large-fontfamily: "GothamSSm", "Montserrat", sans-serif;
369369

370-
--flow-font: "Gotham", "Montserrat", sans-serif;
370+
--flow-font: "GothamSSm", "Montserrat", sans-serif;
371371

372372
--flow-code-font: "Operator Mono", monospace;
373373
}

0 commit comments

Comments
 (0)