composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 18:48:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'support/3.2' into develop

Browse Source 
# Conflicts:
#	core/simplecrypt.class.inc.php
#	tests/php-unit-tests/unitary-tests/core/SympleCryptTest.php
This commit is contained in:
Stephen Abello
2025-11-06 10:27:03 +01:00
parent d4183acfde 26f21ee6eb
commit 6cf6e7dd8d
8 changed files with 122 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
css/backoffice/components/_field.scss
View File

@@ -81,9 +81,10 @@ $ibo-field--enable-bulk--checkbox--margin-left: $ibo-spacing-300 !default;
}
}
/*N°6543 - We need the rule to keep text inside the column when width is defined */
/* N°6543 - We need the rule to keep text inside the column when width is defined */
&[data-attribute-type="AttributeHTML"],
&[data-attribute-type="AttributeText"] {
&[data-attribute-type="AttributeText"],
&[data-attribute-type="AttributeLongText"] {
&[data-attribute-flag-read-only="true"] {
display: grid;

3
css/backoffice/components/datatable/_datatable.scss
View File

@@ -127,7 +127,8 @@ $ibo-datatable--selected-result-count--padding-left: 0.1em !default;
}
/* N°6543 - We need the rule to keep text inside the column when width is defined */
> [data-attribute-type="AttributeHTML"],
> [data-attribute-type="AttributeText"] {
> [data-attribute-type="AttributeText"],
> [data-attribute-type="AttributeLongText"] {
max-width: 100%;
overflow: auto;
}

5
css/backoffice/components/input/_input-select.scss
View File

@@ -202,6 +202,11 @@ $ibo-input-select--autocomplete-item-image--border: 1px solid $ibo-color-grey-60
overflow-y: auto;
}
// N°7982 Default selectize stylesheet override
.selectize-dropdown-content{
max-height: $ibo-input-select-selectize--dropdown--max-height;
}
.selectize-dropdown.ui-menu .ui-state-active {
margin: unset;
background-color: $ibo-input-select-selectize--item--active--background-color;