Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Regression: Add button-icon-disabled-color to the palette #27522

Merged
merged 5 commits into from
Dec 13, 2022
Merged

Regression: Add button-icon-disabled-color to the palette #27522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5e374a4
add button-icon-disabled-color to the palette
juliajforesti Dec 12, 2022
36a5eed
Bump Fuselage next
ggazzo Dec 13, 2022
b69eb20
Merge branch 'develop' into fix/sidebar-iconButton-disabled
ggazzo Dec 13, 2022
411e74a
undo message-parser
ggazzo Dec 13, 2022
d5fcd5e
Merge branch 'fix/sidebar-iconButton-disabled' of github.com:RocketCh…
ggazzo Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ee/packages/ui-theming/src/sidebarPalette.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ export const palette = [
description: 'Font',
list: [
{ name: 'button-font-on-secondary', token: 'N400', color: '#9EA2A8' },
{ name: 'button-font-on-disabled', token: '', color: '#6c727a' },
{ name: 'button-font-on-secondary-disabled', token: '', color: '#6C727A' },
{ name: 'button-icon-disabled-color', token: '', color: '#6C727A' },
],
},
];
Expand Down
5 changes: 3 additions & 2 deletions ee/packages/ui-theming/src/sidebarPaletteDark.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,9 @@ export const palette = [
{
description: 'Font',
list: [
{ name: 'button-font-on-secondary', token: 'N400', color: '#6c727a' },
{ name: 'button-font-on-disabled', token: '', color: '#9EA2A8' },
{ name: 'button-font-on-secondary', token: '', color: '#9EA2A8' },
{ name: 'button-font-on-secondary-disabled', token: '', color: '#6C727A' },
{ name: 'button-icon-disabled-color', token: '', color: '#6C727A' },
],
},
];
Expand Down
154 changes: 77 additions & 77 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6423,25 +6423,25 @@ __metadata:
languageName: unknown
linkType: soft

"@rocket.chat/css-in-js@npm:next, @rocket.chat/css-in-js@npm:~0.31.23-dev.6":
version: 0.31.23-dev.6
resolution: "@rocket.chat/css-in-js@npm:0.31.23-dev.6"
"@rocket.chat/css-in-js@npm:next, @rocket.chat/css-in-js@npm:~0.31.23-dev.9":
version: 0.31.23-dev.9
resolution: "@rocket.chat/css-in-js@npm:0.31.23-dev.9"
dependencies:
"@emotion/hash": ^0.9.0
"@rocket.chat/css-supports": ~0.31.23-dev.6
"@rocket.chat/memo": ~0.31.23-dev.6
"@rocket.chat/stylis-logical-props-middleware": ~0.31.23-dev.6
"@rocket.chat/css-supports": ~0.31.23-dev.9
"@rocket.chat/memo": ~0.31.23-dev.9
"@rocket.chat/stylis-logical-props-middleware": ~0.31.23-dev.9
stylis: ~4.1.3
checksum: fbebc76f0451895d40366f0a7aee11309446ca1d2c7844df85b88899e565c157f66d57415b7262d901f69659ce90fbc75ff9286775f26067df3be6de5a0b5b77
checksum: 83249a59344ba14f10cefeca6d956bd8c4770450db38ad12682680244d5da5f602431439856b6c407b6448f8b8d26f2e08135ccc63c9c7d1f34d446e640f39af
languageName: node
linkType: hard

"@rocket.chat/css-supports@npm:~0.31.23-dev.6":
version: 0.31.23-dev.6
resolution: "@rocket.chat/css-supports@npm:0.31.23-dev.6"
"@rocket.chat/css-supports@npm:~0.31.23-dev.9":
version: 0.31.23-dev.9
resolution: "@rocket.chat/css-supports@npm:0.31.23-dev.9"
dependencies:
"@rocket.chat/memo": ~0.31.23-dev.6
checksum: 87e44faa6fd5b359f3ed3887841b27e1d202afd9d711aa017c47487398ba81796946a34a1d7526fb1d68408fa42d6cc0b13a381c8fc5ca72eedc990511aa3cd1
"@rocket.chat/memo": ~0.31.23-dev.9
checksum: 7fd894043af62f57c1baf4afcc4a13945ed5c5db273a0375eb8b441e8f0cdf1b07c217f17ba730030c0ffa12d5c6e3bab8d1f316a6d13ee8b0b9563a83081db3
languageName: node
linkType: hard

