composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-08-22 22:28:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'support/3.2' into develop

Browse Source 
# Conflicts:
#	css/setup.css
#	datamodels/2.x/itop-portal-base/portal/public/css/portal.css
#	datamodels/2.x/itop-portal-base/portal/public/css/portal.scss
This commit is contained in:
Stephen Abello
2026-08-13 09:31:11 +02:00
parent 1bba486ee8 23e4ce7263
commit a38fef5bbf
6 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
node_modules/.package-lock.json generated vendored
View File

@@ -104,7 +104,7 @@
},
"node_modules/ckeditor5-itop-build": {
"version": "3.3.0",
"resolved": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#a3a28d5fb0ef3a516c2ad2f23392024e61a5d16f",
"resolved": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#0443561b0816d860e31603e0264ebd478f00f0df",
"license": "SEE LICENSE IN LICENSE.md"
},
"node_modules/clipboard": {

10
node_modules/ckeditor5-itop-build/build/styles/compiled-theme.scss generated vendored
View File

@@ -7530,14 +7530,14 @@ div.ck.ck-balloon-panel.ck-mention-balloon {
height: 100%;
width: 100%;
max-width: 100%;
min-height: unset;
padding: 0;
}
.ck-fullscreen__main-wrapper .ck-fullscreen__editable .ck.ck-editor__editable:not(.ck-editor__nested-editable) {
padding: 0 var(--ck-spacing-standard);
}
.ck-source-editing-area textarea {
overflow: auto;
}
.ck-fullscreen__main-wrapper .ck-fullscreen__editable .ck.ck-editor__editable:not(.ck-editor__nested-editable), .ck-fullscreen__main-wrapper .ck-fullscreen__editable .ck-source-editing-area
{
min-height: unset;
}