composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'support/3.2' into develop

Browse Source
This commit is contained in:
Stephen Abello
2024-04-16 09:22:58 +02:00
parent 5d91c8832b 6ae813221e
commit e18018cacd
1084 changed files with 82136 additions and 23375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
css/backoffice/components/input/_input.scss
View File

@@ -58,7 +58,7 @@ textarea.ibo-input{
height:unset;
}
.ibo-input-wrapper.is-error, .ibo-input-field-wrapper.is-error {
.ibo-input, .ibo-input-vanilla, .cke, textarea {
.ibo-input, .ibo-input-vanilla, .ck-editor, textarea {
border-color: $ibo-input-wrapper--is-error--border-color;
}
.ibo-input-vanilla input{

4
css/backoffice/vendors/_ckeditor.scss vendored
View File

@@ -22,6 +22,10 @@ $ibo-vendors-ckeditor--autocomplete-item-image--border: 1px solid $ibo-color-gre
$ibo-vendors-ckeditor--autocomplete-item-title--text-color: #3A3A3A !default;
.ck-editor__editable_inline:not(.ck-comment__input *) {
min-height: 200px;
}
/* Fullscreen button (Combodo custom) */
.ibo-vendors-ckeditor--toolbar-fullscreen-button {
display: none;

38
css/ckeditor/contents.css
View File

@@ -3,18 +3,32 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
/* These rules should be the same as those in css/backoffice/vendors/ckeditor.css */
body{
margin: 5px 10px;
.ibo-mention-item{
line-height: 1.6rem;
}
.cke_editable{
line-height: 1.4;
[data-role="object-mention"]{
color: #0782C1;
}
figure{
border: solid 1px #ccc;
border-radius: 2px;
}
p{
margin-top: 0.25em;
margin-bottom: 0.25em;
[data-role="object-mention"]:hover{
color: #2b6bb0;
}
.ck.ck-editor.cke-maximized{
position: fixed;
left: 0px;
top:0px;
right: 0px;
bottom: 0px;
z-index: 999;
display: flex;
flex-direction: column;
}
.ck.ck-editor.cke-maximized .ck.ck-editor__main{
flex-grow: 1;
}
.ck.ck-editor.cke-maximized .ck-editor__editable_inline:not(.ck-comment__input *){
height: 100%;
}