diff options
| author | Julia Kirschenheuter <6078378+JuliaKirschenheuter@users.noreply.github.com> | 2022-10-14 12:48:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-14 12:48:26 +0200 |
| commit | e1a1e292982096a05a7284007815ea35d0e8aaa7 (patch) | |
| tree | c0f54ee3e422af2d74d606c0e29d2e8a3b8185f3 | |
| parent | d04cc7308905400cea8c7bf7b9f7bba769c4942b (diff) | |
| parent | 0248552189a4a5b46ba20e1dba4af3841617410a (diff) | |
Merge pull request #3037 from nextcloud/backport/3024/stable5.0
[stable5.0] Fix org chart card overlapping other card expand button
| -rw-r--r-- | src/components/ChartTemplate.vue | 6 | ||||
| -rw-r--r-- | src/components/OrgChart.vue | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/components/ChartTemplate.vue b/src/components/ChartTemplate.vue index e8585aff..d6b2ccb4 100644 --- a/src/components/ChartTemplate.vue +++ b/src/components/ChartTemplate.vue @@ -66,22 +66,22 @@ export default { <style lang="scss" scoped> .org-chart-node { background-color: var(--color-main-background); - padding-top: 1px; height: 175px; border-radius: var(--border-radius-large); overflow: visible; &__avatar { margin-top: -30px; - margin-left: 95px; border: 1px solid var(--color-border); } .inner-box { display: flex; flex-direction: column; + align-items: center; height: 175px; padding-top: 0; + margin-top: 30px; border: 1px solid var(--color-border); border-radius: var(--border-radius-large); background-color: var(--color-main-background); @@ -104,6 +104,7 @@ export default { .description { display: flex; justify-content: space-between; + width: 100%; padding: 15px; } } @@ -113,6 +114,7 @@ export default { } .panel { + width: 100%; margin: -34px -1px 0 -1px; background-color: var(--color-primary); height: 15px; diff --git a/src/components/OrgChart.vue b/src/components/OrgChart.vue index ddc6c59a..cc8df4f9 100644 --- a/src/components/OrgChart.vue +++ b/src/components/OrgChart.vue @@ -102,7 +102,7 @@ export default { .data(data) .nodeWidth(() => 250) .initialZoom(1) - .nodeHeight(() => 175) + .nodeHeight(() => 200) .childrenMargin(() => 70) .compactMarginBetween(() => 15) .compactMarginPair(() => 80) |