diff --git a/packages/bbui/src/IconSideNav/IconSideNavItem.svelte b/packages/bbui/src/IconSideNav/IconSideNavItem.svelte index 2b98ae2ef6..73b2b5196b 100644 --- a/packages/bbui/src/IconSideNav/IconSideNavItem.svelte +++ b/packages/bbui/src/IconSideNav/IconSideNavItem.svelte @@ -43,7 +43,7 @@ } .icon-side-nav-item:hover, .active { - background: var(--spectrum-global-color-gray-200); + background: var(--spectrum-global-color-gray-300); } .tooltip { position: absolute; diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 05a408ebd4..4cd78dabab 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1092,12 +1092,21 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" +<<<<<<< HEAD "@budibase/pro@1.0.178-alpha.0": version "1.0.178-alpha.0" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.178-alpha.0.tgz#40a137cdde7f467034d0684882b97e3e4e34a706" integrity sha512-q2XboAmumM2eczhbye/dLcnqkrk9cqXlcGP4IjpNvaNfgFx3Q0pYncr18J5DmmcFoPF+J1zZux5M48dLZxfOCg== dependencies: "@budibase/backend-core" "1.0.178-alpha.0" +======= +"@budibase/pro@^1.0.175": + version "1.0.175" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.175.tgz#1d8ddc698ad17e2f5d73b1ab741c6641da4bda47" + integrity sha512-iGqOtsXeO5bHcg4IJjg8NwOK5bNjI3TnJCr7PtcTjlLyZyCyj+onL2GTk3A6X+d1ZKSQKy9bl3Q+hIsdbZ9GIg== + dependencies: + "@budibase/backend-core" "1.0.175" +>>>>>>> eaf3eea73d7d2927f5b87f5fede628947362297a node-fetch "^2.6.1" "@budibase/standard-components@^0.9.139": diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 619a4f2808..39f2be96e2 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -322,12 +322,21 @@ uuid "^8.3.2" zlib "^1.0.5" +<<<<<<< HEAD "@budibase/pro@1.0.178-alpha.0": version "1.0.178-alpha.0" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.178-alpha.0.tgz#40a137cdde7f467034d0684882b97e3e4e34a706" integrity sha512-q2XboAmumM2eczhbye/dLcnqkrk9cqXlcGP4IjpNvaNfgFx3Q0pYncr18J5DmmcFoPF+J1zZux5M48dLZxfOCg== dependencies: "@budibase/backend-core" "1.0.178-alpha.0" +======= +"@budibase/pro@^1.0.175": + version "1.0.175" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.175.tgz#1d8ddc698ad17e2f5d73b1ab741c6641da4bda47" + integrity sha512-iGqOtsXeO5bHcg4IJjg8NwOK5bNjI3TnJCr7PtcTjlLyZyCyj+onL2GTk3A6X+d1ZKSQKy9bl3Q+hIsdbZ9GIg== + dependencies: + "@budibase/backend-core" "1.0.175" +>>>>>>> eaf3eea73d7d2927f5b87f5fede628947362297a node-fetch "^2.6.1" "@cspotcode/source-map-consumer@0.8.0":