diff --git a/css/backoffice/components/dashlet/_dashlet.scss b/css/backoffice/components/dashlet/_dashlet.scss index 0fe62bb36..551213bcc 100644 --- a/css/backoffice/components/dashlet/_dashlet.scss +++ b/css/backoffice/components/dashlet/_dashlet.scss @@ -11,7 +11,7 @@ $ibo-dashlet--elements-spacing-y: 24px !default; /* Rules */ .ibo-dashlet { - width: $ibo-dashlet--width; + width: calc(#{$ibo-dashlet--width} - #{$ibo-dashlet--elements-spacing-x}); margin: calc(#{$ibo-dashlet--elements-spacing-y} / 2) calc(#{$ibo-dashlet--elements-spacing-x} / 2); &.dashlet-selected { diff --git a/css/backoffice/layout/dashboard/_dashboard.scss b/css/backoffice/layout/dashboard/_dashboard.scss index 98f582549..439a01b58 100644 --- a/css/backoffice/layout/dashboard/_dashboard.scss +++ b/css/backoffice/layout/dashboard/_dashboard.scss @@ -73,6 +73,7 @@ $ibo-dashboard--top-bar-padding-bottom: 20px !default; align-content: flex-start; width: calc(100% + (2 * #{$ibo-dashboard--grid--elements-spacing-x})); margin: calc(-1 * #{$ibo-dashboard--grid--elements-spacing-y} / 2) calc(-1 * #{$ibo-dashboard--grid--elements-spacing-x} / 2); /* Because of the margin all around the dashlets, we need to compensate it */ + min-width: 0; /* Compensate negative margin on inner borders to simulate egal dashlets spacing between columns */ &:not(:last-child) { diff --git a/templates/base/components/datatable/static/layout.html.twig b/templates/base/components/datatable/static/layout.html.twig index 04e317a0d..ca8191e2c 100644 --- a/templates/base/components/datatable/static/layout.html.twig +++ b/templates/base/components/datatable/static/layout.html.twig @@ -2,7 +2,7 @@ {# @license http://opensource.org/licenses/AGPL-3.0 #} {% set columns = oUIBlock.GetColumns() %} - +
{% for column in columns %}