From 417ff2ad07bfd4a1d4c43b243c621fe5b77eb327 Mon Sep 17 00:00:00 2001 From: Adam Argyle Date: Fri, 10 Mar 2023 21:16:38 -0800 Subject: [PATCH 01/31] fixes #353 --- src/extra/normalize.src.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/extra/normalize.src.css b/src/extra/normalize.src.css index d54eb40f..833ba5cd 100644 --- a/src/extra/normalize.src.css +++ b/src/extra/normalize.src.css @@ -156,12 +156,14 @@ white-space: pre; min-inline-size: 0; max-inline-size: max-content; + writing-mode: lr; } :where(:not(pre) > code) { padding: var(--size-1) var(--size-2); background: var(--surface-2); border-radius: var(--radius-2); + writing-mode: lr; } :where(kbd, var) { From 58a52be43251681e23678d4b93df898a569b51d3 Mon Sep 17 00:00:00 2001 From: Adam Argyle Date: Fri, 10 Mar 2023 21:21:04 -0800 Subject: [PATCH 02/31] cut 1.5.6 with normalize update --- docsite/index.html | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docsite/index.html b/docsite/index.html index 150ef1ef..c9de9043 100644 --- a/docsite/index.html +++ b/docsite/index.html @@ -119,7 +119,7 @@

CSS variables.