Expand Down Expand Up @@ -6487,9 +6487,9 @@ __metadata:
linkType: soft

"@rocket.chat/emitter@npm:next":
version: 0.31.23-dev.6
resolution: "@rocket.chat/emitter@npm:0.31.23-dev.6"
checksum: ffb3a8371a74c7562a1c019138b6e7e92c65ef01871c0ca041cdb3ecec54a3f61c097352f34cf89afa28830fb5ec723b9c544ef36e404bc91630d23a50df1adf
version: 0.31.23-dev.9
resolution: "@rocket.chat/emitter@npm:0.31.23-dev.9"
checksum: d098b3d7534eae6643a1ee476858a7298cbf194a4eaa43ebaba70129acfab2175429c2ddbd58a20345486f90aafff622d9c01574e94aaad055884d4cf7eaf0f1
languageName: node
linkType: hard

Expand Down Expand Up @@ -6580,58 +6580,58 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/fuselage-hooks@npm:next, @rocket.chat/fuselage-hooks@npm:~0.32.0-dev.145":
version: 0.32.0-dev.145
resolution: "@rocket.chat/fuselage-hooks@npm:0.32.0-dev.145"
"@rocket.chat/fuselage-hooks@npm:next, @rocket.chat/fuselage-hooks@npm:~0.32.0-dev.148":
version: 0.32.0-dev.148
resolution: "@rocket.chat/fuselage-hooks@npm:0.32.0-dev.148"
dependencies:
use-sync-external-store: ~1.2.0
peerDependencies:
"@rocket.chat/fuselage-tokens": "*"
react: ^17.0.2
checksum: 33b8bcd128f5aa9fea0bf6c5e7012a1bd17d626ccab81b3e41fbac0afba8f38a7425e13cee49a827cf8b49ffb26b28eaceaa80a027a0618619dd491db4dcf102
checksum: 3e91edd5a3540c2f3cabd2228a8a6afcc5f9a9c88119e06757ce9dcd2e426879da7a90ac7b1824673a24897732e1c29ffc30d3f3e0cfbadf45d2c7d30fae4687
languageName: node
linkType: hard

"@rocket.chat/fuselage-polyfills@npm:next":
version: 0.31.23-dev.6
resolution: "@rocket.chat/fuselage-polyfills@npm:0.31.23-dev.6"
version: 0.31.23-dev.9
resolution: "@rocket.chat/fuselage-polyfills@npm:0.31.23-dev.9"
dependencies:
"@juggle/resize-observer": ^3.4.0
clipboard-polyfill: ^3.0.3
element-closest-polyfill: ^1.0.5
focus-visible: ^5.2.0
focus-within-polyfill: ^5.2.1
new-event-polyfill: ^1.0.1
checksum: a3d673aec804a0bfbd440eff945eb15a5e675d52eb6fe5bcc4f7342980220db3fa7bdca0213ae10df33db77b2b80398d605c6d53612306572eb7cb462bd7674c
checksum: 3a5e468aed1bf2da5839b11c5dc417b28769b244109026903a795f7dcadcf7d238d09c02daa01c1f57a31b42178968b2d06279adaabb859daae3a5e8cfe7b687
languageName: node
linkType: hard

"@rocket.chat/fuselage-toastbar@npm:next":
version: 0.32.0-dev.206
resolution: "@rocket.chat/fuselage-toastbar@npm:0.32.0-dev.206"
version: 0.32.0-dev.209
resolution: "@rocket.chat/fuselage-toastbar@npm:0.32.0-dev.209"
peerDependencies:
"@rocket.chat/fuselage": "*"
"@rocket.chat/fuselage-hooks": "*"
"@rocket.chat/fuselage-polyfills": "*"
"@rocket.chat/styled": "*"
react: ^17.0.2
react-dom: ^17.0.2
checksum: 9f81888f4466fc789d9eec72918d1b6397642b45f829c537130fb92b98cef18509d9cf143f4f2cf4ca3886d9450d58b9097f65546c843d22eeda2da1f6d7ff32
checksum: 115629675ddb0ccefff6e3648917e2468ae5c7a851ce7f26e472b4f995c68975465e0e7a38fd3076456098c8dc8466d8a4d71f84aab70091a167443e16065a04
languageName: node
linkType: hard

