diff --git a/src/resources/assets/css/common.less b/src/resources/assets/css/common.less index 1c5fdab1df2426c313fa96c94a33abb0aaf842d2..b511ad6a26ed597c38ecac59e6e71260a7a51a5b 100644 --- a/src/resources/assets/css/common.less +++ b/src/resources/assets/css/common.less @@ -1828,11 +1828,6 @@ span { ol li { list-style: decimal inside; } - &.ck-editor__editable { - .ck-list-bogus-paragraph { - display: inline; // 修复ckeditor升级后,无序有序列表图标和后面的内容换行问题 - } - } } .combinesearcher-drop { max-height: none; diff --git a/src/resources/plugins/TsCkeditor/ckeditor.less b/src/resources/plugins/TsCkeditor/ckeditor.less index 0d8b73ab2f20fe8af8e5a91ee11fcea71e35de9d..3b40dfe2871dcaae4c1dc8b73f608e032de79527 100644 --- a/src/resources/plugins/TsCkeditor/ckeditor.less +++ b/src/resources/plugins/TsCkeditor/ckeditor.less @@ -9,12 +9,15 @@ } } } -.ck-content{ - min-height:130px; +.ck-content { + min-height: 130px; // >p{ // margin-top: 0; // } } +.ck.ck-sticky-panel .ck-sticky-panel__content_sticky { + position: static; // ckeditor计算top有问题,导致工具栏位置偏移 +} .theme(@op-color, @title-color, @text-color, @icon-color, @dividing-color, @mongolia-color, @background-color, @blockbg-color, @gray-color, @border-color-base, @boxshadow-main, @boxshadow-bolck, @disable-color, @primary-grey, @selected-bg , @placeholder-color, @topo-node, @footer-btn-bg, @shadow, @main-shadow) { .ck.ck-reset_all, .ck.ck-reset_all * { @@ -65,7 +68,7 @@ figure.table table { border-color: var(--border-color, @border-color-base) !important; border: 1px solid; - padding: .5em; + padding: 0.5em; } } .ck .ck-tooltip { @@ -79,4 +82,3 @@ html { .theme(@dark-op, @dark-title, @dark-text, @dark-icon, @dark-dividing, @dark-mongolia, @dark-background, @dark-blockbg, @dark-gray, @dark-border, @dark-boxshadow-main, @dark-boxshadow-bolck, @dark-disable, @menu-background, @dark-selectbg, @dark-placeholder, @dark-dividing, @dark-footer-btn-bg, @dark-shadow, @dark-main-shadow); } } -