- v1.5.5 + v1.5.6
Angles
NPM
+
+
Showcase
+
Color helper
+
+
Connect
GitHub
From ba817552ffad62642e7a6bd9ff446aad8da78fc5 Mon Sep 17 00:00:00 2001 From: Paulo Nunes Date: Thu, 30 Mar 2023 16:42:14 +0100 Subject: [PATCH 04/31] op-logo-svg-fix (#359) align line-stem to inner circle --- docsite/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docsite/index.html b/docsite/index.html index 62fc9bdc..4ffbf476 100644 --- a/docsite/index.html +++ b/docsite/index.html @@ -51,7 +51,7 @@
From f7fe070f988284eeaa55786018db43b404e196ed Mon Sep 17 00:00:00 2001 From: Adam Argyle Date: Wed, 19 Apr 2023 09:52:12 -0700 Subject: [PATCH 08/31] bug fix for bright oklch color --- docsite/index.html | 2 +- package.json | 2 +- src/props.colors-oklch.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docsite/index.html b/docsite/index.html index d69b3bdd..3b912b91 100644 --- a/docsite/index.html +++ b/docsite/index.html @@ -119,7 +119,7 @@

CSS variables.

- v1.5.7 + v1.5.8 RAD - + +
+
ease-spring-1
+
ease-spring-2
+
ease-spring-3
+
ease-spring-4
+
ease-spring-5
+
+ +
Ease Steps
diff --git a/docsite/package-lock.json b/docsite/package-lock.json index b747f49f..bc00f552 100644 --- a/docsite/package-lock.json +++ b/docsite/package-lock.json @@ -101,9 +101,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001431", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz", - "integrity": "sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==", + "version": "1.0.30001519", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz", + "integrity": "sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==", "dev": true, "funding": [ { @@ -113,6 +113,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ] }, @@ -1864,9 +1868,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001431", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz", - "integrity": "sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==", + "version": "1.0.30001519", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz", + "integrity": "sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==", "dev": true }, "chalk": { diff --git a/package-lock.json b/package-lock.json index 695339f6..c985b577 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "open-props", - "version": "1.5.4", + "version": "1.5.10", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "open-props", - "version": "1.5.4", + "version": "1.5.10", "license": "MIT", "devDependencies": { "ava": "^3.15.0", @@ -846,9 +846,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001431", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz", - "integrity": "sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==", + "version": "1.0.30001519", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz", + "integrity": "sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==", "dev": true, "funding": [ { @@ -858,6 +858,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ] }, @@ -6947,9 +6951,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001431", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz", - "integrity": "sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==", + "version": "1.0.30001519", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz", + "integrity": "sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==", "dev": true }, "chalk": { diff --git a/package.json b/package.json index 3ecdfe50..cbed6011 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "name": "open-props", "author": "Adam Argyle", "license": "MIT", - "version": "1.5.10", + "version": "1.5.11", "repository": { "type": "git", "url": "https://github.com/argyleink/open-props" diff --git a/src/props.colors-oklch.css b/src/props.colors-oklch.css index a949d0d3..83c533de 100644 --- a/src/props.colors-oklch.css +++ b/src/props.colors-oklch.css @@ -15,5 +15,5 @@ --color-13: oklch(20% .09 var(--color-hue, 0)); --color-14: oklch(14% .07 var(--color-hue, 0)); --color-15: oklch(11% .05 var(--color-hue, 0)); - --color-bright: oklch(65% .3 var(--color-hue)); + --color-bright: oklch(65% .3 var(--color-hue, 0)); } diff --git a/src/props.easing.css b/src/props.easing.css index b855d8e8..d316ed25 100644 --- a/src/props.easing.css +++ b/src/props.easing.css @@ -34,4 +34,32 @@ --ease-step-3: steps(4); --ease-step-4: steps(7); --ease-step-5: steps(10); + --ease-spring-1: linear( + 0, 0.006, 0.025 2.8%, 0.101 6.1%, 0.539 18.9%, 0.721 25.3%, 0.849 31.5%, + 0.937 38.1%, 0.968 41.8%, 0.991 45.7%, 1.006 50.1%, 1.015 55%, 1.017 63.9%, + 1.001 + ); + --ease-spring-2: linear( + 0, 0.007, 0.029 2.2%, 0.118 4.7%, 0.625 14.4%, 0.826 19%, 0.902, 0.962, + 1.008 26.1%, 1.041 28.7%, 1.064 32.1%, 1.07 36%, 1.061 40.5%, 1.015 53.4%, + 0.999 61.6%, 0.995 71.2%, 1 + ); + --ease-spring-3: linear( + 0, 0.009, 0.035 2.1%, 0.141 4.4%, 0.723 12.9%, 0.938 16.7%, 1.017, 1.077, + 1.121, 1.149 24.3%, 1.159, 1.163, 1.161, 1.154 29.9%, 1.129 32.8%, + 1.051 39.6%, 1.017 43.1%, 0.991, 0.977 51%, 0.974 53.8%, 0.975 57.1%, + 0.997 69.8%, 1.003 76.9%, 1 + ); + --ease-spring-4: linear( + 0, 0.009, 0.037 1.7%, 0.153 3.6%, 0.776 10.3%, 1.001, 1.142 16%, 1.185, + 1.209 19%, 1.215 19.9% 20.8%, 1.199, 1.165 25%, 1.056 30.3%, 1.008 33%, 0.973, + 0.955 39.2%, 0.953 41.1%, 0.957 43.3%, 0.998 53.3%, 1.009 59.1% 63.7%, + 0.998 78.9%, 1 + ); + --ease-spring-5: linear( + 0, 0.01, 0.04 1.6%, 0.161 3.3%, 0.816 9.4%, 1.046, 1.189 14.4%, 1.231, + 1.254 17%, 1.259, 1.257 18.6%, 1.236, 1.194 22.3%, 1.057 27%, 0.999 29.4%, + 0.955 32.1%, 0.942, 0.935 34.9%, 0.933, 0.939 38.4%, 1 47.3%, 1.011, + 1.017 52.6%, 1.016 56.4%, 1 65.2%, 0.996 70.2%, 1.001 87.2%, 1 + ); } diff --git a/src/props.easing.js b/src/props.easing.js index d9fe72e8..56d3b80d 100644 --- a/src/props.easing.js +++ b/src/props.easing.js @@ -40,4 +40,33 @@ export default { '--ease-step-3': 'steps(4)', '--ease-step-4': 'steps(7)', '--ease-step-5': 'steps(10)', + + '--ease-spring-1': `linear( + 0, 0.006, 0.025 2.8%, 0.101 6.1%, 0.539 18.9%, 0.721 25.3%, 0.849 31.5%, + 0.937 38.1%, 0.968 41.8%, 0.991 45.7%, 1.006 50.1%, 1.015 55%, 1.017 63.9%, + 1.001 + )`, + '--ease-spring-2': `linear( + 0, 0.007, 0.029 2.2%, 0.118 4.7%, 0.625 14.4%, 0.826 19%, 0.902, 0.962, + 1.008 26.1%, 1.041 28.7%, 1.064 32.1%, 1.07 36%, 1.061 40.5%, 1.015 53.4%, + 0.999 61.6%, 0.995 71.2%, 1 + )`, + '--ease-spring-3': `linear( + 0, 0.009, 0.035 2.1%, 0.141 4.4%, 0.723 12.9%, 0.938 16.7%, 1.017, 1.077, + 1.121, 1.149 24.3%, 1.159, 1.163, 1.161, 1.154 29.9%, 1.129 32.8%, + 1.051 39.6%, 1.017 43.1%, 0.991, 0.977 51%, 0.974 53.8%, 0.975 57.1%, + 0.997 69.8%, 1.003 76.9%, 1 + )`, + '--ease-spring-4': `linear( + 0, 0.009, 0.037 1.7%, 0.153 3.6%, 0.776 10.3%, 1.001, 1.142 16%, 1.185, + 1.209 19%, 1.215 19.9% 20.8%, 1.199, 1.165 25%, 1.056 30.3%, 1.008 33%, 0.973, + 0.955 39.2%, 0.953 41.1%, 0.957 43.3%, 0.998 53.3%, 1.009 59.1% 63.7%, + 0.998 78.9%, 1 + )`, + '--ease-spring-5': `linear( + 0, 0.01, 0.04 1.6%, 0.161 3.3%, 0.816 9.4%, 1.046, 1.189 14.4%, 1.231, + 1.254 17%, 1.259, 1.257 18.6%, 1.236, 1.194 22.3%, 1.057 27%, 0.999 29.4%, + 0.955 32.1%, 0.942, 0.935 34.9%, 0.933, 0.939 38.4%, 1 47.3%, 1.011, + 1.017 52.6%, 1.016 56.4%, 1 65.2%, 0.996 70.2%, 1.001 87.2%, 1 + )`, } diff --git a/test/basic.test.cjs b/test/basic.test.cjs index 13e20ea3..3b9d1536 100644 --- a/test/basic.test.cjs +++ b/test/basic.test.cjs @@ -4,7 +4,7 @@ const OpenProps = require('../dist/open-props.cjs') const OPtokens = require('../open-props.tokens.json') test('Should have an all included import', t => { - t.is(Object.keys(OpenProps).length, 1600) + t.is(Object.keys(OpenProps).length, 1610) }) test('Import should have animations', async t => { @@ -24,7 +24,7 @@ test('Import should have colors', async t => { }) test('JSON Import should have colors', async t => { - t.is(Object.keys(OPtokens).length, 414) + t.is(Object.keys(OPtokens).length, 419) t.assert(Object.keys(OPtokens).includes('--orange-0')) }) From 327a70f82aa3aa6c553138ffd1572b3c4fd0ab18 Mon Sep 17 00:00:00 2001 From: Adam Argyle Date: Thu, 17 Aug 2023 21:14:04 -0700 Subject: [PATCH 21/31] fixes #392 --- build/to-figmatokens.js | 24 ++++++++++++------------ build/to-tokens.js | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build/to-figmatokens.js b/build/to-figmatokens.js index 85c63503..a5294284 100644 --- a/build/to-figmatokens.js +++ b/build/to-figmatokens.js @@ -15,25 +15,25 @@ export const toFigmaTokens = props => { .map(hueName => hueName.toLowerCase()) let isColor = colors.some(color => key.includes(color)) - if (isLength) meta.type = 'sizing' - else if (isBorder) meta.type = 'borderWidth' - else if (isRadius) meta.type = 'borderRadius' - else if (isShadow) meta.type = 'boxShadow' - else if (isColor) meta.type = 'color' - else meta.type = 'other' + if (isLength) meta.$type = 'sizing' + else if (isBorder) meta.$type = 'borderWidth' + else if (isRadius) meta.$type = 'borderRadius' + else if (isShadow) meta.$type = 'boxShadow' + else if (isColor) meta.$type = 'color' + else meta.$type = 'other' - if (!(meta.type in figmatokens)) figmatokens[meta.type] = {} + if (!(meta.$type in figmatokens)) figmatokens[meta.$type] = {} if (isColor) { let color = /--(.+?)-/.exec(key)[1] - if (!(color in figmatokens[meta.type])) figmatokens[meta.type][color] = {} - figmatokens[meta.type][color][key] = { - value: token, + if (!(color in figmatokens[meta.$type])) figmatokens[meta.$type][color] = {} + figmatokens[meta.$type][color][key] = { + $value: token, ...meta, } } else { - figmatokens[meta.type][key] = { - value: token, + figmatokens[meta.$type][key] = { + $value: token, ...meta, } } diff --git a/build/to-tokens.js b/build/to-tokens.js index 1102752d..65a5a1d7 100644 --- a/build/to-tokens.js +++ b/build/to-tokens.js @@ -11,12 +11,12 @@ export const toTokens = props => .map(hueName => hueName.toLowerCase()) let isColor = colors.some(color => key.includes(color)) - if (isLength) meta.type = 'dimension' - else if (isEasing) meta.type = 'cubic-bezier' - else if (isColor) meta.type = 'color' + if (isLength) meta.$type = 'dimension' + else if (isEasing) meta.$type = 'cubic-bezier' + else if (isColor) meta.$type = 'color' return [key, { - value: token, + $value: token, ...meta, }] }) \ No newline at end of file From 02b5618fa7ce653f65ce8859208aa98045f297ef Mon Sep 17 00:00:00 2001 From: Adam Argyle Date: Thu, 17 Aug 2023 21:14:24 -0700 Subject: [PATCH 22/31] =?UTF-8?q?=E2=9C=82=EF=B8=8F=20v1.5.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docsite/index.html | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docsite/index.html b/docsite/index.html index 54b6088b..c605cce6 100644 --- a/docsite/index.html +++ b/docsite/index.html @@ -119,7 +119,7 @@

CSS variables.

- v1.5.11 + v1.5.12

CSS variables.

- v1.5.12 + v1.5.13 styles in normalize --- docsite/index.html | 2 +- package.json | 2 +- src/extra/normalize.src.css | 75 +++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 2 deletions(-) diff --git a/docsite/index.html b/docsite/index.html index 136e6d4d..854f18b2 100644 --- a/docsite/index.html +++ b/docsite/index.html @@ -119,7 +119,7 @@

CSS variables.

- v1.5.13 + v1.5.14

CSS variables.

- v1.5.14 + v1.5.15

CSS variables.

- v1.5.15 + v1.5.16