"@rocket.chat/fuselage-tokens@npm:next, @rocket.chat/fuselage-tokens@npm:~0.32.0-dev.182":
version: 0.32.0-dev.182
resolution: "@rocket.chat/fuselage-tokens@npm:0.32.0-dev.182"
checksum: 4d123147612456556a7f40f38c4149500a17b2dcd8349ec2d42c8ad859c3eb7fea7f23e601455ed15917e0f26e25e7398f31d0ab04db7b5c430b35bdef9ef352
"@rocket.chat/fuselage-tokens@npm:next, @rocket.chat/fuselage-tokens@npm:~0.32.0-dev.185":
version: 0.32.0-dev.185
resolution: "@rocket.chat/fuselage-tokens@npm:0.32.0-dev.185"
checksum: b02a919625de7453107e4ddd5eabcb03da75c67d05b9ae9325156cd7e8ef4fe03c2fa196b018cfb333d977254a2799ab7095eabb3b0b2e950194d66aa7e0c276
languageName: node
linkType: hard

"@rocket.chat/fuselage-ui-kit@npm:next":
version: 0.32.0-dev.182
resolution: "@rocket.chat/fuselage-ui-kit@npm:0.32.0-dev.182"
version: 0.32.0-dev.185
resolution: "@rocket.chat/fuselage-ui-kit@npm:0.32.0-dev.185"
dependencies:
"@rocket.chat/ui-kit": ~0.32.0-dev.167
"@rocket.chat/ui-kit": ~0.32.0-dev.170
tslib: ^2.3.1
peerDependencies:
"@rocket.chat/fuselage": "*"
Expand All @@ -6641,7 +6641,7 @@ __metadata:
"@rocket.chat/styled": "*"
react: ^17.0.2
react-dom: ^17.0.2
checksum: 3e95980e1a1c311a2d3643c2f04f0d753161df63cb663044f8aec2751ae409a27daeb9d0c88c19befdcc78738b925b78300e15cade4df55f1290662694a283a5
checksum: bef3852a3adc48a4420d0790720ecb859ce781a5bd3786a3310296807550911b3a517fb2c65fe924a466f4e97b9c2bf9acc9494aa3c2d7f48e481a2aee6fa3eb
languageName: node
linkType: hard

Expand Down Expand Up @@ -6701,14 +6701,14 @@ __metadata:
linkType: soft

"@rocket.chat/fuselage@npm:next":
version: 0.32.0-dev.232
resolution: "@rocket.chat/fuselage@npm:0.32.0-dev.232"
dependencies:
"@rocket.chat/css-in-js": ~0.31.23-dev.6
"@rocket.chat/css-supports": ~0.31.23-dev.6
"@rocket.chat/fuselage-tokens": ~0.32.0-dev.182
"@rocket.chat/memo": ~0.31.23-dev.6
"@rocket.chat/styled": ~0.31.23-dev.6
version: 0.32.0-dev.235
resolution: "@rocket.chat/fuselage@npm:0.32.0-dev.235"
dependencies:
"@rocket.chat/css-in-js": ~0.31.23-dev.9
"@rocket.chat/css-supports": ~0.31.23-dev.9
"@rocket.chat/fuselage-tokens": ~0.32.0-dev.185
"@rocket.chat/memo": ~0.31.23-dev.9
"@rocket.chat/styled": ~0.31.23-dev.9
invariant: ^2.2.4
react-aria: ~3.19.0
react-keyed-flatten-children: ^1.3.0
Expand All @@ -6720,7 +6720,7 @@ __metadata:
react: ^17.0.2
react-dom: ^17.0.2
react-virtuoso: 1.2.4
checksum: c772acd43a7a4ec907ce3d475556fd2653b7e278aed10029b1f9ec39b4c7cc6d4742ace40ea21191c2299b54884d84ebff4ee84d18f317899229b2a6cd1eed17
checksum: 49fbcbb25aa1de436b63051f0c2a1a16e9e5c22d3e917a8cf07f6c7d6c762bc9a9567f2c9e410666c07c2cc4bb276fa3b1080798d39199d596ea67d3c6128496
languageName: node
linkType: hard

Expand Down Expand Up @@ -6786,21 +6786,21 @@ __metadata:
linkType: soft

