π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
fix(locker):styles-updated
Aswin Asokd716e2670eb2
diff --git a/web/apps/locker/public/images/app-logo.svg b/web/apps/locker/public/images/app-logo.svgnew file mode 100644index 0000000000..04b77d04f9--- /dev/null+++ b/web/apps/locker/public/images/app-logo.svg@@ -0,0 +1,8 @@+<svg width="73" height="19" viewBox="0 0 73 19" fill="none" xmlns="http://www.w3.org/2000/svg">+<path d="M68.7161 7.43619C69.3921 5.66819 71.0301 4.94019 72.6681 4.94019V8.68419C70.9261 8.47619 68.7161 9.25619 68.7161 11.9862V18.2002H65.3621V5.20019H68.7161V7.43619Z" fill="white"/>+<path d="M53.8686 13.0782C54.3366 14.7942 55.7666 15.5222 57.5346 15.5222C58.8346 15.5222 59.8746 14.9762 60.4466 14.2222L63.1506 15.7822C61.9286 17.5502 59.9786 18.5642 57.4826 18.5642C53.1146 18.5642 50.3586 15.5742 50.3586 11.7002C50.3586 7.82618 53.1406 4.83618 57.2226 4.83618C61.0706 4.83618 63.8006 7.87818 63.8006 11.7002C63.8006 12.1942 63.7486 12.6362 63.6706 13.0782H53.8686ZM53.8166 10.4782H60.4466C60.0306 8.60618 58.6266 7.85218 57.2226 7.85218C55.4286 7.85218 54.2066 8.81418 53.8166 10.4782Z" fill="white"/>+<path d="M51.0799 18.2002H47.1799L42.4479 12.2982V18.2002H39.0939V0.000244141H42.4479V10.9202L46.9199 5.20025H50.9239L45.6979 11.6222L51.0799 18.2002Z" fill="white"/>+<path d="M32.224 18.5642C28.272 18.5642 25.36 15.5742 25.36 11.7002C25.36 7.82618 28.272 4.83618 32.224 4.83618C34.772 4.83618 36.982 6.18818 38.048 8.19018L35.162 9.88018C34.642 8.81418 33.524 8.13818 32.198 8.13818C30.196 8.13818 28.714 9.62018 28.714 11.7002C28.714 13.7542 30.196 15.2362 32.198 15.2362C33.55 15.2362 34.668 14.5862 35.188 13.5202L38.1 15.1842C36.982 17.2122 34.772 18.5642 32.224 18.5642Z" fill="white"/>+<path d="M17.5665 18.5642C13.7445 18.5642 10.7025 15.5742 10.7025 11.7002C10.7025 7.82618 13.7445 4.83618 17.5665 4.83618C21.3885 4.83618 24.4565 7.82618 24.4565 11.7002C24.4565 15.5742 21.3885 18.5642 17.5665 18.5642ZM17.5665 15.2882C19.5685 15.2882 21.1025 13.8062 21.1025 11.7002C21.1025 9.59418 19.5685 8.11218 17.5665 8.11218C15.5905 8.11218 14.0565 9.59418 14.0565 11.7002C14.0565 13.8062 15.5905 15.2882 17.5665 15.2882Z" fill="white"/>+<path d="M3.58806 14.7682H10.5301V18.2002H6.10352e-05V0.000244141H3.58806V14.7682Z" fill="white"/>+</svg>diff --git a/web/apps/locker/public/images/locker-beta.svg b/web/apps/locker/public/images/locker-beta.svgdeleted file mode 100644index 2707ac79c3..0000000000--- a/web/apps/locker/public/images/locker-beta.svg+++ /dev/null@@ -1,13 +0,0 @@-<svg width="84" height="29" viewBox="0 0 84 29" fill="none" xmlns="http://www.w3.org/2000/svg">-<path d="M64.7036 15.8277V4.35035H67.8113V7.59302L67.3733 6.65435C67.707 5.84369 68.2424 5.23213 68.9793 4.81969C69.7163 4.39302 70.6131 4.17969 71.6699 4.17969V7.25169C71.5309 7.23746 71.4057 7.23035 71.2945 7.23035C71.1832 7.21613 71.065 7.20902 70.9399 7.20902C70.05 7.20902 69.3269 7.47213 68.7708 7.99835C68.2285 8.51035 67.9573 9.31391 67.9573 10.409V15.8277H64.7036Z" fill="white" style="fill:white;fill-opacity:1;"/>-<path d="M57.1136 15.9984C55.8344 15.9984 54.7081 15.7424 53.7347 15.2304C52.7753 14.7184 52.0314 14.0215 51.503 13.1397C50.9746 12.2437 50.7104 11.2268 50.7104 10.089C50.7104 8.93702 50.9677 7.92013 51.4822 7.03835C52.0105 6.14235 52.7266 5.44547 53.6304 4.94769C54.5343 4.43569 55.5563 4.17969 56.6964 4.17969C57.7949 4.17969 58.7822 4.42147 59.6582 4.90502C60.5481 5.37435 61.2503 6.05702 61.7647 6.95302C62.2792 7.8348 62.5365 8.89435 62.5365 10.1317C62.5365 10.2597 62.5295 10.409 62.5156 10.5797C62.5017 10.7361 62.4878 10.8855 62.4739 11.0277H53.3593V9.08635H60.7636L59.5122 9.66235C59.5122 9.06502 59.394 8.54591 59.1576 8.10502C58.9212 7.66413 58.5945 7.3228 58.1773 7.08102C57.7602 6.82502 57.2735 6.69702 56.7173 6.69702C56.1611 6.69702 55.6675 6.82502 55.2364 7.08102C54.8193 7.3228 54.4925 7.67124 54.2562 8.12635C54.0198 8.56724 53.9016 9.09346 53.9016 9.70502V10.217C53.9016 10.8428 54.0337 11.3975 54.2979 11.881C54.576 12.3504 54.9584 12.713 55.445 12.969C55.9456 13.2108 56.5296 13.3317 57.197 13.3317C57.7949 13.3317 58.3164 13.2392 58.7613 13.0544C59.2202 12.8695 59.6373 12.5921 60.0127 12.2224L61.7439 14.1424C61.2294 14.7397 60.5828 15.2019 59.8042 15.529C59.0255 15.8419 58.1286 15.9984 57.1136 15.9984Z" fill="white" style="fill:white;fill-opacity:1;"/>-<path d="M40.9357 13.4827L41.0191 9.42933L46.2543 4.352H50.1337L45.1071 9.57867L43.4177 10.9867L40.9357 13.4827ZM38.2451 15.8293V0H41.4988V15.8293H38.2451ZM46.6088 15.8293L42.8128 11.008L44.8568 8.42667L50.5508 15.8293H46.6088Z" fill="white" style="fill:white;fill-opacity:1;"/>-<path d="M31.4051 15.9984C30.1954 15.9984 29.1178 15.7495 28.1722 15.2517C27.2267 14.7397 26.4828 14.0357 25.9405 13.1397C25.4121 12.2437 25.1479 11.2268 25.1479 10.089C25.1479 8.93702 25.4121 7.92013 25.9405 7.03835C26.4828 6.14235 27.2267 5.44547 28.1722 4.94769C29.1178 4.43569 30.1954 4.17969 31.4051 4.17969C32.587 4.17969 33.616 4.43569 34.492 4.94769C35.368 5.44547 36.0143 6.16369 36.4315 7.10235L33.9078 8.48902C33.6158 7.94858 33.2475 7.55035 32.8025 7.29435C32.3715 7.03835 31.8987 6.91035 31.3842 6.91035C30.828 6.91035 30.3275 7.03835 29.8823 7.29435C29.4376 7.55035 29.083 7.91302 28.8188 8.38235C28.5685 8.85169 28.4434 9.42058 28.4434 10.089C28.4434 10.7575 28.5685 11.3264 28.8188 11.7957C29.083 12.265 29.4376 12.6277 29.8823 12.8837C30.3275 13.1397 30.828 13.2677 31.3842 13.2677C31.8987 13.2677 32.3715 13.1468 32.8025 12.905C33.2475 12.649 33.6158 12.2437 33.9078 11.689L36.4315 13.097C36.0143 14.0215 35.368 14.7397 34.492 15.2517C33.616 15.7495 32.587 15.9984 31.4051 15.9984Z" fill="white" style="fill:white;fill-opacity:1;"/>-<path d="M17.6547 15.9984C16.4589 15.9984 15.3951 15.7424 14.4635 15.2304C13.5458 14.7184 12.8158 14.0215 12.2735 13.1397C11.7451 12.2437 11.481 11.2268 11.481 10.089C11.481 8.93702 11.7451 7.92013 12.2735 7.03835C12.8158 6.14235 13.5458 5.44547 14.4635 4.94769C15.3951 4.43569 16.4589 4.17969 17.6547 4.17969C18.8366 4.17969 19.8934 4.43569 20.825 4.94769C21.7566 5.44547 22.4866 6.13524 23.015 7.01702C23.5434 7.8988 23.8076 8.9228 23.8076 10.089C23.8076 11.2268 23.5434 12.2437 23.015 13.1397C22.4866 14.0215 21.7566 14.7184 20.825 15.2304C19.8934 15.7424 18.8366 15.9984 17.6547 15.9984ZM17.6547 13.2677C18.197 13.2677 18.6837 13.1397 19.1147 12.8837C19.5458 12.6277 19.8864 12.265 20.1367 11.7957C20.387 11.3121 20.5122 10.7432 20.5122 10.089C20.5122 9.42058 20.387 8.85169 20.1367 8.38235C19.8864 7.91302 19.5458 7.55035 19.1147 7.29435C18.6837 7.03835 18.197 6.91035 17.6547 6.91035C17.1124 6.91035 16.6257 7.03835 16.1947 7.29435C15.7636 7.55035 15.416 7.91302 15.1518 8.38235C14.9015 8.85169 14.7764 9.42058 14.7764 10.089C14.7764 10.7432 14.9015 11.3121 15.1518 11.7957C15.416 12.265 15.7636 12.6277 16.1947 12.8837C16.6257 13.1397 17.1124 13.2677 17.6547 13.2677Z" fill="white" style="fill:white;fill-opacity:1;"/>-<path d="M0 15.8279V0.894531H3.37886V13.0119H10.6997V15.8279H0Z" fill="white" style="fill:white;fill-opacity:1;"/>-<path d="M53.5937 21.4357C53.2658 17.5837 56.1227 14.1951 59.9748 13.8672L74.9207 12.5949C78.7728 12.267 82.1613 15.1239 82.4892 18.976V18.976C82.8171 22.8281 79.9602 26.2166 76.1082 26.5445L61.1622 27.8168C57.3102 28.1447 53.9216 25.2878 53.5937 21.4357V21.4357Z" fill="#1F1F1F" style="fill:#1F1F1F;fill:color(display-p3 0.1216 0.1216 0.1216);fill-opacity:1;"/>-<path d="M74.3889 22.764C74.1087 22.7878 73.8523 22.7547 73.6198 22.6647C73.3874 22.5747 73.2009 22.4416 73.0604 22.2654C72.9199 22.0891 72.8398 21.8842 72.8199 21.6506C72.796 21.3704 72.8499 21.1436 72.9815 20.9703C73.1127 20.7919 73.339 20.655 73.6602 20.5597C73.981 20.4592 74.4113 20.3859 74.9511 20.34L75.3638 20.3049L75.4154 20.9121L75.0106 20.9466C74.7459 20.9691 74.5318 21.003 74.3684 21.0483C74.2097 21.088 74.0969 21.1446 74.03 21.2183C73.9682 21.2915 73.9424 21.3878 73.9526 21.5072C73.965 21.6525 74.0244 21.7677 74.131 21.8527C74.2428 21.9373 74.3947 21.9714 74.5867 21.9551C74.7372 21.9423 74.8667 21.8973 74.9752 21.8201C75.0884 21.7372 75.1736 21.6333 75.2309 21.5081C75.2878 21.3778 75.3096 21.2348 75.2963 21.0791L75.2201 20.1838C75.2007 19.9554 75.1351 19.7989 75.0233 19.7143C74.9111 19.6245 74.7305 19.5903 74.4813 19.6115C74.3412 19.6234 74.1896 19.6546 74.0266 19.7051C73.8684 19.7499 73.6939 19.8196 73.5033 19.9143C73.3936 19.9759 73.2934 19.9975 73.203 19.9791C73.1121 19.9554 73.0402 19.9093 72.9873 19.8406C72.934 19.7667 72.9036 19.6856 72.896 19.5974C72.8881 19.504 72.9065 19.4135 72.9514 19.3261C72.9958 19.2334 73.0759 19.1612 73.1917 19.1096C73.4273 18.9902 73.6499 18.9033 73.8596 18.8488C74.0745 18.7939 74.2728 18.7587 74.4545 18.7433C74.8541 18.7093 75.1862 18.7411 75.4507 18.8388C75.7199 18.9309 75.9298 19.0934 76.0803 19.3263C76.2304 19.5541 76.3216 19.8574 76.3538 20.2363L76.501 21.9647C76.5173 22.1567 76.4832 22.3086 76.3986 22.4204C76.314 22.5321 76.1835 22.5955 76.007 22.6105C75.8305 22.6256 75.6886 22.5854 75.5811 22.4899C75.4789 22.3941 75.4196 22.2501 75.4032 22.0581L75.3787 21.77L75.4372 21.8121C75.421 21.9912 75.3666 22.1501 75.2738 22.2887C75.1858 22.4216 75.0671 22.5311 74.9175 22.617C74.7676 22.6977 74.5914 22.7467 74.3889 22.764Z" fill="white" style="fill:white;fill-opacity:1;"/>-<path d="M71.8252 22.9814C71.4671 23.0118 71.161 22.9778 70.9068 22.8792C70.6579 22.7801 70.4641 22.6215 70.3252 22.4033C70.1916 22.1846 70.11 21.9014 70.0804 21.5536L69.9558 20.09L69.6288 20.1178C69.4835 20.1302 69.366 20.101 69.2763 20.0302C69.1918 19.9589 69.1438 19.8559 69.1323 19.7209C69.12 19.5756 69.1496 19.4633 69.2213 19.384C69.2977 19.299 69.4086 19.2504 69.5539 19.238L69.8809 19.2102L69.8305 18.6185C69.8137 18.4213 69.8531 18.2689 69.9485 18.1615C70.0434 18.0488 70.1844 17.9845 70.3712 17.9686C70.5633 17.9523 70.713 17.9918 70.8205 18.0872C70.9275 18.1775 70.9894 18.3212 71.0062 18.5184L71.0565 19.1101L71.7962 19.0472C71.9415 19.0348 72.0564 19.0642 72.1409 19.1354C72.2249 19.2015 72.2731 19.3072 72.2855 19.4525C72.297 19.5874 72.2671 19.6972 72.1959 19.7816C72.1247 19.8661 72.0164 19.9146 71.871 19.9269L71.1314 19.9899L71.252 21.4069C71.2706 21.6249 71.3338 21.7841 71.4417 21.8848C71.5548 21.9849 71.7229 22.0255 71.9461 22.0065C72.024 21.9999 72.096 21.9859 72.1621 21.9646C72.2283 21.9433 72.2897 21.9276 72.3463 21.9175C72.4185 21.9062 72.4802 21.9244 72.5314 21.9724C72.582 22.0151 72.6145 22.1195 72.6286 22.2856C72.6392 22.4102 72.6277 22.5209 72.5942 22.6179C72.5606 22.7149 72.4937 22.7885 72.3934 22.8389C72.3281 22.8706 72.2365 22.8993 72.1184 22.925C72.006 22.9555 71.9083 22.9743 71.8252 22.9814Z" fill="white" style="fill:white;fill-opacity:1;"/>-<path d="M67.6843 23.3325C67.2328 23.371 66.8367 23.3237 66.496 23.1906C66.16 23.0519 65.8912 22.8421 65.6896 22.5613C65.4927 22.2749 65.377 21.9292 65.3425 21.5244C65.3089 21.1299 65.3626 20.7777 65.5035 20.4677C65.644 20.1525 65.8551 19.8993 66.1368 19.708C66.4232 19.5111 66.7559 19.3965 67.1348 19.3642C67.4099 19.3408 67.663 19.3663 67.8942 19.4408C68.1249 19.51 68.3279 19.6234 68.5034 19.781C68.6785 19.9334 68.8179 20.128 68.9217 20.3649C69.0251 20.5966 69.0893 20.8604 69.1145 21.1562C69.1229 21.2548 69.0982 21.3327 69.0403 21.3899C68.982 21.442 68.8932 21.473 68.7738 21.4832L66.3291 21.6913L66.2774 21.084L68.2394 20.917L68.1241 21.0366C68.106 20.8238 68.0598 20.65 67.9856 20.5152C67.911 20.3751 67.8108 20.2739 67.6853 20.2114C67.5649 20.1484 67.4191 20.1242 67.2478 20.1388C67.0558 20.1552 66.896 20.2132 66.7686 20.3129C66.6411 20.4126 66.5482 20.5486 66.4896 20.7209C66.4311 20.8932 66.4118 21.0961 66.4317 21.3297L66.437 21.392C66.4705 21.7864 66.5861 22.0694 66.7837 22.2408C66.9864 22.4117 67.2695 22.4817 67.6328 22.4508C67.7574 22.4402 67.8988 22.4125 68.057 22.3676C68.2153 22.3228 68.3616 22.2607 68.496 22.1813C68.6105 22.114 68.7154 22.0868 68.8106 22.0996C68.9053 22.1072 68.9815 22.1425 69.0392 22.2056C69.0968 22.2687 69.132 22.3441 69.1447 22.4319C69.1626 22.5192 69.1519 22.609 69.1127 22.7012C69.0731 22.7883 69.0012 22.8649 68.8971 22.9313C68.729 23.045 68.5353 23.1346 68.3161 23.2003C68.1026 23.2708 67.892 23.3149 67.6843 23.3325Z" fill="white" style="fill:white;fill-opacity:1;"/>-<path d="M61.01 23.814C60.8075 23.8313 60.6472 23.79 60.5289 23.6903C60.4106 23.5906 60.3429 23.4395 60.3257 23.2371L59.9658 19.0095C59.9486 18.8071 59.9898 18.6468 60.0895 18.5285C60.1892 18.4102 60.3403 18.3425 60.5427 18.3252L62.4268 18.1648C62.8161 18.1317 63.1532 18.1605 63.438 18.2513C63.7228 18.3421 63.9443 18.4879 64.1026 18.6888C64.266 18.8892 64.3603 19.1373 64.3855 19.4332C64.4134 19.7602 64.3436 20.0458 64.1761 20.2901C64.0087 20.5344 63.7648 20.7094 63.4445 20.8151L63.4339 20.6905C63.8185 20.7257 64.1246 20.8513 64.3521 21.0672C64.5843 21.2774 64.7161 21.5668 64.7475 21.9353C64.789 22.4232 64.6528 22.8191 64.3389 23.1229C64.0245 23.4215 63.5714 23.596 62.9797 23.6464L61.01 23.814ZM61.4554 22.8743L62.74 22.7649C63.0514 22.7384 63.2747 22.6593 63.4099 22.5276C63.5446 22.3906 63.6018 22.2028 63.5815 21.964C63.5612 21.7253 63.4733 21.5524 63.3178 21.4454C63.1623 21.3384 62.9288 21.2981 62.6174 21.3246L61.3328 21.434L61.4554 22.8743ZM61.2566 20.5386L62.4088 20.4405C62.7099 20.4149 62.9282 20.3388 63.0638 20.2123C63.1994 20.0857 63.2575 19.9082 63.2381 19.6799C63.2191 19.4567 63.132 19.2942 62.977 19.1924C62.8219 19.0905 62.5939 19.0524 62.2928 19.0781L61.1406 19.1762L61.2566 20.5386Z" fill="white" style="fill:white;fill-opacity:1;"/>-</svg>diff --git a/web/apps/locker/src/components/LockerNavbar.tsx b/web/apps/locker/src/components/LockerNavbar.tsxindex f57414a437..7c196cda88 100644--- a/web/apps/locker/src/components/LockerNavbar.tsx+++ b/web/apps/locker/src/components/LockerNavbar.tsx@@ -71,9 +71,9 @@ export const LockerNavbar: React.FC<LockerNavbarProps> = ({<Boxcomponent="img"- src="/images/locker-beta.svg"- alt="Locker beta"- sx={{ height: 29, width: "auto" }}+ src="/images/app-logo.svg"+ alt="Locker"+ sx={{ height: 29, width: 73, objectFit: "contain" }}/><Box sx={{ width: 40 }} />diff --git a/web/apps/locker/src/components/auth/LockerAuthenticateUser.tsx b/web/apps/locker/src/components/auth/LockerAuthenticateUser.tsxindex 631feccc66..c643b4cebd 100644--- a/web/apps/locker/src/components/auth/LockerAuthenticateUser.tsx+++ b/web/apps/locker/src/components/auth/LockerAuthenticateUser.tsx@@ -84,7 +84,7 @@ export const LockerAuthenticateUser: React.FC<LockerAuthenticateUserProps> = ({color: "iconColor",}),"&:hover": lockerColorSx(theme, {- backgroundColor: "fillDark",+ backgroundColor: "fillHover",}),})}>@@ -211,7 +211,7 @@ const LockerPasswordForm: React.FC<VerifyMasterPasswordPresentationProps> = ({backgroundColor: "transparent",},"&&:hover": lockerColorSx(theme, {- backgroundColor: "fillDark",+ backgroundColor: "fillHover",}),})}>diff --git a/web/apps/locker/src/components/collections/CollectionCard.tsx b/web/apps/locker/src/components/collections/CollectionCard.tsxindex ee213581f8..31111bacdf 100644--- a/web/apps/locker/src/components/collections/CollectionCard.tsx+++ b/web/apps/locker/src/components/collections/CollectionCard.tsx@@ -42,7 +42,7 @@ export const CollectionCard: React.FC<{borderColor: "fillLight",}),"&:hover": {- ...lockerColorSx(theme, { backgroundColor: "fillDark" }),+ ...lockerColorSx(theme, { backgroundColor: "fillHover" }),},})}>diff --git a/web/apps/locker/src/components/collections/CollectionFilters.tsx b/web/apps/locker/src/components/collections/CollectionFilters.tsxindex 8353800b9b..6cbb77b110 100644--- a/web/apps/locker/src/components/collections/CollectionFilters.tsx+++ b/web/apps/locker/src/components/collections/CollectionFilters.tsx@@ -144,7 +144,7 @@ const CollectionFilterChip: React.FC<{}),"&:hover": {...lockerColorSx(theme, {- backgroundColor: selected ? "primary" : "fillDark",+ backgroundColor: selected ? "primary" : "fillHover",}),},})}diff --git a/web/apps/locker/src/components/collections/LockerCollectionShareDrawer.tsx b/web/apps/locker/src/components/collections/LockerCollectionShareDrawer.tsxindex 032e916728..b8dab3399e 100644--- a/web/apps/locker/src/components/collections/LockerCollectionShareDrawer.tsx+++ b/web/apps/locker/src/components/collections/LockerCollectionShareDrawer.tsx@@ -305,7 +305,7 @@ export const LockerCollectionShareDrawer: React.FC<flexShrink: 0,...lockerColorSx(theme, { color: "textLight" }),"&&:hover": lockerColorSx(theme, {- backgroundColor: "fillDark",+ backgroundColor: "fillHover",}),})}>diff --git a/web/apps/locker/src/components/items/ItemCard.tsx b/web/apps/locker/src/components/items/ItemCard.tsxindex 9bb1d3039d..07dc589278 100644--- a/web/apps/locker/src/components/items/ItemCard.tsx+++ b/web/apps/locker/src/components/items/ItemCard.tsx@@ -193,7 +193,7 @@ export const ItemCard: React.FC<ItemCardProps> = React.memo(function ItemCard({opacity: selectionMode && !selectable ? 0.58 : 1,"&:hover": {...lockerColorSx(theme, {- backgroundColor: "fillDark",+ backgroundColor: "fillHover",}),},})}@@ -358,8 +358,8 @@ const ItemOverflowMenu: React.FC<{ariaID={`item-menu-${item.id}`}triggerButtonIcon={<MoreVertIcon sx={{ fontSize: 20 }} />}triggerButtonSxProps={(theme) => ({- width: 24,- height: 24,+ width: 40,+ height: 40,p: 0,...lockerColorSx(theme, { color: "textLight" }),})}@@ -418,8 +418,8 @@ const TrashActions: React.FC<{ariaID={`trash-item-menu-${item.id}`}triggerButtonIcon={<MoreVertIcon sx={{ fontSize: 20 }} />}triggerButtonSxProps={(theme) => ({- width: 24,- height: 24,+ width: 40,+ height: 40,p: 0,...lockerColorSx(theme, { color: "textLight" }),})}diff --git a/web/apps/locker/src/components/items/ItemList.tsx b/web/apps/locker/src/components/items/ItemList.tsxindex aa2c393348..20893de0aa 100644--- a/web/apps/locker/src/components/items/ItemList.tsx+++ b/web/apps/locker/src/components/items/ItemList.tsx@@ -479,6 +479,17 @@ export const ItemList: React.FC<ItemListProps> = ({overflowY: "auto",overscrollBehavior: "contain",WebkitOverflowScrolling: "touch",+ scrollbarWidth: "thin",+ scrollbarColor: `${theme.vars.palette.fill.muted} transparent`,+ "&::-webkit-scrollbar": { width: 6 },+ "&::-webkit-scrollbar-track": { background: "transparent" },+ "&::-webkit-scrollbar-thumb": {+ borderRadius: "999px",+ backgroundColor: theme.vars.palette.fill.muted,+ },+ "&::-webkit-scrollbar-thumb:hover": {+ backgroundColor: theme.vars.palette.stroke.muted,+ },...lockerColorSx(theme, {backgroundColor: "backgroundBase",}),@@ -1025,7 +1036,7 @@ const SectionHeader: React.FC<{}),"&:hover": {...lockerColorSx(theme, {- backgroundColor: "fillDark",+ backgroundColor: "fillHover",}),},})}diff --git a/web/apps/locker/src/components/items/LockerFileLinkDialog.tsx b/web/apps/locker/src/components/items/LockerFileLinkDialog.tsxindex dafc64174e..31208577e0 100644--- a/web/apps/locker/src/components/items/LockerFileLinkDialog.tsx+++ b/web/apps/locker/src/components/items/LockerFileLinkDialog.tsx@@ -122,7 +122,7 @@ export const LockerFileLinkDialog: React.FC<LockerFileLinkDialogProps> = ({}),"&:hover": {...lockerColorSx(theme, {- backgroundColor: "fillDark",+ backgroundColor: "fillHover",}),},})}@@ -180,7 +180,7 @@ export const LockerFileLinkDialog: React.FC<LockerFileLinkDialogProps> = ({...lockerColorSx(theme, { color: "iconColor" }),"&:hover": {...lockerColorSx(theme, {- backgroundColor: "fillDark",+ backgroundColor: "fillHover",}),},})}diff --git a/web/apps/locker/src/components/items/RestoreItemDialog.tsx b/web/apps/locker/src/components/items/RestoreItemDialog.tsxindex 38f15f3d3b..1625ade19b 100644--- a/web/apps/locker/src/components/items/RestoreItemDialog.tsx+++ b/web/apps/locker/src/components/items/RestoreItemDialog.tsx@@ -162,7 +162,7 @@ export function RestoreItemDialog({}),"&:hover": {...lockerColorSx(theme, {- backgroundColor: "fillDark",+ backgroundColor: "fillHover",}),},})}diff --git a/web/apps/locker/src/components/sidebar/locker-sidebar-styles.ts b/web/apps/locker/src/components/sidebar/locker-sidebar-styles.tsindex 405ed70d3d..7b26be4a23 100644--- a/web/apps/locker/src/components/sidebar/locker-sidebar-styles.ts+++ b/web/apps/locker/src/components/sidebar/locker-sidebar-styles.ts@@ -14,7 +14,7 @@ export const rowSurfaceSx = (theme: Theme) => ({"&:active": { backgroundColor: "#dedede" },...theme.applyStyles("dark", {backgroundColor: "#212121",- "&:hover": { backgroundColor: "#0a0a0a" },+ "&:hover": { backgroundColor: "#292929" },"&:active": { backgroundColor: "#141414" },}),});diff --git a/web/apps/locker/src/components/ui/LockerConfirmDialog.tsx b/web/apps/locker/src/components/ui/LockerConfirmDialog.tsxindex 446a2c495b..a65e6f56a5 100644--- a/web/apps/locker/src/components/ui/LockerConfirmDialog.tsx+++ b/web/apps/locker/src/components/ui/LockerConfirmDialog.tsx@@ -90,7 +90,7 @@ export function LockerConfirmDialog({}),"&:hover": {...lockerColorSx(theme, {- backgroundColor: "fillDark",+ backgroundColor: "fillHover",}),},})}diff --git a/web/apps/locker/src/components/ui/LockerMenu.tsx b/web/apps/locker/src/components/ui/LockerMenu.tsxindex dba7a71c5b..d3ec9857b5 100644--- a/web/apps/locker/src/components/ui/LockerMenu.tsx+++ b/web/apps/locker/src/components/ui/LockerMenu.tsx@@ -104,7 +104,7 @@ export const LockerMenuOption: React.FC<backgroundColor: "primaryLight",}),"&:hover, &.Mui-selected:hover": lockerColorSx(theme, {- backgroundColor: critical ? "warningLight" : "fillDark",+ backgroundColor: critical ? "warningLight" : "fillHover",}),})}>@@ -180,7 +180,7 @@ export const LockerMenuFooter: React.FC<color: "textLight",borderColor: "strokeFaint",}),- "&:hover": lockerColorSx(theme, { backgroundColor: "fillDark" }),+ "&:hover": lockerColorSx(theme, { backgroundColor: "fillHover" }),})}>{children}diff --git a/web/apps/locker/src/styles/tokens.ts b/web/apps/locker/src/styles/tokens.tsindex 10c4060bf7..8f39777291 100644--- a/web/apps/locker/src/styles/tokens.ts+++ b/web/apps/locker/src/styles/tokens.ts@@ -5,6 +5,7 @@ export const lockerColors = {backgroundBase: { light: "#f4f4f4", dark: "#161616" },fillLight: { light: "#ffffff", dark: "#212121" },fillDark: { light: "#eaeaea", dark: "#0a0a0a" },+ fillHover: { light: "#eaeaea", dark: "#292929" },fillDarkest: { light: "#d2d2d2", dark: "#292929" },strokeFaint: { light: "#ebebeb", dark: "#2a2a2a" },strokeDark: { light: "#e0e0e0", dark: "#3e3e3e" },