diff --git a/.gitignore b/.gitignore index 399004b23..dd599829f 100644 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,7 @@ luna.tar.gz luna/ package-lock.json .angular +.yarn # generated at build time by scripts/generate-build-info.mjs /src/environments/build-info.ts diff --git a/.yarnrc.yml b/.yarnrc.yml new file mode 100644 index 000000000..3186f3f07 --- /dev/null +++ b/.yarnrc.yml @@ -0,0 +1 @@ +nodeLinker: node-modules diff --git a/src/app/elements/asset-tree/asset-tree.component.scss b/src/app/elements/asset-tree/asset-tree.component.scss index 961bc6f7d..2e6a619b0 100644 --- a/src/app/elements/asset-tree/asset-tree.component.scss +++ b/src/app/elements/asset-tree/asset-tree.component.scss @@ -11,13 +11,25 @@ @content; } +:host { + display: block; + height: 100%; + min-height: 0; + overflow: hidden; +} + .tree-container { display: flex; flex-direction: column; height: 100%; + min-height: 0; + overflow: hidden; background-color: var(--el-asset-tree-bg-color); .tree-type { + flex: 0 0 30px; + min-height: 30px; + overflow: hidden; transition: all 0.3s; .tree-type-banner { @@ -141,9 +153,10 @@ .tree-type-content { position: relative; + flex: 1 1 auto; padding: 1px; - min-height: 40px; - height: calc(100% - 31px); + min-height: 0; + height: auto; background-color: var(--el-asset-tree-bg-color); overflow: hidden; scrollbar-gutter: stable both-edges; @@ -170,7 +183,11 @@ } &.expand-tree { - height: calc(100% - 31px); + display: flex; + flex: 1 1 0; + flex-direction: column; + min-height: 0; + height: auto; } } } diff --git a/src/app/elements/chat/chat.component.html b/src/app/elements/chat/chat.component.html index bb859f32b..81a7b1e48 100644 --- a/src/app/elements/chat/chat.component.html +++ b/src/app/elements/chat/chat.component.html @@ -1,18 +1,46 @@ -
- - @if(isShowSetting && subViews.length === 1) { - - } - - - - - - - - +
+
+ -
+
+ @if (isShowSetting && subViews.length === 1) { + + } + +
+
+ +