"@rocket.chat/icons@npm:next":
version: 0.32.0-dev.214
resolution: "@rocket.chat/icons@npm:0.32.0-dev.214"
checksum: 7934602193c11c762b2a73b24839615a18bb3006dcc9b874c887c310f0ec7531ee9000aed23ca8e539fd9df7bf2aba43f58e9049bf7dcb8b5ef9b46f5e5d7e49
version: 0.32.0-dev.217
resolution: "@rocket.chat/icons@npm:0.32.0-dev.217"
checksum: 6caf383ac84ea4178c220bfe6a909390d3fe6a197bbc8688a4903fcbb4483fca2e7c51fba2bf68dfd6166dfca13eb2a4b6aac29418a4b68aea9e4faa6c16d946
languageName: node
linkType: hard

"@rocket.chat/layout@npm:next":
version: 0.32.0-dev.102
resolution: "@rocket.chat/layout@npm:0.32.0-dev.102"
version: 0.32.0-dev.118
resolution: "@rocket.chat/layout@npm:0.32.0-dev.118"
peerDependencies:
"@rocket.chat/fuselage": "*"
react: 17.0.2
react-dom: 17.0.2
react-i18next: ~11.15.4
checksum: ded739fadfac1fae89060d5b4b13cd4057683f7737b39be8146f63f554bbd81d7b6406c5b40b8439c592a45d8c08bbc1cdd37d1cde0652f468a20a85ede3b20b
checksum: 0cee3683ce5bca3792347b9c9527cf850df2c530947ee89ac293def1c239e577bac8f40805e9c58612713c9992dc976c1a871adbb6acff9b18360569672d409f
languageName: node
linkType: hard

Expand Down Expand Up @@ -6888,23 +6888,23 @@ __metadata:
linkType: soft

"@rocket.chat/logo@npm:next":
version: 0.32.0-dev.182
resolution: "@rocket.chat/logo@npm:0.32.0-dev.182"
version: 0.32.0-dev.185
resolution: "@rocket.chat/logo@npm:0.32.0-dev.185"
dependencies:
"@rocket.chat/fuselage-hooks": ~0.32.0-dev.145
"@rocket.chat/styled": ~0.31.23-dev.6
"@rocket.chat/fuselage-hooks": ~0.32.0-dev.148
"@rocket.chat/styled": ~0.31.23-dev.9
tslib: ^2.3.1
peerDependencies:
react: 17.0.2
react-dom: 17.0.2
checksum: d8defeec19e551b7594956a0d593574f9888f273a670d13445e0b4a77c15c8616b2f368d21e77a35d82712132871fd0278c4541f63640d86c4cd43ffe7230514
checksum: 87dae22c338d49ea24fd2f975505c13b99095bc91dee1c82308e179b5852c776e2e9700217d0b935627b492033943edce6f068bc28800886cc114dedcd5b3b3f
languageName: node
linkType: hard

"@rocket.chat/memo@npm:next, @rocket.chat/memo@npm:~0.31.23-dev.6":
version: 0.31.23-dev.6
resolution: "@rocket.chat/memo@npm:0.31.23-dev.6"
checksum: 377eec38e5e2e147332d93a92a6b8c073e3bfead3da82b2aafdc1e41bca4cc8f6904a6c33b5853895dba73fa0ca1d3851452cc1a5b168d7f4d8fcc2c3dc68178
"@rocket.chat/memo@npm:next, @rocket.chat/memo@npm:~0.31.23-dev.9":
version: 0.31.23-dev.9
resolution: "@rocket.chat/memo@npm:0.31.23-dev.9"
checksum: 4fc8f0ab10838f52890acb6fc43165fc2297dd381892181c2368886b4c12b1c5cc96db8ea11eb66c97460ba37d218975ae59b0bca763e11448bd04b8aa3c9e22
languageName: node
linkType: hard

Expand Down Expand Up @@ -7290,8 +7290,8 @@ __metadata:
linkType: hard

"@rocket.chat/onboarding-ui@npm:next":
version: 0.32.0-dev.232
resolution: "@rocket.chat/onboarding-ui@npm:0.32.0-dev.232"
version: 0.32.0-dev.235
resolution: "@rocket.chat/onboarding-ui@npm:0.32.0-dev.235"
dependencies:
i18next: ~21.6.16
react-hook-form: ~7.27.1
Expand All @@ -7307,7 +7307,7 @@ __metadata:
react: 17.0.2
react-dom: 17.0.2
react-i18next: ~11.15.4
checksum: 154421847ddf51f263050b22c82b9e8e100eb6365c637f5173c4fc7fc16b8fffdc544d3cce109714a75037785be544605210182ae08643868e033ce934ac8357
checksum: f14ac011287e21b708d9b805bc23b2817f3337d0588d815358d5a8dface56b4bbd5f54dca05a7e39e7bcc9387153fe4346499557e4d17b7be71934047c0bba00
languageName: node
linkType: hard

