Merge remote-tracking branch 'origin/support/3.0' into support/3.1

# Conflicts:
#	datamodels/2.x/itop-portal-base/portal/public/css/portal.css
This commit is contained in:
Molkobain
2023-11-24 17:09:14 +01:00
4 changed files with 29 additions and 29 deletions

File diff suppressed because one or more lines are too long

View File

@@ -1808,6 +1808,30 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{
white-space: pre-line;
}
@media print {
/* Prevent URLs from being displayed */
a[href], img[src] {
&::after {
content: none !important;
}
}
/* Force modals to be displayed one after another instead of stacked */
.modal {
&.in {
position: relative;
top: unset;
z-index: unset;
overflow-y: unset;
}
}
#drag_overlay {
display: none;
}
}
/**********************************************************/
/* Shameful area (things that should be refactored soon) */
/**********************************************************/
@@ -1841,27 +1865,3 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px lighten($state-danger-border, 10);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px lighten($state-danger-border, 10);
}
@media print {
/* Prevent URLs from being displayed */
a[href], img[src] {
&::after {
content: none !important;
}
}
/* Force modals to be displayed one after another instead of stacked */
.modal {
&.in {
position: relative;
top: unset;
z-index: unset;
overflow-y: unset;
}
}
#drag_overlay {
display: none;
}
}