@atlaskit/tokens 2.1.0 → 2.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +18 -0
- package/dist/cjs/artifacts/palettes-raw/typography-palette.js +3 -3
- package/dist/cjs/artifacts/themes/atlassian-typography-refreshed.js +2 -2
- package/dist/cjs/artifacts/tokens-raw/atlassian-typography-refreshed.js +15 -15
- package/dist/cjs/enable-global-theme.js +1 -1
- package/dist/cjs/get-theme-html-attrs.js +1 -1
- package/dist/cjs/get-theme-styles.js +1 -1
- package/dist/cjs/set-global-theme.js +1 -1
- package/dist/cjs/theme-config.js +12 -1
- package/dist/es2019/artifacts/palettes-raw/typography-palette.js +3 -3
- package/dist/es2019/artifacts/themes/atlassian-typography-refreshed.js +15 -15
- package/dist/es2019/artifacts/tokens-raw/atlassian-typography-refreshed.js +15 -15
- package/dist/es2019/enable-global-theme.js +1 -1
- package/dist/es2019/get-theme-html-attrs.js +1 -1
- package/dist/es2019/get-theme-styles.js +1 -1
- package/dist/es2019/set-global-theme.js +1 -1
- package/dist/es2019/theme-config.js +13 -1
- package/dist/esm/artifacts/palettes-raw/typography-palette.js +3 -3
- package/dist/esm/artifacts/themes/atlassian-typography-refreshed.js +2 -2
- package/dist/esm/artifacts/tokens-raw/atlassian-typography-refreshed.js +15 -15
- package/dist/esm/enable-global-theme.js +1 -1
- package/dist/esm/get-theme-html-attrs.js +1 -1
- package/dist/esm/get-theme-styles.js +1 -1
- package/dist/esm/set-global-theme.js +1 -1
- package/dist/esm/theme-config.js +13 -1
- package/dist/types/artifacts/palettes-raw/typography-palette.d.ts +1 -1
- package/dist/types/artifacts/themes/atlassian-typography-refreshed.d.ts +2 -2
- package/dist/types/artifacts/tokens-raw/atlassian-typography-refreshed.d.ts +1 -1
- package/dist/types/theme-config.d.ts +8 -1
- package/dist/types-ts4.5/artifacts/palettes-raw/typography-palette.d.ts +1 -1
- package/dist/types-ts4.5/artifacts/themes/atlassian-typography-refreshed.d.ts +2 -2
- package/dist/types-ts4.5/artifacts/tokens-raw/atlassian-typography-refreshed.d.ts +1 -1
- package/dist/types-ts4.5/theme-config.d.ts +8 -1
- package/figma/atlassian-typography-refreshed.json +2 -2
- package/package.json +6 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
# @atlaskit/tokens
|
|
2
2
|
|
|
3
|
+
## 2.3.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#166391](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/166391)
|
|
8
|
+
[`a447cb3da0845`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a447cb3da0845) -
|
|
9
|
+
Refreshed typography theme now references Atlassian Sans font.
|
|
10
|
+
|
|
11
|
+
## 2.2.0
|
|
12
|
+
|
|
13
|
+
### Minor Changes
|
|
14
|
+
|
|
15
|
+
- [#160957](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/160957)
|
|
16
|
+
[`d0fdd33f28249`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d0fdd33f28249) -
|
|
17
|
+
[ux] Default typography theme changed to modernized behind feature flag
|
|
18
|
+
`platform-default-typography-modernized`. If testing is successful the change will be available in
|
|
19
|
+
a later release.
|
|
20
|
+
|
|
3
21
|
## 2.1.0
|
|
4
22
|
|
|
5
23
|
### Minor Changes
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.default = void 0;
|
|
7
7
|
/**
|
|
8
8
|
* THIS FILE WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
|
|
9
|
-
* @codegen <<SignedSource::
|
|
9
|
+
* @codegen <<SignedSource::909dfaa0e3366d4739e13971248bd7c0>>
|
|
10
10
|
* @codegenCommand yarn build tokens
|
|
11
11
|
*/
|
|
12
12
|
var tokens = [{
|
|
@@ -100,14 +100,14 @@ var tokens = [{
|
|
|
100
100
|
"name": "typography.fontFamily.FontFamilyWebSans",
|
|
101
101
|
"path": ["typography", "fontFamily", "FontFamilyWebSans"]
|
|
102
102
|
}, {
|
|
103
|
-
"value": "\"
|
|
103
|
+
"value": "\"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
104
104
|
"attributes": {
|
|
105
105
|
"group": "fontFamily"
|
|
106
106
|
},
|
|
107
107
|
"filePath": "schema/palettes/typography-palette.tsx",
|
|
108
108
|
"isSource": true,
|
|
109
109
|
"original": {
|
|
110
|
-
"value": "\"
|
|
110
|
+
"value": "\"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
111
111
|
"attributes": {
|
|
112
112
|
"group": "fontFamily"
|
|
113
113
|
}
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.default = void 0;
|
|
7
7
|
/**
|
|
8
8
|
* THIS FILE WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
|
|
9
|
-
* @codegen <<SignedSource::
|
|
9
|
+
* @codegen <<SignedSource::5c09e6710724a50480f98849037825eb>>
|
|
10
10
|
* @codegenCommand yarn build tokens
|
|
11
11
|
*/
|
|
12
|
-
var _default = exports.default = "\nhtml[data-theme~=\"typography:typography-refreshed\"] {\n --ds-UNSAFE-textTransformUppercase: uppercase;\n --ds-font-letterSpacing-0: 0;\n --ds-font-letterSpacing-100: 0;\n --ds-font-letterSpacing-200: 0;\n --ds-font-letterSpacing-300: 0;\n --ds-font-letterSpacing-400: 0;\n --ds-font-heading-xxlarge: normal 700 2rem/2.25rem \"
|
|
12
|
+
var _default = exports.default = "\nhtml[data-theme~=\"typography:typography-refreshed\"] {\n --ds-UNSAFE-textTransformUppercase: uppercase;\n --ds-font-letterSpacing-0: 0;\n --ds-font-letterSpacing-100: 0;\n --ds-font-letterSpacing-200: 0;\n --ds-font-letterSpacing-300: 0;\n --ds-font-letterSpacing-400: 0;\n --ds-font-heading-xxlarge: normal 700 2rem/2.25rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-xlarge: normal 700 1.75rem/2rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-large: normal 700 1.5rem/1.75rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-medium: normal 700 1.25rem/1.5rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-small: normal 700 1rem/1.25rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-xsmall: normal 700 0.875rem/1.25rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-xxsmall: normal 700 0.75rem/1rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-body-large: normal 400 1rem/1.5rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-body: normal 400 0.875rem/1.25rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-body-small: normal 400 0.75rem/1rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-body-UNSAFE_small: normal 400 0.75rem/1rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-code: normal 400 0.875em/1 ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace;\n --ds-font-weight-regular: 400;\n --ds-font-weight-medium: 500;\n --ds-font-weight-semibold: 600;\n --ds-font-weight-bold: 700;\n --ds-font-family-heading: \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-family-body: \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-family-code: ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace;\n --ds-font-family-monospace: ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace;\n --ds-font-family-sans: \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-family-brand-heading: \"Charlie Display\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-family-brand-body: \"Charlie Text\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n}\n";
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.default = void 0;
|
|
7
7
|
/**
|
|
8
8
|
* THIS FILE WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
|
|
9
|
-
* @codegen <<SignedSource::
|
|
9
|
+
* @codegen <<SignedSource::dce942b8ed1c06fabf9d37bbecb9cca4>>
|
|
10
10
|
* @codegenCommand yarn build tokens
|
|
11
11
|
*/
|
|
12
12
|
var tokens = [{
|
|
@@ -158,7 +158,7 @@ var tokens = [{
|
|
|
158
158
|
"introduced": "1.14.0",
|
|
159
159
|
"description": "For overlapping brand with product promotions, such as marketplace content. Migrate instances of H900 to Heading XXL."
|
|
160
160
|
},
|
|
161
|
-
"value": "normal 700 32px/36px \"
|
|
161
|
+
"value": "normal 700 32px/36px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
162
162
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
163
163
|
"isSource": true,
|
|
164
164
|
"original": {
|
|
@@ -187,7 +187,7 @@ var tokens = [{
|
|
|
187
187
|
"introduced": "1.14.0",
|
|
188
188
|
"description": "For overlapping brand with product promotions, such as marketplace content. Migrate instances of H800 to Heading XL."
|
|
189
189
|
},
|
|
190
|
-
"value": "normal 700 28px/32px \"
|
|
190
|
+
"value": "normal 700 28px/32px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
191
191
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
192
192
|
"isSource": true,
|
|
193
193
|
"original": {
|
|
@@ -216,7 +216,7 @@ var tokens = [{
|
|
|
216
216
|
"introduced": "1.14.0",
|
|
217
217
|
"description": "Product page titles, such as forms. Migrate instances of H700 to Heading L."
|
|
218
218
|
},
|
|
219
|
-
"value": "normal 700 24px/28px \"
|
|
219
|
+
"value": "normal 700 24px/28px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
220
220
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
221
221
|
"isSource": true,
|
|
222
222
|
"original": {
|
|
@@ -245,7 +245,7 @@ var tokens = [{
|
|
|
245
245
|
"introduced": "1.14.0",
|
|
246
246
|
"description": "Headers in large components, such as modal dialogs. Migrate instances of H600 to Heading M."
|
|
247
247
|
},
|
|
248
|
-
"value": "normal 700 20px/24px \"
|
|
248
|
+
"value": "normal 700 20px/24px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
249
249
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
250
250
|
"isSource": true,
|
|
251
251
|
"original": {
|
|
@@ -274,7 +274,7 @@ var tokens = [{
|
|
|
274
274
|
"introduced": "1.14.0",
|
|
275
275
|
"description": "For headers in small components where space is limited. Migrate instances of H500 to Heading S."
|
|
276
276
|
},
|
|
277
|
-
"value": "normal 700 16px/20px \"
|
|
277
|
+
"value": "normal 700 16px/20px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
278
278
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
279
279
|
"isSource": true,
|
|
280
280
|
"original": {
|
|
@@ -303,7 +303,7 @@ var tokens = [{
|
|
|
303
303
|
"introduced": "1.14.0",
|
|
304
304
|
"description": "For headers in small components where space is limited. Migrate instances of H400 to Heading XS."
|
|
305
305
|
},
|
|
306
|
-
"value": "normal 700 14px/20px \"
|
|
306
|
+
"value": "normal 700 14px/20px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
307
307
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
308
308
|
"isSource": true,
|
|
309
309
|
"original": {
|
|
@@ -332,7 +332,7 @@ var tokens = [{
|
|
|
332
332
|
"introduced": "1.14.0",
|
|
333
333
|
"description": "For headers in fine print or tight spaces. Use sparingly. Migrate instances of H100, H200 and H300 to Heading XXS."
|
|
334
334
|
},
|
|
335
|
-
"value": "normal 700 12px/16px \"
|
|
335
|
+
"value": "normal 700 12px/16px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
336
336
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
337
337
|
"isSource": true,
|
|
338
338
|
"original": {
|
|
@@ -361,7 +361,7 @@ var tokens = [{
|
|
|
361
361
|
"introduced": "1.14.0",
|
|
362
362
|
"description": "For long-form text, such as in blogs."
|
|
363
363
|
},
|
|
364
|
-
"value": "normal 400 16px/24px \"
|
|
364
|
+
"value": "normal 400 16px/24px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
365
365
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
366
366
|
"isSource": true,
|
|
367
367
|
"original": {
|
|
@@ -390,7 +390,7 @@ var tokens = [{
|
|
|
390
390
|
"introduced": "1.14.0",
|
|
391
391
|
"description": "Use in short descriptions or labels. The default size for text in components. Migrate instances of Paragraph Default and UI Text to Body M."
|
|
392
392
|
},
|
|
393
|
-
"value": "normal 400 14px/20px \"
|
|
393
|
+
"value": "normal 400 14px/20px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
394
394
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
395
395
|
"isSource": true,
|
|
396
396
|
"original": {
|
|
@@ -419,7 +419,7 @@ var tokens = [{
|
|
|
419
419
|
"introduced": "1.14.0",
|
|
420
420
|
"description": "Use in secondary level content such as fine print or semantic messaging. Use sparingly. Migrate instances of Small text to Body S."
|
|
421
421
|
},
|
|
422
|
-
"value": "normal 400 12px/16px \"
|
|
422
|
+
"value": "normal 400 12px/16px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
423
423
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
424
424
|
"isSource": true,
|
|
425
425
|
"original": {
|
|
@@ -448,7 +448,7 @@ var tokens = [{
|
|
|
448
448
|
"introduced": "1.14.0",
|
|
449
449
|
"description": "UNSAFE - Do not use. Temporary 12px fontsize token. Will be deprecated and replaced with stable small token"
|
|
450
450
|
},
|
|
451
|
-
"value": "normal 400 12px/16px \"
|
|
451
|
+
"value": "normal 400 12px/16px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
452
452
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
453
453
|
"isSource": true,
|
|
454
454
|
"original": {
|
|
@@ -594,7 +594,7 @@ var tokens = [{
|
|
|
594
594
|
"introduced": "1.14.0",
|
|
595
595
|
"description": "For our default product UI heading text."
|
|
596
596
|
},
|
|
597
|
-
"value": "\"
|
|
597
|
+
"value": "\"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
598
598
|
"filePath": "schema/themes/atlassian-typography-refreshed/font-family.tsx",
|
|
599
599
|
"isSource": true,
|
|
600
600
|
"original": {
|
|
@@ -616,7 +616,7 @@ var tokens = [{
|
|
|
616
616
|
"introduced": "1.14.0",
|
|
617
617
|
"description": "For our default product UI body text."
|
|
618
618
|
},
|
|
619
|
-
"value": "\"
|
|
619
|
+
"value": "\"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
620
620
|
"filePath": "schema/themes/atlassian-typography-refreshed/font-family.tsx",
|
|
621
621
|
"isSource": true,
|
|
622
622
|
"original": {
|
|
@@ -685,7 +685,7 @@ var tokens = [{
|
|
|
685
685
|
"description": "Helpful guidance goes here",
|
|
686
686
|
"deprecated": "1.29.0"
|
|
687
687
|
},
|
|
688
|
-
"value": "\"
|
|
688
|
+
"value": "\"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
689
689
|
"filePath": "schema/themes/atlassian-typography-refreshed/font-family.tsx",
|
|
690
690
|
"isSource": true,
|
|
691
691
|
"original": {
|
|
@@ -44,7 +44,7 @@ var enableGlobalTheme = function enableGlobalTheme() {
|
|
|
44
44
|
_ref$spacing = _ref.spacing,
|
|
45
45
|
spacing = _ref$spacing === void 0 ? _themeConfig.themeStateDefaults['spacing'] : _ref$spacing,
|
|
46
46
|
_ref$typography = _ref.typography,
|
|
47
|
-
typography = _ref$typography === void 0 ? _themeConfig.themeStateDefaults['typography'] : _ref$typography,
|
|
47
|
+
typography = _ref$typography === void 0 ? _themeConfig.themeStateDefaults['typography']() : _ref$typography,
|
|
48
48
|
_ref$UNSAFE_themeOpti = _ref.UNSAFE_themeOptions,
|
|
49
49
|
UNSAFE_themeOptions = _ref$UNSAFE_themeOpti === void 0 ? _themeConfig.themeStateDefaults['UNSAFE_themeOptions'] : _ref$UNSAFE_themeOpti;
|
|
50
50
|
var themeLoader = arguments.length > 1 ? arguments[1] : undefined;
|
|
@@ -47,7 +47,7 @@ var getThemeHtmlAttrs = function getThemeHtmlAttrs() {
|
|
|
47
47
|
_ref$spacing = _ref.spacing,
|
|
48
48
|
spacing = _ref$spacing === void 0 ? _themeConfig.themeStateDefaults['spacing'] : _ref$spacing,
|
|
49
49
|
_ref$typography = _ref.typography,
|
|
50
|
-
typography = _ref$typography === void 0 ? _themeConfig.themeStateDefaults['typography'] : _ref$typography,
|
|
50
|
+
typography = _ref$typography === void 0 ? _themeConfig.themeStateDefaults['typography']() : _ref$typography,
|
|
51
51
|
_ref$UNSAFE_themeOpti = _ref.UNSAFE_themeOptions,
|
|
52
52
|
UNSAFE_themeOptions = _ref$UNSAFE_themeOpti === void 0 ? _themeConfig.themeStateDefaults['UNSAFE_themeOptions'] : _ref$UNSAFE_themeOpti;
|
|
53
53
|
var themeAttribute = (0, _themeStateTransformer.themeObjectToString)({
|
|
@@ -59,7 +59,7 @@ var getThemeStyles = /*#__PURE__*/function () {
|
|
|
59
59
|
light: (preferences === null || preferences === void 0 ? void 0 : preferences.light) || _themeConfig.themeStateDefaults['light'],
|
|
60
60
|
shape: (preferences === null || preferences === void 0 ? void 0 : preferences.shape) || _themeConfig.themeStateDefaults['shape'],
|
|
61
61
|
spacing: (preferences === null || preferences === void 0 ? void 0 : preferences.spacing) || _themeConfig.themeStateDefaults['spacing'],
|
|
62
|
-
typography: (preferences === null || preferences === void 0 ? void 0 : preferences.typography) || _themeConfig.themeStateDefaults['typography']
|
|
62
|
+
typography: (preferences === null || preferences === void 0 ? void 0 : preferences.typography) || _themeConfig.themeStateDefaults['typography']()
|
|
63
63
|
};
|
|
64
64
|
themePreferences = (0, _getThemePreferences.getThemePreferences)(themeState);
|
|
65
65
|
themeOverridePreferences = (0, _getThemePreferences.getThemeOverridePreferences)(themeState);
|
|
@@ -76,7 +76,7 @@ var setGlobalTheme = /*#__PURE__*/function () {
|
|
|
76
76
|
return _regenerator.default.wrap(function _callee3$(_context3) {
|
|
77
77
|
while (1) switch (_context3.prev = _context3.next) {
|
|
78
78
|
case 0:
|
|
79
|
-
_ref2 = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {}, _ref2$colorMode = _ref2.colorMode, colorMode = _ref2$colorMode === void 0 ? _themeConfig.themeStateDefaults['colorMode'] : _ref2$colorMode, _ref2$contrastMode = _ref2.contrastMode, contrastMode = _ref2$contrastMode === void 0 ? _themeConfig.themeStateDefaults['contrastMode'] : _ref2$contrastMode, _ref2$dark = _ref2.dark, dark = _ref2$dark === void 0 ? _themeConfig.themeStateDefaults['dark'] : _ref2$dark, _ref2$light = _ref2.light, light = _ref2$light === void 0 ? _themeConfig.themeStateDefaults['light'] : _ref2$light, _ref2$shape = _ref2.shape, shape = _ref2$shape === void 0 ? _themeConfig.themeStateDefaults['shape'] : _ref2$shape, _ref2$spacing = _ref2.spacing, spacing = _ref2$spacing === void 0 ? _themeConfig.themeStateDefaults['spacing'] : _ref2$spacing, _ref2$typography = _ref2.typography, typography = _ref2$typography === void 0 ? _themeConfig.themeStateDefaults['typography'] : _ref2$typography, _ref2$UNSAFE_themeOpt = _ref2.UNSAFE_themeOptions, UNSAFE_themeOptions = _ref2$UNSAFE_themeOpt === void 0 ? _themeConfig.themeStateDefaults['UNSAFE_themeOptions'] : _ref2$UNSAFE_themeOpt;
|
|
79
|
+
_ref2 = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {}, _ref2$colorMode = _ref2.colorMode, colorMode = _ref2$colorMode === void 0 ? _themeConfig.themeStateDefaults['colorMode'] : _ref2$colorMode, _ref2$contrastMode = _ref2.contrastMode, contrastMode = _ref2$contrastMode === void 0 ? _themeConfig.themeStateDefaults['contrastMode'] : _ref2$contrastMode, _ref2$dark = _ref2.dark, dark = _ref2$dark === void 0 ? _themeConfig.themeStateDefaults['dark'] : _ref2$dark, _ref2$light = _ref2.light, light = _ref2$light === void 0 ? _themeConfig.themeStateDefaults['light'] : _ref2$light, _ref2$shape = _ref2.shape, shape = _ref2$shape === void 0 ? _themeConfig.themeStateDefaults['shape'] : _ref2$shape, _ref2$spacing = _ref2.spacing, spacing = _ref2$spacing === void 0 ? _themeConfig.themeStateDefaults['spacing'] : _ref2$spacing, _ref2$typography = _ref2.typography, typography = _ref2$typography === void 0 ? _themeConfig.themeStateDefaults['typography']() : _ref2$typography, _ref2$UNSAFE_themeOpt = _ref2.UNSAFE_themeOptions, UNSAFE_themeOptions = _ref2$UNSAFE_themeOpt === void 0 ? _themeConfig.themeStateDefaults['UNSAFE_themeOptions'] : _ref2$UNSAFE_themeOpt;
|
|
80
80
|
themeLoader = _args3.length > 1 ? _args3[1] : undefined;
|
|
81
81
|
// CLEANUP: Remove. This blocks application of increased contrast themes
|
|
82
82
|
// without the feature flag enabled.
|
package/dist/cjs/theme-config.js
CHANGED
|
@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.themeStateDefaults = exports.themeOverrideIds = exports.themeIdsWithOverrides = exports.themeIds = exports.themeContrastModes = exports.themeColorModes = exports.default = void 0;
|
|
7
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
7
8
|
/**
|
|
8
9
|
* This file contains the source of truth for themes and all associated meta data.
|
|
9
10
|
*/
|
|
@@ -216,6 +217,11 @@ var themeConfig = {
|
|
|
216
217
|
* ThemeState: the standard representation of an app's current theme and preferences
|
|
217
218
|
*/
|
|
218
219
|
|
|
220
|
+
/**
|
|
221
|
+
* Can't evaluate typography feature flags at the module level,
|
|
222
|
+
* it will always resolve to false when server side rendered or when flags are loaded async.
|
|
223
|
+
*/
|
|
224
|
+
|
|
219
225
|
/**
|
|
220
226
|
* themeStateDefaults: the default values for ThemeState used by theming utilities
|
|
221
227
|
*/
|
|
@@ -226,7 +232,12 @@ var themeStateDefaults = exports.themeStateDefaults = {
|
|
|
226
232
|
light: 'light',
|
|
227
233
|
shape: undefined,
|
|
228
234
|
spacing: 'spacing',
|
|
229
|
-
typography:
|
|
235
|
+
typography: function typography() {
|
|
236
|
+
if ((0, _platformFeatureFlags.fg)('platform-default-typography-modernized')) {
|
|
237
|
+
return 'typography-modernized';
|
|
238
|
+
}
|
|
239
|
+
return undefined;
|
|
240
|
+
},
|
|
230
241
|
UNSAFE_themeOptions: undefined
|
|
231
242
|
};
|
|
232
243
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* THIS FILE WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
|
|
3
|
-
* @codegen <<SignedSource::
|
|
3
|
+
* @codegen <<SignedSource::909dfaa0e3366d4739e13971248bd7c0>>
|
|
4
4
|
* @codegenCommand yarn build tokens
|
|
5
5
|
*/
|
|
6
6
|
const tokens = [{
|
|
@@ -94,14 +94,14 @@ const tokens = [{
|
|
|
94
94
|
"name": "typography.fontFamily.FontFamilyWebSans",
|
|
95
95
|
"path": ["typography", "fontFamily", "FontFamilyWebSans"]
|
|
96
96
|
}, {
|
|
97
|
-
"value": "\"
|
|
97
|
+
"value": "\"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
98
98
|
"attributes": {
|
|
99
99
|
"group": "fontFamily"
|
|
100
100
|
},
|
|
101
101
|
"filePath": "schema/palettes/typography-palette.tsx",
|
|
102
102
|
"isSource": true,
|
|
103
103
|
"original": {
|
|
104
|
-
"value": "\"
|
|
104
|
+
"value": "\"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
105
105
|
"attributes": {
|
|
106
106
|
"group": "fontFamily"
|
|
107
107
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* THIS FILE WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
|
|
3
|
-
* @codegen <<SignedSource::
|
|
3
|
+
* @codegen <<SignedSource::5c09e6710724a50480f98849037825eb>>
|
|
4
4
|
* @codegenCommand yarn build tokens
|
|
5
5
|
*/
|
|
6
6
|
export default `
|
|
@@ -11,27 +11,27 @@ html[data-theme~="typography:typography-refreshed"] {
|
|
|
11
11
|
--ds-font-letterSpacing-200: 0;
|
|
12
12
|
--ds-font-letterSpacing-300: 0;
|
|
13
13
|
--ds-font-letterSpacing-400: 0;
|
|
14
|
-
--ds-font-heading-xxlarge: normal 700 2rem/2.25rem "
|
|
15
|
-
--ds-font-heading-xlarge: normal 700 1.75rem/2rem "
|
|
16
|
-
--ds-font-heading-large: normal 700 1.5rem/1.75rem "
|
|
17
|
-
--ds-font-heading-medium: normal 700 1.25rem/1.5rem "
|
|
18
|
-
--ds-font-heading-small: normal 700 1rem/1.25rem "
|
|
19
|
-
--ds-font-heading-xsmall: normal 700 0.875rem/1.25rem "
|
|
20
|
-
--ds-font-heading-xxsmall: normal 700 0.75rem/1rem "
|
|
21
|
-
--ds-font-body-large: normal 400 1rem/1.5rem "
|
|
22
|
-
--ds-font-body: normal 400 0.875rem/1.25rem "
|
|
23
|
-
--ds-font-body-small: normal 400 0.75rem/1rem "
|
|
24
|
-
--ds-font-body-UNSAFE_small: normal 400 0.75rem/1rem "
|
|
14
|
+
--ds-font-heading-xxlarge: normal 700 2rem/2.25rem "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif;
|
|
15
|
+
--ds-font-heading-xlarge: normal 700 1.75rem/2rem "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif;
|
|
16
|
+
--ds-font-heading-large: normal 700 1.5rem/1.75rem "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif;
|
|
17
|
+
--ds-font-heading-medium: normal 700 1.25rem/1.5rem "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif;
|
|
18
|
+
--ds-font-heading-small: normal 700 1rem/1.25rem "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif;
|
|
19
|
+
--ds-font-heading-xsmall: normal 700 0.875rem/1.25rem "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif;
|
|
20
|
+
--ds-font-heading-xxsmall: normal 700 0.75rem/1rem "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif;
|
|
21
|
+
--ds-font-body-large: normal 400 1rem/1.5rem "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif;
|
|
22
|
+
--ds-font-body: normal 400 0.875rem/1.25rem "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif;
|
|
23
|
+
--ds-font-body-small: normal 400 0.75rem/1rem "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif;
|
|
24
|
+
--ds-font-body-UNSAFE_small: normal 400 0.75rem/1rem "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif;
|
|
25
25
|
--ds-font-code: normal 400 0.875em/1 ui-monospace, Menlo, "Segoe UI Mono", "Ubuntu Mono", monospace;
|
|
26
26
|
--ds-font-weight-regular: 400;
|
|
27
27
|
--ds-font-weight-medium: 500;
|
|
28
28
|
--ds-font-weight-semibold: 600;
|
|
29
29
|
--ds-font-weight-bold: 700;
|
|
30
|
-
--ds-font-family-heading: "
|
|
31
|
-
--ds-font-family-body: "
|
|
30
|
+
--ds-font-family-heading: "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif;
|
|
31
|
+
--ds-font-family-body: "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif;
|
|
32
32
|
--ds-font-family-code: ui-monospace, Menlo, "Segoe UI Mono", "Ubuntu Mono", monospace;
|
|
33
33
|
--ds-font-family-monospace: ui-monospace, Menlo, "Segoe UI Mono", "Ubuntu Mono", monospace;
|
|
34
|
-
--ds-font-family-sans: "
|
|
34
|
+
--ds-font-family-sans: "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif;
|
|
35
35
|
--ds-font-family-brand-heading: "Charlie Display", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif;
|
|
36
36
|
--ds-font-family-brand-body: "Charlie Text", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif;
|
|
37
37
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* THIS FILE WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
|
|
3
|
-
* @codegen <<SignedSource::
|
|
3
|
+
* @codegen <<SignedSource::dce942b8ed1c06fabf9d37bbecb9cca4>>
|
|
4
4
|
* @codegenCommand yarn build tokens
|
|
5
5
|
*/
|
|
6
6
|
const tokens = [{
|
|
@@ -152,7 +152,7 @@ const tokens = [{
|
|
|
152
152
|
"introduced": "1.14.0",
|
|
153
153
|
"description": "For overlapping brand with product promotions, such as marketplace content. Migrate instances of H900 to Heading XXL."
|
|
154
154
|
},
|
|
155
|
-
"value": "normal 700 32px/36px \"
|
|
155
|
+
"value": "normal 700 32px/36px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
156
156
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
157
157
|
"isSource": true,
|
|
158
158
|
"original": {
|
|
@@ -181,7 +181,7 @@ const tokens = [{
|
|
|
181
181
|
"introduced": "1.14.0",
|
|
182
182
|
"description": "For overlapping brand with product promotions, such as marketplace content. Migrate instances of H800 to Heading XL."
|
|
183
183
|
},
|
|
184
|
-
"value": "normal 700 28px/32px \"
|
|
184
|
+
"value": "normal 700 28px/32px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
185
185
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
186
186
|
"isSource": true,
|
|
187
187
|
"original": {
|
|
@@ -210,7 +210,7 @@ const tokens = [{
|
|
|
210
210
|
"introduced": "1.14.0",
|
|
211
211
|
"description": "Product page titles, such as forms. Migrate instances of H700 to Heading L."
|
|
212
212
|
},
|
|
213
|
-
"value": "normal 700 24px/28px \"
|
|
213
|
+
"value": "normal 700 24px/28px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
214
214
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
215
215
|
"isSource": true,
|
|
216
216
|
"original": {
|
|
@@ -239,7 +239,7 @@ const tokens = [{
|
|
|
239
239
|
"introduced": "1.14.0",
|
|
240
240
|
"description": "Headers in large components, such as modal dialogs. Migrate instances of H600 to Heading M."
|
|
241
241
|
},
|
|
242
|
-
"value": "normal 700 20px/24px \"
|
|
242
|
+
"value": "normal 700 20px/24px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
243
243
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
244
244
|
"isSource": true,
|
|
245
245
|
"original": {
|
|
@@ -268,7 +268,7 @@ const tokens = [{
|
|
|
268
268
|
"introduced": "1.14.0",
|
|
269
269
|
"description": "For headers in small components where space is limited. Migrate instances of H500 to Heading S."
|
|
270
270
|
},
|
|
271
|
-
"value": "normal 700 16px/20px \"
|
|
271
|
+
"value": "normal 700 16px/20px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
272
272
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
273
273
|
"isSource": true,
|
|
274
274
|
"original": {
|
|
@@ -297,7 +297,7 @@ const tokens = [{
|
|
|
297
297
|
"introduced": "1.14.0",
|
|
298
298
|
"description": "For headers in small components where space is limited. Migrate instances of H400 to Heading XS."
|
|
299
299
|
},
|
|
300
|
-
"value": "normal 700 14px/20px \"
|
|
300
|
+
"value": "normal 700 14px/20px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
301
301
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
302
302
|
"isSource": true,
|
|
303
303
|
"original": {
|
|
@@ -326,7 +326,7 @@ const tokens = [{
|
|
|
326
326
|
"introduced": "1.14.0",
|
|
327
327
|
"description": "For headers in fine print or tight spaces. Use sparingly. Migrate instances of H100, H200 and H300 to Heading XXS."
|
|
328
328
|
},
|
|
329
|
-
"value": "normal 700 12px/16px \"
|
|
329
|
+
"value": "normal 700 12px/16px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
330
330
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
331
331
|
"isSource": true,
|
|
332
332
|
"original": {
|
|
@@ -355,7 +355,7 @@ const tokens = [{
|
|
|
355
355
|
"introduced": "1.14.0",
|
|
356
356
|
"description": "For long-form text, such as in blogs."
|
|
357
357
|
},
|
|
358
|
-
"value": "normal 400 16px/24px \"
|
|
358
|
+
"value": "normal 400 16px/24px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
359
359
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
360
360
|
"isSource": true,
|
|
361
361
|
"original": {
|
|
@@ -384,7 +384,7 @@ const tokens = [{
|
|
|
384
384
|
"introduced": "1.14.0",
|
|
385
385
|
"description": "Use in short descriptions or labels. The default size for text in components. Migrate instances of Paragraph Default and UI Text to Body M."
|
|
386
386
|
},
|
|
387
|
-
"value": "normal 400 14px/20px \"
|
|
387
|
+
"value": "normal 400 14px/20px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
388
388
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
389
389
|
"isSource": true,
|
|
390
390
|
"original": {
|
|
@@ -413,7 +413,7 @@ const tokens = [{
|
|
|
413
413
|
"introduced": "1.14.0",
|
|
414
414
|
"description": "Use in secondary level content such as fine print or semantic messaging. Use sparingly. Migrate instances of Small text to Body S."
|
|
415
415
|
},
|
|
416
|
-
"value": "normal 400 12px/16px \"
|
|
416
|
+
"value": "normal 400 12px/16px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
417
417
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
418
418
|
"isSource": true,
|
|
419
419
|
"original": {
|
|
@@ -442,7 +442,7 @@ const tokens = [{
|
|
|
442
442
|
"introduced": "1.14.0",
|
|
443
443
|
"description": "UNSAFE - Do not use. Temporary 12px fontsize token. Will be deprecated and replaced with stable small token"
|
|
444
444
|
},
|
|
445
|
-
"value": "normal 400 12px/16px \"
|
|
445
|
+
"value": "normal 400 12px/16px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
446
446
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
447
447
|
"isSource": true,
|
|
448
448
|
"original": {
|
|
@@ -588,7 +588,7 @@ const tokens = [{
|
|
|
588
588
|
"introduced": "1.14.0",
|
|
589
589
|
"description": "For our default product UI heading text."
|
|
590
590
|
},
|
|
591
|
-
"value": "\"
|
|
591
|
+
"value": "\"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
592
592
|
"filePath": "schema/themes/atlassian-typography-refreshed/font-family.tsx",
|
|
593
593
|
"isSource": true,
|
|
594
594
|
"original": {
|
|
@@ -610,7 +610,7 @@ const tokens = [{
|
|
|
610
610
|
"introduced": "1.14.0",
|
|
611
611
|
"description": "For our default product UI body text."
|
|
612
612
|
},
|
|
613
|
-
"value": "\"
|
|
613
|
+
"value": "\"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
614
614
|
"filePath": "schema/themes/atlassian-typography-refreshed/font-family.tsx",
|
|
615
615
|
"isSource": true,
|
|
616
616
|
"original": {
|
|
@@ -679,7 +679,7 @@ const tokens = [{
|
|
|
679
679
|
"description": "Helpful guidance goes here",
|
|
680
680
|
"deprecated": "1.29.0"
|
|
681
681
|
},
|
|
682
|
-
"value": "\"
|
|
682
|
+
"value": "\"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
683
683
|
"filePath": "schema/themes/atlassian-typography-refreshed/font-family.tsx",
|
|
684
684
|
"isSource": true,
|
|
685
685
|
"original": {
|
|
@@ -30,7 +30,7 @@ const enableGlobalTheme = ({
|
|
|
30
30
|
light = themeStateDefaults['light'],
|
|
31
31
|
shape = themeStateDefaults['shape'],
|
|
32
32
|
spacing = themeStateDefaults['spacing'],
|
|
33
|
-
typography = themeStateDefaults['typography'],
|
|
33
|
+
typography = themeStateDefaults['typography'](),
|
|
34
34
|
UNSAFE_themeOptions = themeStateDefaults['UNSAFE_themeOptions']
|
|
35
35
|
} = {}, themeLoader) => {
|
|
36
36
|
const themeState = {
|
|
@@ -28,7 +28,7 @@ const getThemeHtmlAttrs = ({
|
|
|
28
28
|
contrastMode = themeStateDefaults['contrastMode'],
|
|
29
29
|
shape = themeStateDefaults['shape'],
|
|
30
30
|
spacing = themeStateDefaults['spacing'],
|
|
31
|
-
typography = themeStateDefaults['typography'],
|
|
31
|
+
typography = themeStateDefaults['typography'](),
|
|
32
32
|
UNSAFE_themeOptions = themeStateDefaults['UNSAFE_themeOptions']
|
|
33
33
|
} = {}) => {
|
|
34
34
|
const themeAttribute = themeObjectToString({
|
|
@@ -38,7 +38,7 @@ const getThemeStyles = async preferences => {
|
|
|
38
38
|
light: (preferences === null || preferences === void 0 ? void 0 : preferences.light) || themeStateDefaults['light'],
|
|
39
39
|
shape: (preferences === null || preferences === void 0 ? void 0 : preferences.shape) || themeStateDefaults['shape'],
|
|
40
40
|
spacing: (preferences === null || preferences === void 0 ? void 0 : preferences.spacing) || themeStateDefaults['spacing'],
|
|
41
|
-
typography: (preferences === null || preferences === void 0 ? void 0 : preferences.typography) || themeStateDefaults['typography']
|
|
41
|
+
typography: (preferences === null || preferences === void 0 ? void 0 : preferences.typography) || themeStateDefaults['typography']()
|
|
42
42
|
};
|
|
43
43
|
themePreferences = getThemePreferences(themeState);
|
|
44
44
|
themeOverridePreferences = getThemeOverridePreferences(themeState);
|
|
@@ -34,7 +34,7 @@ const setGlobalTheme = async ({
|
|
|
34
34
|
light = themeStateDefaults['light'],
|
|
35
35
|
shape = themeStateDefaults['shape'],
|
|
36
36
|
spacing = themeStateDefaults['spacing'],
|
|
37
|
-
typography = themeStateDefaults['typography'],
|
|
37
|
+
typography = themeStateDefaults['typography'](),
|
|
38
38
|
UNSAFE_themeOptions = themeStateDefaults['UNSAFE_themeOptions']
|
|
39
39
|
} = {}, themeLoader) => {
|
|
40
40
|
// CLEANUP: Remove. This blocks application of increased contrast themes
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
2
|
+
|
|
1
3
|
/**
|
|
2
4
|
* This file contains the source of truth for themes and all associated meta data.
|
|
3
5
|
*/
|
|
@@ -210,6 +212,11 @@ const themeConfig = {
|
|
|
210
212
|
* ThemeState: the standard representation of an app's current theme and preferences
|
|
211
213
|
*/
|
|
212
214
|
|
|
215
|
+
/**
|
|
216
|
+
* Can't evaluate typography feature flags at the module level,
|
|
217
|
+
* it will always resolve to false when server side rendered or when flags are loaded async.
|
|
218
|
+
*/
|
|
219
|
+
|
|
213
220
|
/**
|
|
214
221
|
* themeStateDefaults: the default values for ThemeState used by theming utilities
|
|
215
222
|
*/
|
|
@@ -220,7 +227,12 @@ export const themeStateDefaults = {
|
|
|
220
227
|
light: 'light',
|
|
221
228
|
shape: undefined,
|
|
222
229
|
spacing: 'spacing',
|
|
223
|
-
typography:
|
|
230
|
+
typography: () => {
|
|
231
|
+
if (fg('platform-default-typography-modernized')) {
|
|
232
|
+
return 'typography-modernized';
|
|
233
|
+
}
|
|
234
|
+
return undefined;
|
|
235
|
+
},
|
|
224
236
|
UNSAFE_themeOptions: undefined
|
|
225
237
|
};
|
|
226
238
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* THIS FILE WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
|
|
3
|
-
* @codegen <<SignedSource::
|
|
3
|
+
* @codegen <<SignedSource::909dfaa0e3366d4739e13971248bd7c0>>
|
|
4
4
|
* @codegenCommand yarn build tokens
|
|
5
5
|
*/
|
|
6
6
|
var tokens = [{
|
|
@@ -94,14 +94,14 @@ var tokens = [{
|
|
|
94
94
|
"name": "typography.fontFamily.FontFamilyWebSans",
|
|
95
95
|
"path": ["typography", "fontFamily", "FontFamilyWebSans"]
|
|
96
96
|
}, {
|
|
97
|
-
"value": "\"
|
|
97
|
+
"value": "\"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
98
98
|
"attributes": {
|
|
99
99
|
"group": "fontFamily"
|
|
100
100
|
},
|
|
101
101
|
"filePath": "schema/palettes/typography-palette.tsx",
|
|
102
102
|
"isSource": true,
|
|
103
103
|
"original": {
|
|
104
|
-
"value": "\"
|
|
104
|
+
"value": "\"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
105
105
|
"attributes": {
|
|
106
106
|
"group": "fontFamily"
|
|
107
107
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* THIS FILE WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
|
|
3
|
-
* @codegen <<SignedSource::
|
|
3
|
+
* @codegen <<SignedSource::5c09e6710724a50480f98849037825eb>>
|
|
4
4
|
* @codegenCommand yarn build tokens
|
|
5
5
|
*/
|
|
6
|
-
export default "\nhtml[data-theme~=\"typography:typography-refreshed\"] {\n --ds-UNSAFE-textTransformUppercase: uppercase;\n --ds-font-letterSpacing-0: 0;\n --ds-font-letterSpacing-100: 0;\n --ds-font-letterSpacing-200: 0;\n --ds-font-letterSpacing-300: 0;\n --ds-font-letterSpacing-400: 0;\n --ds-font-heading-xxlarge: normal 700 2rem/2.25rem \"
|
|
6
|
+
export default "\nhtml[data-theme~=\"typography:typography-refreshed\"] {\n --ds-UNSAFE-textTransformUppercase: uppercase;\n --ds-font-letterSpacing-0: 0;\n --ds-font-letterSpacing-100: 0;\n --ds-font-letterSpacing-200: 0;\n --ds-font-letterSpacing-300: 0;\n --ds-font-letterSpacing-400: 0;\n --ds-font-heading-xxlarge: normal 700 2rem/2.25rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-xlarge: normal 700 1.75rem/2rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-large: normal 700 1.5rem/1.75rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-medium: normal 700 1.25rem/1.5rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-small: normal 700 1rem/1.25rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-xsmall: normal 700 0.875rem/1.25rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-xxsmall: normal 700 0.75rem/1rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-body-large: normal 400 1rem/1.5rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-body: normal 400 0.875rem/1.25rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-body-small: normal 400 0.75rem/1rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-body-UNSAFE_small: normal 400 0.75rem/1rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-code: normal 400 0.875em/1 ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace;\n --ds-font-weight-regular: 400;\n --ds-font-weight-medium: 500;\n --ds-font-weight-semibold: 600;\n --ds-font-weight-bold: 700;\n --ds-font-family-heading: \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-family-body: \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-family-code: ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace;\n --ds-font-family-monospace: ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace;\n --ds-font-family-sans: \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-family-brand-heading: \"Charlie Display\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-family-brand-body: \"Charlie Text\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n}\n";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* THIS FILE WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
|
|
3
|
-
* @codegen <<SignedSource::
|
|
3
|
+
* @codegen <<SignedSource::dce942b8ed1c06fabf9d37bbecb9cca4>>
|
|
4
4
|
* @codegenCommand yarn build tokens
|
|
5
5
|
*/
|
|
6
6
|
var tokens = [{
|
|
@@ -152,7 +152,7 @@ var tokens = [{
|
|
|
152
152
|
"introduced": "1.14.0",
|
|
153
153
|
"description": "For overlapping brand with product promotions, such as marketplace content. Migrate instances of H900 to Heading XXL."
|
|
154
154
|
},
|
|
155
|
-
"value": "normal 700 32px/36px \"
|
|
155
|
+
"value": "normal 700 32px/36px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
156
156
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
157
157
|
"isSource": true,
|
|
158
158
|
"original": {
|
|
@@ -181,7 +181,7 @@ var tokens = [{
|
|
|
181
181
|
"introduced": "1.14.0",
|
|
182
182
|
"description": "For overlapping brand with product promotions, such as marketplace content. Migrate instances of H800 to Heading XL."
|
|
183
183
|
},
|
|
184
|
-
"value": "normal 700 28px/32px \"
|
|
184
|
+
"value": "normal 700 28px/32px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
185
185
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
186
186
|
"isSource": true,
|
|
187
187
|
"original": {
|
|
@@ -210,7 +210,7 @@ var tokens = [{
|
|
|
210
210
|
"introduced": "1.14.0",
|
|
211
211
|
"description": "Product page titles, such as forms. Migrate instances of H700 to Heading L."
|
|
212
212
|
},
|
|
213
|
-
"value": "normal 700 24px/28px \"
|
|
213
|
+
"value": "normal 700 24px/28px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
214
214
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
215
215
|
"isSource": true,
|
|
216
216
|
"original": {
|
|
@@ -239,7 +239,7 @@ var tokens = [{
|
|
|
239
239
|
"introduced": "1.14.0",
|
|
240
240
|
"description": "Headers in large components, such as modal dialogs. Migrate instances of H600 to Heading M."
|
|
241
241
|
},
|
|
242
|
-
"value": "normal 700 20px/24px \"
|
|
242
|
+
"value": "normal 700 20px/24px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
243
243
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
244
244
|
"isSource": true,
|
|
245
245
|
"original": {
|
|
@@ -268,7 +268,7 @@ var tokens = [{
|
|
|
268
268
|
"introduced": "1.14.0",
|
|
269
269
|
"description": "For headers in small components where space is limited. Migrate instances of H500 to Heading S."
|
|
270
270
|
},
|
|
271
|
-
"value": "normal 700 16px/20px \"
|
|
271
|
+
"value": "normal 700 16px/20px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
272
272
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
273
273
|
"isSource": true,
|
|
274
274
|
"original": {
|
|
@@ -297,7 +297,7 @@ var tokens = [{
|
|
|
297
297
|
"introduced": "1.14.0",
|
|
298
298
|
"description": "For headers in small components where space is limited. Migrate instances of H400 to Heading XS."
|
|
299
299
|
},
|
|
300
|
-
"value": "normal 700 14px/20px \"
|
|
300
|
+
"value": "normal 700 14px/20px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
301
301
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
302
302
|
"isSource": true,
|
|
303
303
|
"original": {
|
|
@@ -326,7 +326,7 @@ var tokens = [{
|
|
|
326
326
|
"introduced": "1.14.0",
|
|
327
327
|
"description": "For headers in fine print or tight spaces. Use sparingly. Migrate instances of H100, H200 and H300 to Heading XXS."
|
|
328
328
|
},
|
|
329
|
-
"value": "normal 700 12px/16px \"
|
|
329
|
+
"value": "normal 700 12px/16px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
330
330
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
331
331
|
"isSource": true,
|
|
332
332
|
"original": {
|
|
@@ -355,7 +355,7 @@ var tokens = [{
|
|
|
355
355
|
"introduced": "1.14.0",
|
|
356
356
|
"description": "For long-form text, such as in blogs."
|
|
357
357
|
},
|
|
358
|
-
"value": "normal 400 16px/24px \"
|
|
358
|
+
"value": "normal 400 16px/24px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
359
359
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
360
360
|
"isSource": true,
|
|
361
361
|
"original": {
|
|
@@ -384,7 +384,7 @@ var tokens = [{
|
|
|
384
384
|
"introduced": "1.14.0",
|
|
385
385
|
"description": "Use in short descriptions or labels. The default size for text in components. Migrate instances of Paragraph Default and UI Text to Body M."
|
|
386
386
|
},
|
|
387
|
-
"value": "normal 400 14px/20px \"
|
|
387
|
+
"value": "normal 400 14px/20px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
388
388
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
389
389
|
"isSource": true,
|
|
390
390
|
"original": {
|
|
@@ -413,7 +413,7 @@ var tokens = [{
|
|
|
413
413
|
"introduced": "1.14.0",
|
|
414
414
|
"description": "Use in secondary level content such as fine print or semantic messaging. Use sparingly. Migrate instances of Small text to Body S."
|
|
415
415
|
},
|
|
416
|
-
"value": "normal 400 12px/16px \"
|
|
416
|
+
"value": "normal 400 12px/16px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
417
417
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
418
418
|
"isSource": true,
|
|
419
419
|
"original": {
|
|
@@ -442,7 +442,7 @@ var tokens = [{
|
|
|
442
442
|
"introduced": "1.14.0",
|
|
443
443
|
"description": "UNSAFE - Do not use. Temporary 12px fontsize token. Will be deprecated and replaced with stable small token"
|
|
444
444
|
},
|
|
445
|
-
"value": "normal 400 12px/16px \"
|
|
445
|
+
"value": "normal 400 12px/16px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
446
446
|
"filePath": "schema/themes/atlassian-typography-refreshed/theme.tsx",
|
|
447
447
|
"isSource": true,
|
|
448
448
|
"original": {
|
|
@@ -588,7 +588,7 @@ var tokens = [{
|
|
|
588
588
|
"introduced": "1.14.0",
|
|
589
589
|
"description": "For our default product UI heading text."
|
|
590
590
|
},
|
|
591
|
-
"value": "\"
|
|
591
|
+
"value": "\"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
592
592
|
"filePath": "schema/themes/atlassian-typography-refreshed/font-family.tsx",
|
|
593
593
|
"isSource": true,
|
|
594
594
|
"original": {
|
|
@@ -610,7 +610,7 @@ var tokens = [{
|
|
|
610
610
|
"introduced": "1.14.0",
|
|
611
611
|
"description": "For our default product UI body text."
|
|
612
612
|
},
|
|
613
|
-
"value": "\"
|
|
613
|
+
"value": "\"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
614
614
|
"filePath": "schema/themes/atlassian-typography-refreshed/font-family.tsx",
|
|
615
615
|
"isSource": true,
|
|
616
616
|
"original": {
|
|
@@ -679,7 +679,7 @@ var tokens = [{
|
|
|
679
679
|
"description": "Helpful guidance goes here",
|
|
680
680
|
"deprecated": "1.29.0"
|
|
681
681
|
},
|
|
682
|
-
"value": "\"
|
|
682
|
+
"value": "\"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif",
|
|
683
683
|
"filePath": "schema/themes/atlassian-typography-refreshed/font-family.tsx",
|
|
684
684
|
"isSource": true,
|
|
685
685
|
"original": {
|
|
@@ -38,7 +38,7 @@ var enableGlobalTheme = function enableGlobalTheme() {
|
|
|
38
38
|
_ref$spacing = _ref.spacing,
|
|
39
39
|
spacing = _ref$spacing === void 0 ? themeStateDefaults['spacing'] : _ref$spacing,
|
|
40
40
|
_ref$typography = _ref.typography,
|
|
41
|
-
typography = _ref$typography === void 0 ? themeStateDefaults['typography'] : _ref$typography,
|
|
41
|
+
typography = _ref$typography === void 0 ? themeStateDefaults['typography']() : _ref$typography,
|
|
42
42
|
_ref$UNSAFE_themeOpti = _ref.UNSAFE_themeOptions,
|
|
43
43
|
UNSAFE_themeOptions = _ref$UNSAFE_themeOpti === void 0 ? themeStateDefaults['UNSAFE_themeOptions'] : _ref$UNSAFE_themeOpti;
|
|
44
44
|
var themeLoader = arguments.length > 1 ? arguments[1] : undefined;
|
|
@@ -40,7 +40,7 @@ var getThemeHtmlAttrs = function getThemeHtmlAttrs() {
|
|
|
40
40
|
_ref$spacing = _ref.spacing,
|
|
41
41
|
spacing = _ref$spacing === void 0 ? themeStateDefaults['spacing'] : _ref$spacing,
|
|
42
42
|
_ref$typography = _ref.typography,
|
|
43
|
-
typography = _ref$typography === void 0 ? themeStateDefaults['typography'] : _ref$typography,
|
|
43
|
+
typography = _ref$typography === void 0 ? themeStateDefaults['typography']() : _ref$typography,
|
|
44
44
|
_ref$UNSAFE_themeOpti = _ref.UNSAFE_themeOptions,
|
|
45
45
|
UNSAFE_themeOptions = _ref$UNSAFE_themeOpti === void 0 ? themeStateDefaults['UNSAFE_themeOptions'] : _ref$UNSAFE_themeOpti;
|
|
46
46
|
var themeAttribute = themeObjectToString({
|
|
@@ -49,7 +49,7 @@ var getThemeStyles = /*#__PURE__*/function () {
|
|
|
49
49
|
light: (preferences === null || preferences === void 0 ? void 0 : preferences.light) || themeStateDefaults['light'],
|
|
50
50
|
shape: (preferences === null || preferences === void 0 ? void 0 : preferences.shape) || themeStateDefaults['shape'],
|
|
51
51
|
spacing: (preferences === null || preferences === void 0 ? void 0 : preferences.spacing) || themeStateDefaults['spacing'],
|
|
52
|
-
typography: (preferences === null || preferences === void 0 ? void 0 : preferences.typography) || themeStateDefaults['typography']
|
|
52
|
+
typography: (preferences === null || preferences === void 0 ? void 0 : preferences.typography) || themeStateDefaults['typography']()
|
|
53
53
|
};
|
|
54
54
|
themePreferences = getThemePreferences(themeState);
|
|
55
55
|
themeOverridePreferences = getThemeOverridePreferences(themeState);
|
|
@@ -67,7 +67,7 @@ var setGlobalTheme = /*#__PURE__*/function () {
|
|
|
67
67
|
return _regeneratorRuntime.wrap(function _callee3$(_context3) {
|
|
68
68
|
while (1) switch (_context3.prev = _context3.next) {
|
|
69
69
|
case 0:
|
|
70
|
-
_ref2 = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {}, _ref2$colorMode = _ref2.colorMode, colorMode = _ref2$colorMode === void 0 ? themeStateDefaults['colorMode'] : _ref2$colorMode, _ref2$contrastMode = _ref2.contrastMode, contrastMode = _ref2$contrastMode === void 0 ? themeStateDefaults['contrastMode'] : _ref2$contrastMode, _ref2$dark = _ref2.dark, dark = _ref2$dark === void 0 ? themeStateDefaults['dark'] : _ref2$dark, _ref2$light = _ref2.light, light = _ref2$light === void 0 ? themeStateDefaults['light'] : _ref2$light, _ref2$shape = _ref2.shape, shape = _ref2$shape === void 0 ? themeStateDefaults['shape'] : _ref2$shape, _ref2$spacing = _ref2.spacing, spacing = _ref2$spacing === void 0 ? themeStateDefaults['spacing'] : _ref2$spacing, _ref2$typography = _ref2.typography, typography = _ref2$typography === void 0 ? themeStateDefaults['typography'] : _ref2$typography, _ref2$UNSAFE_themeOpt = _ref2.UNSAFE_themeOptions, UNSAFE_themeOptions = _ref2$UNSAFE_themeOpt === void 0 ? themeStateDefaults['UNSAFE_themeOptions'] : _ref2$UNSAFE_themeOpt;
|
|
70
|
+
_ref2 = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {}, _ref2$colorMode = _ref2.colorMode, colorMode = _ref2$colorMode === void 0 ? themeStateDefaults['colorMode'] : _ref2$colorMode, _ref2$contrastMode = _ref2.contrastMode, contrastMode = _ref2$contrastMode === void 0 ? themeStateDefaults['contrastMode'] : _ref2$contrastMode, _ref2$dark = _ref2.dark, dark = _ref2$dark === void 0 ? themeStateDefaults['dark'] : _ref2$dark, _ref2$light = _ref2.light, light = _ref2$light === void 0 ? themeStateDefaults['light'] : _ref2$light, _ref2$shape = _ref2.shape, shape = _ref2$shape === void 0 ? themeStateDefaults['shape'] : _ref2$shape, _ref2$spacing = _ref2.spacing, spacing = _ref2$spacing === void 0 ? themeStateDefaults['spacing'] : _ref2$spacing, _ref2$typography = _ref2.typography, typography = _ref2$typography === void 0 ? themeStateDefaults['typography']() : _ref2$typography, _ref2$UNSAFE_themeOpt = _ref2.UNSAFE_themeOptions, UNSAFE_themeOptions = _ref2$UNSAFE_themeOpt === void 0 ? themeStateDefaults['UNSAFE_themeOptions'] : _ref2$UNSAFE_themeOpt;
|
|
71
71
|
themeLoader = _args3.length > 1 ? _args3[1] : undefined;
|
|
72
72
|
// CLEANUP: Remove. This blocks application of increased contrast themes
|
|
73
73
|
// without the feature flag enabled.
|
package/dist/esm/theme-config.js
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
2
|
+
|
|
1
3
|
/**
|
|
2
4
|
* This file contains the source of truth for themes and all associated meta data.
|
|
3
5
|
*/
|
|
@@ -210,6 +212,11 @@ var themeConfig = {
|
|
|
210
212
|
* ThemeState: the standard representation of an app's current theme and preferences
|
|
211
213
|
*/
|
|
212
214
|
|
|
215
|
+
/**
|
|
216
|
+
* Can't evaluate typography feature flags at the module level,
|
|
217
|
+
* it will always resolve to false when server side rendered or when flags are loaded async.
|
|
218
|
+
*/
|
|
219
|
+
|
|
213
220
|
/**
|
|
214
221
|
* themeStateDefaults: the default values for ThemeState used by theming utilities
|
|
215
222
|
*/
|
|
@@ -220,7 +227,12 @@ export var themeStateDefaults = {
|
|
|
220
227
|
light: 'light',
|
|
221
228
|
shape: undefined,
|
|
222
229
|
spacing: 'spacing',
|
|
223
|
-
typography:
|
|
230
|
+
typography: function typography() {
|
|
231
|
+
if (fg('platform-default-typography-modernized')) {
|
|
232
|
+
return 'typography-modernized';
|
|
233
|
+
}
|
|
234
|
+
return undefined;
|
|
235
|
+
},
|
|
224
236
|
UNSAFE_themeOptions: undefined
|
|
225
237
|
};
|
|
226
238
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* THIS FILE WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
|
|
3
|
-
* @codegen <<SignedSource::
|
|
3
|
+
* @codegen <<SignedSource::909dfaa0e3366d4739e13971248bd7c0>>
|
|
4
4
|
* @codegenCommand yarn build tokens
|
|
5
5
|
*/
|
|
6
6
|
declare const tokens: ({
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* THIS FILE WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
|
|
3
|
-
* @codegen <<SignedSource::
|
|
3
|
+
* @codegen <<SignedSource::5c09e6710724a50480f98849037825eb>>
|
|
4
4
|
* @codegenCommand yarn build tokens
|
|
5
5
|
*/
|
|
6
|
-
declare const _default: "\nhtml[data-theme~=\"typography:typography-refreshed\"] {\n --ds-UNSAFE-textTransformUppercase: uppercase;\n --ds-font-letterSpacing-0: 0;\n --ds-font-letterSpacing-100: 0;\n --ds-font-letterSpacing-200: 0;\n --ds-font-letterSpacing-300: 0;\n --ds-font-letterSpacing-400: 0;\n --ds-font-heading-xxlarge: normal 700 2rem/2.25rem \"
|
|
6
|
+
declare const _default: "\nhtml[data-theme~=\"typography:typography-refreshed\"] {\n --ds-UNSAFE-textTransformUppercase: uppercase;\n --ds-font-letterSpacing-0: 0;\n --ds-font-letterSpacing-100: 0;\n --ds-font-letterSpacing-200: 0;\n --ds-font-letterSpacing-300: 0;\n --ds-font-letterSpacing-400: 0;\n --ds-font-heading-xxlarge: normal 700 2rem/2.25rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-xlarge: normal 700 1.75rem/2rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-large: normal 700 1.5rem/1.75rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-medium: normal 700 1.25rem/1.5rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-small: normal 700 1rem/1.25rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-xsmall: normal 700 0.875rem/1.25rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-xxsmall: normal 700 0.75rem/1rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-body-large: normal 400 1rem/1.5rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-body: normal 400 0.875rem/1.25rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-body-small: normal 400 0.75rem/1rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-body-UNSAFE_small: normal 400 0.75rem/1rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-code: normal 400 0.875em/1 ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace;\n --ds-font-weight-regular: 400;\n --ds-font-weight-medium: 500;\n --ds-font-weight-semibold: 600;\n --ds-font-weight-bold: 700;\n --ds-font-family-heading: \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-family-body: \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-family-code: ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace;\n --ds-font-family-monospace: ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace;\n --ds-font-family-sans: \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-family-brand-heading: \"Charlie Display\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-family-brand-body: \"Charlie Text\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n}\n";
|
|
7
7
|
export default _default;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* THIS FILE WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
|
|
3
|
-
* @codegen <<SignedSource::
|
|
3
|
+
* @codegen <<SignedSource::dce942b8ed1c06fabf9d37bbecb9cca4>>
|
|
4
4
|
* @codegenCommand yarn build tokens
|
|
5
5
|
*/
|
|
6
6
|
declare const tokens: ({
|
|
@@ -124,10 +124,17 @@ export interface ThemeState {
|
|
|
124
124
|
typography?: Extract<ThemeIds, 'typography' | 'typography-adg3' | 'typography-modernized' | 'typography-refreshed'>;
|
|
125
125
|
UNSAFE_themeOptions?: ThemeOptionsSchema;
|
|
126
126
|
}
|
|
127
|
+
/**
|
|
128
|
+
* Can't evaluate typography feature flags at the module level,
|
|
129
|
+
* it will always resolve to false when server side rendered or when flags are loaded async.
|
|
130
|
+
*/
|
|
131
|
+
interface ThemeStateDefaults extends Omit<ThemeState, 'typography'> {
|
|
132
|
+
typography: () => ThemeState['typography'];
|
|
133
|
+
}
|
|
127
134
|
/**
|
|
128
135
|
* themeStateDefaults: the default values for ThemeState used by theming utilities
|
|
129
136
|
*/
|
|
130
|
-
export declare const themeStateDefaults:
|
|
137
|
+
export declare const themeStateDefaults: ThemeStateDefaults;
|
|
131
138
|
/**
|
|
132
139
|
* Represents theme state once mounted to the page
|
|
133
140
|
* (the page doesn't have an "auto" color mode, it's either light or dark)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* THIS FILE WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
|
|
3
|
-
* @codegen <<SignedSource::
|
|
3
|
+
* @codegen <<SignedSource::909dfaa0e3366d4739e13971248bd7c0>>
|
|
4
4
|
* @codegenCommand yarn build tokens
|
|
5
5
|
*/
|
|
6
6
|
declare const tokens: ({
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* THIS FILE WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
|
|
3
|
-
* @codegen <<SignedSource::
|
|
3
|
+
* @codegen <<SignedSource::5c09e6710724a50480f98849037825eb>>
|
|
4
4
|
* @codegenCommand yarn build tokens
|
|
5
5
|
*/
|
|
6
|
-
declare const _default: "\nhtml[data-theme~=\"typography:typography-refreshed\"] {\n --ds-UNSAFE-textTransformUppercase: uppercase;\n --ds-font-letterSpacing-0: 0;\n --ds-font-letterSpacing-100: 0;\n --ds-font-letterSpacing-200: 0;\n --ds-font-letterSpacing-300: 0;\n --ds-font-letterSpacing-400: 0;\n --ds-font-heading-xxlarge: normal 700 2rem/2.25rem \"
|
|
6
|
+
declare const _default: "\nhtml[data-theme~=\"typography:typography-refreshed\"] {\n --ds-UNSAFE-textTransformUppercase: uppercase;\n --ds-font-letterSpacing-0: 0;\n --ds-font-letterSpacing-100: 0;\n --ds-font-letterSpacing-200: 0;\n --ds-font-letterSpacing-300: 0;\n --ds-font-letterSpacing-400: 0;\n --ds-font-heading-xxlarge: normal 700 2rem/2.25rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-xlarge: normal 700 1.75rem/2rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-large: normal 700 1.5rem/1.75rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-medium: normal 700 1.25rem/1.5rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-small: normal 700 1rem/1.25rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-xsmall: normal 700 0.875rem/1.25rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-heading-xxsmall: normal 700 0.75rem/1rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-body-large: normal 400 1rem/1.5rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-body: normal 400 0.875rem/1.25rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-body-small: normal 400 0.75rem/1rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-body-UNSAFE_small: normal 400 0.75rem/1rem \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-code: normal 400 0.875em/1 ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace;\n --ds-font-weight-regular: 400;\n --ds-font-weight-medium: 500;\n --ds-font-weight-semibold: 600;\n --ds-font-weight-bold: 700;\n --ds-font-family-heading: \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-family-body: \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-family-code: ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace;\n --ds-font-family-monospace: ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace;\n --ds-font-family-sans: \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-family-brand-heading: \"Charlie Display\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n --ds-font-family-brand-body: \"Charlie Text\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif;\n}\n";
|
|
7
7
|
export default _default;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* THIS FILE WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
|
|
3
|
-
* @codegen <<SignedSource::
|
|
3
|
+
* @codegen <<SignedSource::dce942b8ed1c06fabf9d37bbecb9cca4>>
|
|
4
4
|
* @codegenCommand yarn build tokens
|
|
5
5
|
*/
|
|
6
6
|
declare const tokens: ({
|
|
@@ -165,10 +165,17 @@ export interface ThemeState {
|
|
|
165
165
|
typography?: Extract<ThemeIds, 'typography' | 'typography-adg3' | 'typography-modernized' | 'typography-refreshed'>;
|
|
166
166
|
UNSAFE_themeOptions?: ThemeOptionsSchema;
|
|
167
167
|
}
|
|
168
|
+
/**
|
|
169
|
+
* Can't evaluate typography feature flags at the module level,
|
|
170
|
+
* it will always resolve to false when server side rendered or when flags are loaded async.
|
|
171
|
+
*/
|
|
172
|
+
interface ThemeStateDefaults extends Omit<ThemeState, 'typography'> {
|
|
173
|
+
typography: () => ThemeState['typography'];
|
|
174
|
+
}
|
|
168
175
|
/**
|
|
169
176
|
* themeStateDefaults: the default values for ThemeState used by theming utilities
|
|
170
177
|
*/
|
|
171
|
-
export declare const themeStateDefaults:
|
|
178
|
+
export declare const themeStateDefaults: ThemeStateDefaults;
|
|
172
179
|
/**
|
|
173
180
|
* Represents theme state once mounted to the page
|
|
174
181
|
* (the page doesn't have an "auto" color mode, it's either light or dark)
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"introduced": "1.14.0",
|
|
45
45
|
"description": "For our default product UI heading text."
|
|
46
46
|
},
|
|
47
|
-
"value": "\"
|
|
47
|
+
"value": "\"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif"
|
|
48
48
|
},
|
|
49
49
|
"Typography refreshed/font.family.body": {
|
|
50
50
|
"attributes": {
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
"introduced": "1.14.0",
|
|
54
54
|
"description": "For our default product UI body text."
|
|
55
55
|
},
|
|
56
|
-
"value": "\"
|
|
56
|
+
"value": "\"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif"
|
|
57
57
|
},
|
|
58
58
|
"Typography refreshed/font.family.code": {
|
|
59
59
|
"attributes": {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/tokens",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.3.0",
|
|
4
4
|
"description": "Design tokens are the single source of truth to name and store design decisions.",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"codegen-tokens": "run-ts ./scripts/style-dictionary/build.tsx && cd $(npx repo-root)/packages/design-system/primitives && yarn codegen-styles && cd $(npx repo-root)/packages/design-system/ds-explorations && yarn codegen-styles && cd $(npx repo-root)/packages/design-system/heading && yarn codegen"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@atlaskit/ds-lib": "^3.
|
|
34
|
+
"@atlaskit/ds-lib": "^3.2.0",
|
|
35
35
|
"@atlaskit/platform-feature-flags": "^0.3.0",
|
|
36
36
|
"@babel/runtime": "^7.0.0",
|
|
37
37
|
"@babel/traverse": "^7.23.2",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"@atlaskit/checkbox": "^15.1.0",
|
|
50
50
|
"@atlaskit/radio": "^6.5.0",
|
|
51
51
|
"@atlaskit/textfield": "^6.5.0",
|
|
52
|
-
"@atlaskit/tooltip": "^18.
|
|
52
|
+
"@atlaskit/tooltip": "^18.9.0",
|
|
53
53
|
"@atlaskit/visual-regression": "*",
|
|
54
54
|
"@atlassian/codegen": "^0.1.0",
|
|
55
55
|
"@atlassian/feature-flags-test-utils": "*",
|
|
@@ -130,6 +130,9 @@
|
|
|
130
130
|
},
|
|
131
131
|
"platform-component-visual-refresh": {
|
|
132
132
|
"type": "boolean"
|
|
133
|
+
},
|
|
134
|
+
"platform-default-typography-modernized": {
|
|
135
|
+
"type": "boolean"
|
|
133
136
|
}
|
|
134
137
|
},
|
|
135
138
|
"homepage": "https://atlassian.design/components/tokens"
|