diff --git a/css/backoffice/components/_field.scss b/css/backoffice/components/_field.scss index b46e58359..79fbae324 100644 --- a/css/backoffice/components/_field.scss +++ b/css/backoffice/components/_field.scss @@ -175,16 +175,29 @@ $ibo-field--enable-bulk--checkbox--margin-left: 8px !default; } } } + +.ibo-field--label > .ibo-field--comments { + flex: auto; + padding-bottom: 2px; +} + +.ibo-fieldset-legend > .ibo-field--comments { + display: contents; + padding-bottom: 2px; + font-size: $ibo-font-size-150; +} + .ibo-field--comments { display: table-cell; vertical-align: top; + width: 5em; > input[type="checkbox"] { margin-left: 5px; float: right; } - > .multi_values, > .mono_value, > .ibo-field--comments--synchro{ + > .multi_values, > .mono_value, > .ibo-field--comments--synchro { float: right; } } diff --git a/css/backoffice/components/_fieldset.scss b/css/backoffice/components/_fieldset.scss index 2fead56e9..8d63a685a 100644 --- a/css/backoffice/components/_fieldset.scss +++ b/css/backoffice/components/_fieldset.scss @@ -18,6 +18,10 @@ $ibo-fieldset--legend--border-bottom-style: solid !default; } } +.ibo-multi-column & ~ .ibo-fieldset { + margin-top: $ibo-fieldset--sibling-spacing; +} + .ibo-fieldset-legend { width: $ibo-fieldset--legend--width; margin-bottom: $ibo-fieldset--legend--margin-bottom; diff --git a/css/backoffice/pages/_base.scss b/css/backoffice/pages/_base.scss index 1cfe68f2c..bddb9339d 100644 --- a/css/backoffice/pages/_base.scss +++ b/css/backoffice/pages/_base.scss @@ -70,8 +70,13 @@ body{ height: 100%; } } -#ibo-main-content{ - padding-top: $ibo-main-content--padding-top; - padding-bottom: $ibo-main-content--padding-bottom; + +#ibo-main-content { + padding-top: $ibo-main-content--padding-top; + padding-bottom: $ibo-main-content--padding-bottom; overflow: auto; /* For scroll to happen in the main content instead of the center content */ +} + +.ui-dialog, .ui-dialog-content { + box-sizing: content-box; } \ No newline at end of file diff --git a/css/print.css b/css/print.css index bc21c8467..d95942206 100644 --- a/css/print.css +++ b/css/print.css @@ -2,12 +2,35 @@ @media print { html { font-size: 10px; - break-after:auto; + break-after: auto; } + .not-printable { display: none; } + .ibo-panel--icon { + -webkit-print-color-adjust: exact !important; /* Chrome, Safari, Edge */ + color-adjust: exact !important; /*Firefox*/ + } + + .printable-content legend::before, + .printable-content .ibo-activity-panel--tab-toolbar-action::before { + display: none; + } + + .printable-content .strikethrough { + display: none; + } + + #hiddeable_chapters .ibo-block-print--tab.strikethrough { + display: none; + } + + #hiddeable_chapters .ibo-block-print--tab span::before { + display: none; + } + span.ui-layout-resizer { display: none; } @@ -97,6 +120,10 @@ background-image: none; } + .ibo-field--label > .ibo-has-description::after { + display: none; + } + /** * PRINT Stylesheet * diff --git a/templates/base/components/field/layout.html.twig b/templates/base/components/field/layout.html.twig index 5d32a6f2d..0c5ae0bc4 100644 --- a/templates/base/components/field/layout.html.twig +++ b/templates/base/components/field/layout.html.twig @@ -23,13 +23,21 @@ {% endfor %} {% endif %} > -