mirror of
https://github.com/Combodo/iTop.git
synced 2026-05-17 06:18:44 +02:00
N°3800 Fix line spacing in rich text editor and in its displayed content
This commit is contained in:
@@ -2640,6 +2640,7 @@ class utils
|
||||
'contentsLanguage' => $sLanguage,
|
||||
'extraPlugins' => 'disabler,codesnippet,mentions,objectshortcut,font,uploadimage',
|
||||
'uploadUrl' => utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php',
|
||||
'contentsCss' => array(utils::GetAbsoluteUrlAppRoot().'js/ckeditor/contents.css', utils::GetAbsoluteUrlAppRoot().'css/ckeditor/contents.css'),
|
||||
);
|
||||
|
||||
// Mentions
|
||||
|
||||
@@ -189,6 +189,8 @@ $ibo-field--enable-bulk--checkbox--margin-left: 8px !default;
|
||||
/* Hack to force a table to fit its container without overflow (see N°2127) */
|
||||
/* Note that along with with, we now display a "expand" icon on large fields so we can have a better view of its content */
|
||||
.HTML {
|
||||
@extend .ibo-vendors-ckeditor--display-content;
|
||||
|
||||
table {
|
||||
table-layout: fixed;
|
||||
width: 100%;
|
||||
|
||||
@@ -17,6 +17,9 @@ $ibo-caselog-entry--main-information--decoration--width: 3px !default;
|
||||
.ibo-activity-entry--main-information-icon{
|
||||
display: none;
|
||||
}
|
||||
.ibo-activity-entry--main-information-content{
|
||||
@extend .ibo-vendors-ckeditor--display-content;
|
||||
}
|
||||
|
||||
/* Highlight color */
|
||||
.ibo-activity-entry--main-information::before{
|
||||
|
||||
15
css/backoffice/vendors/_ckeditor.scss
vendored
15
css/backoffice/vendors/_ckeditor.scss
vendored
@@ -85,4 +85,19 @@ ul.cke_autocomplete_panel{
|
||||
color: $ibo-vendors-ckeditor--autocomplete-item-title--text-color;
|
||||
@extend %ibo-font-weight-700;
|
||||
}
|
||||
}
|
||||
|
||||
/* These rules should be the same as those in css/ckeditor/contents.css */
|
||||
.ibo-vendors-ckeditor--display-content{
|
||||
.cke_editable{
|
||||
line-height: 1.4;
|
||||
}
|
||||
figure{
|
||||
border: solid 1px #ccc;
|
||||
border-radius: 2px;
|
||||
}
|
||||
p{
|
||||
margin-top: 0.25em;
|
||||
margin-bottom: 0.25em;
|
||||
}
|
||||
}
|
||||
20
css/ckeditor/contents.css
Normal file
20
css/ckeditor/contents.css
Normal file
@@ -0,0 +1,20 @@
|
||||
/*
|
||||
* @copyright Copyright (C) 2010-2021 Combodo SARL
|
||||
* @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;
|
||||
}
|
||||
.cke_editable{
|
||||
line-height: 1.4;
|
||||
}
|
||||
figure{
|
||||
border: solid 1px #ccc;
|
||||
border-radius: 2px;
|
||||
}
|
||||
p{
|
||||
margin-top: 0.25em;
|
||||
margin-bottom: 0.25em;
|
||||
}
|
||||
Reference in New Issue
Block a user