Skip to content

Commit d979429

Browse files
committed
Merge branch 'develop' into filter-scale-tuples
2 parents 7f39af3 + e0de3a0 commit d979429

File tree

42 files changed

+86
-42
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+86
-42
lines changed

packages/color-modes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@theme-ui/color-modes",
3-
"version": "0.16.2-scale-tuples.0",
3+
"version": "0.16.2-develop.2",
44
"main": "dist/theme-ui-color-modes.cjs.js",
55
"module": "dist/theme-ui-color-modes.esm.js",
66
"types": "dist/theme-ui-color-modes.cjs.d.ts",

packages/color/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@theme-ui/color",
3-
"version": "0.16.2-scale-tuples.0",
3+
"version": "0.16.2-develop.2",
44
"source": "src/index.ts",
55
"main": "dist/theme-ui-color.cjs.js",
66
"module": "dist/theme-ui-color.esm.js",

packages/components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@theme-ui/components",
3-
"version": "0.16.2-scale-tuples.0",
3+
"version": "0.16.2-develop.2",
44
"main": "dist/theme-ui-components.cjs.js",
55
"module": "dist/theme-ui-components.esm.js",
66
"types": "dist/theme-ui-components.cjs.d.ts",

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@theme-ui/core",
3-
"version": "0.16.2-scale-tuples.0",
3+
"version": "0.16.2-develop.2",
44
"source": "src/index.ts",
55
"main": "dist/theme-ui-core.cjs.js",
66
"module": "dist/theme-ui-core.esm.js",

packages/css/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@theme-ui/css",
3-
"version": "0.16.2-scale-tuples.0",
3+
"version": "0.16.2-develop.2",
44
"source": "src/index.ts",
55
"main": "dist/theme-ui-css.cjs.js",
66
"module": "dist/theme-ui-css.esm.js",

packages/css/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ export const multiples = {
112112
export const scales = {
113113
color: 'colors',
114114
background: 'colors',
115+
accentColor: 'colors',
115116
backgroundColor: 'colors',
116117
borderColor: 'colors',
117118
caretColor: 'colors',

packages/css/test/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,16 +577,18 @@ test('flexBasis uses theme.sizes', () => {
577577
})
578578
})
579579

580-
test('fill and stroke and caretColor use theme.colors', () => {
580+
test('fill, stroke, caretColor, and accentColor use theme.colors', () => {
581581
const style = css({
582582
fill: 'primary',
583583
stroke: 'secondary',
584584
caretColor: 'primary',
585+
accentColor: 'secondary',
585586
})(theme)
586587
expect(style).toEqual({
587588
fill: 'tomato',
588589
stroke: 'cyan',
589590
caretColor: 'tomato',
591+
accentColor: 'cyan',
590592
})
591593
})
592594

packages/custom-properties/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@theme-ui/custom-properties",
33
"description": "Generate CSS custom properties for use with Theme UI",
4-
"version": "0.16.2-scale-tuples.0",
4+
"version": "0.16.2-develop.2",
55
"source": "src/index.ts",
66
"main": "dist/theme-ui-custom-properties.cjs.js",
77
"module": "dist/theme-ui-custom-properties.esm.js",

packages/docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"name": "docs",
4-
"version": "0.16.2-scale-tuples.0",
4+
"version": "0.16.2-develop.2",
55
"main": "dist/docs.cjs.js",
66
"author": "Brent Jackson <[email protected]>",
77
"license": "MIT",

packages/docs/src/pages/guides/jsx-pragma.mdx

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)