Expand Down Expand Up @@ -7444,33 +7444,33 @@ __metadata:
linkType: soft

"@rocket.chat/string-helpers@npm:next":
version: 0.31.23-dev.6
resolution: "@rocket.chat/string-helpers@npm:0.31.23-dev.6"
version: 0.31.23-dev.9
resolution: "@rocket.chat/string-helpers@npm:0.31.23-dev.9"
dependencies:
tslib: ^2.3.1
checksum: ab06bf352eda8b8f0dd37b9f7fbb8c96cb5ac217c8fd0126d30467ec4ace79258b3b54fdbc9ea831b2df9c9de0896e1b511b0c3a95bcc43e1ae33a29fb052364
checksum: f8045f67deac4bc45551b0ec69498d1400cc7f6d02df91814fa1fc159208051e412fba638647bc5fc2723bd3386653dffd710646fca1ef7967101b89f8ce2e4a
languageName: node
linkType: hard

"@rocket.chat/styled@npm:next, @rocket.chat/styled@npm:~0.31.23-dev.6":
version: 0.31.23-dev.6
resolution: "@rocket.chat/styled@npm:0.31.23-dev.6"
"@rocket.chat/styled@npm:next, @rocket.chat/styled@npm:~0.31.23-dev.9":
version: 0.31.23-dev.9
resolution: "@rocket.chat/styled@npm:0.31.23-dev.9"
dependencies:
"@rocket.chat/css-in-js": ~0.31.23-dev.6
"@rocket.chat/css-in-js": ~0.31.23-dev.9
tslib: ^2.3.1
checksum: 8c441e74919d31532eb4c19263d326c0c7df8e443f56d605752093442d1935292281121f350ef25048d7fb00890e4d456505d94601087a23a4f70fd8ed024357
checksum: 7c6d571a95a4bfef5cd0bdb57a668764f25906dd268585e18e55e9a70e4c495f7f44a04d12dd3d69646782fdac5806a13fa4faf5a66bde253a3480f77e4b4760
languageName: node
linkType: hard

"@rocket.chat/stylis-logical-props-middleware@npm:~0.31.23-dev.6":
version: 0.31.23-dev.6
resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.23-dev.6"
"@rocket.chat/stylis-logical-props-middleware@npm:~0.31.23-dev.9":
version: 0.31.23-dev.9
resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.23-dev.9"
dependencies:
"@rocket.chat/css-supports": ~0.31.23-dev.6
"@rocket.chat/css-supports": ~0.31.23-dev.9
tslib: ^2.3.1
peerDependencies:
stylis: 4.0.10
checksum: 303cd4c7b501b1517175962ae43c670d5f4600fcb04ba2a1ddb8bd9a11cb08737e2f58c548f30aeb69bed17659781da3736a36182d196b2126634a19fe5c3f1a
checksum: 5b41ad83a055fe2d5dbd08b047b49bdc06aa542abe9c450b5e5c4c08e564d899130758c31e3d580408e31c0586103560235b5e6d59107ceca06acd41af5e0088
languageName: node
linkType: hard

Expand Down Expand Up @@ -7586,10 +7586,10 @@ __metadata:
languageName: unknown
linkType: soft

"@rocket.chat/ui-kit@npm:next, @rocket.chat/ui-kit@npm:~0.32.0-dev.167":
version: 0.32.0-dev.167
resolution: "@rocket.chat/ui-kit@npm:0.32.0-dev.167"
checksum: f7f24cbe47d180eb4022e8f1227e07b883bdfb1230e1f7fa5271b5a8810ff3cc7c2d46dc404014ff2393fd791cbdcccfdcdb91c1182e896f0bd67e8cb29e74ae
"@rocket.chat/ui-kit@npm:next, @rocket.chat/ui-kit@npm:~0.32.0-dev.170":
version: 0.32.0-dev.170
resolution: "@rocket.chat/ui-kit@npm:0.32.0-dev.170"
checksum: e59bb870bac3ccfe175a4728e71640eb031a7b642bda346ddbb46c28588fa4f3aa969ac9e25b0b51c1f67ba94cf94920513057124edbb7a5c5a5638b12ddc863
languageName: node
linkType: hard

Expand Down