Skip to content

Commit

Permalink
Merge pull request #824 from vcync/next
Browse files Browse the repository at this point in the history
merge next into main
  • Loading branch information
2xAA authored Mar 1, 2023
2 parents a345d82 + 25c4a55 commit aba77de
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 18 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"lodash.get": "^4.4.2",
"lodash.set": "^4.3.2",
"mathjs": "^7.5.1",
"meyda": "^5.2.0",
"meyda": "5.6.0",
"mkdirp": "^0.5.1",
"npm": "6.14.6",
"nwjs-menu-browser": "^1.0.0",
Expand Down
11 changes: 10 additions & 1 deletion src/css/golden-layout_theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,16 @@

.lm_header {
height: 20px;
border-bottom: 1px solid var(--foreground-color-4);
z-index:unset;
}

.lm_header + .lm_items .lm_header {
border-top: 1px solid var(--foreground-color-4);
background-color: var(--background-color-3);
}

.lm_header .lm_tabdropdown_list {
box-shadow: 0px 0px 10px 1px rgb(0 0 0 / 60%);
}


Expand Down
27 changes: 11 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6818,7 +6818,7 @@ ignore@^4.0.3, ignore@^4.0.6:
immediate@~3.0.5:
version "3.0.6"
resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==

import-cwd@^2.0.0:
version "2.1.0"
Expand Down Expand Up @@ -7476,7 +7476,7 @@ [email protected]:
[email protected], isarray@^1.0.0, isarray@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==

isbinaryfile@^3.0.2:
version "3.0.3"
Expand Down Expand Up @@ -7731,14 +7731,14 @@ jsprim@^1.2.2:
verror "1.10.0"

jszip@^3.1.0:
version "3.7.1"
resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz#bd63401221c15625a1228c556ca8a68da6fda3d9"
integrity sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==
version "3.10.1"
resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.10.1.tgz#34aee70eb18ea1faec2f589208a157d1feb091c2"
integrity sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==
dependencies:
lie "~3.3.0"
pako "~1.0.2"
readable-stream "~2.3.6"
set-immediate-shim "~1.0.1"
setimmediate "^1.0.5"

keyv@^3.0.0:
version "3.1.0"
Expand Down Expand Up @@ -8554,10 +8554,10 @@ methods@~1.1.2:
resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==

meyda@^5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/meyda/-/meyda-5.2.0.tgz#7c754e9b1827025a227b162e04a63e84bb2c9e6b"
integrity sha512-M9Z+LzYrZMvIN2Y7OdbHOuaCIAM+Jsqe9OH8Vq0zTZPhE3vB/3BmDNq4uJuVi4MM1nLb0iqJOntQBdGBmv3GWA==
meyda@5.6.0:
version "5.6.0"
resolved "https://registry.yarnpkg.com/meyda/-/meyda-5.6.0.tgz#421d6e784d5d5c17e31cba3da6e71b2a003c159b"
integrity sha512-tYSmGM8EQIkhuXdbWa0J+OTVbY3XuKB+KSZmGT/RhJGVnESXCqkcu3625oBxYj9KFNtrNerXFd5xj3/uvhbydw==
dependencies:
dct "0.1.0"
fftjs "0.0.4"
Expand Down Expand Up @@ -11554,11 +11554,6 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=

set-immediate-shim@~1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=

set-value@^2.0.0, set-value@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
Expand All @@ -11569,7 +11564,7 @@ set-value@^2.0.0, set-value@^2.0.1:
is-plain-object "^2.0.3"
split-string "^3.0.1"

setimmediate@^1.0.4:
setimmediate@^1.0.4, setimmediate@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
Expand Down

0 comments on commit aba77de

Please sign in to comment.