summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard Steinmetz <richard@steinmetz.cloud>2022-10-14 12:06:07 +0200
committerGitHub <noreply@github.com>2022-10-14 12:06:07 +0200
commitb9428ecf4a3c589698eceb3d998022cffcc4ae5e (patch)
treebae570ffc82707fba565b135f334c0fb26b81c86 /src
parentd7397227dc69914fa61f0cbaf7092b08ee6788e2 (diff)
parented3658a6f407fbfb1aa5c925f983ccfdd5d645f8 (diff)
Merge pull request #3024 from nextcloud/fix/org-chart-expand-overlap
Fix org chart card overlapping other card expand button
Diffstat (limited to 'src')
-rw-r--r--src/components/ChartTemplate.vue6
-rw-r--r--src/components/OrgChart.vue2
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 d7c62cc2..2ad9a99c 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)