MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'new-design-ui' of github.com:Budibase/budibase into new-design-ui

This commit is contained in:
Andrew Kingston 2022-05-25 13:50:04 +01:00
parent 245a074317 eaf3eea73d
commit 4f1f2abf21
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/bbui/src/IconSideNav/IconSideNavItem.svelte
View File

@ -43,7 +43,7 @@
} }
.icon-side-nav-item:hover, .icon-side-nav-item:hover,
.active { .active {
background: var(--spectrum-global-color-gray-200); background: var(--spectrum-global-color-gray-300);
} }
.tooltip { .tooltip {
position: absolute; position: absolute;

9
packages/server/yarn.lock
View File

@ -1092,12 +1092,21 @@
svelte-flatpickr "^3.2.3" svelte-flatpickr "^3.2.3"
svelte-portal "^1.0.0" svelte-portal "^1.0.0"
<<<<<<< HEAD
"@budibase/pro@1.0.178-alpha.0": "@budibase/pro@1.0.178-alpha.0":
version "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" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.178-alpha.0.tgz#40a137cdde7f467034d0684882b97e3e4e34a706"
integrity sha512-q2XboAmumM2eczhbye/dLcnqkrk9cqXlcGP4IjpNvaNfgFx3Q0pYncr18J5DmmcFoPF+J1zZux5M48dLZxfOCg== integrity sha512-q2XboAmumM2eczhbye/dLcnqkrk9cqXlcGP4IjpNvaNfgFx3Q0pYncr18J5DmmcFoPF+J1zZux5M48dLZxfOCg==
dependencies: dependencies:
"@budibase/backend-core" "1.0.178-alpha.0" "@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" node-fetch "^2.6.1"
"@budibase/standard-components@^0.9.139": "@budibase/standard-components@^0.9.139":

9
packages/worker/yarn.lock
View File

@ -322,12 +322,21 @@
uuid "^8.3.2" uuid "^8.3.2"
zlib "^1.0.5" zlib "^1.0.5"
<<<<<<< HEAD
"@budibase/pro@1.0.178-alpha.0": "@budibase/pro@1.0.178-alpha.0":
version "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" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.178-alpha.0.tgz#40a137cdde7f467034d0684882b97e3e4e34a706"
integrity sha512-q2XboAmumM2eczhbye/dLcnqkrk9cqXlcGP4IjpNvaNfgFx3Q0pYncr18J5DmmcFoPF+J1zZux5M48dLZxfOCg== integrity sha512-q2XboAmumM2eczhbye/dLcnqkrk9cqXlcGP4IjpNvaNfgFx3Q0pYncr18J5DmmcFoPF+J1zZux5M48dLZxfOCg==
dependencies: dependencies:
"@budibase/backend-core" "1.0.178-alpha.0" "@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" node-fetch "^2.6.1"
"@cspotcode/source-map-consumer@0.8.0": "@cspotcode/source-map-consumer@0.8.0":