scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-22 07:56:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5715 from G-Chubinidze/gc_SCI_7976

Browse source 
TinyMCE list of smaller bugs and improvements [SCI-7976]
This commit is contained in:
artoscinote 2023-07-05 09:54:38 +02:00 committed by GitHub
parent 97bef6f8f4 2bb27949fd
commit 16008d68de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/tiny_mce.scss
View file

@ -217,6 +217,10 @@
display: flex !important;
}
.tox-tbtn {
background-color: var(--sn-white);
}
.tox .tox-pop {
margin-top: -12px;

4
app/javascript/packs/tiny_mce.js vendored
View file

@ -201,7 +201,7 @@ window.TinyMCE = (() => {
}
return tinyMCE.init({
cache_suffix: '?v=6.3.1', // This suffix should be changed any time library is updated
cache_suffix: '?v=6.5.1-19', // This suffix should be changed any time library is updated
selector,
skin: false,
content_css: false,
@ -213,7 +213,7 @@ window.TinyMCE = (() => {
},
block_formats: 'Paragraph=p; Header 1=h1; Header 2=h2; Header 3=h3; Preformatted=pre',
menubar: 'file edit view insert format table',
toolbar: window.customTinyMceToolbar || 'undo redo restoredraft | insert | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table | link | forecolor backcolor | codesample | customimageuploader marvinjs | help',
toolbar: window.customTinyMceToolbar || 'undo redo restoredraft | insert | styleselect | bold italic | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table | customimageuploader | marvinjs link codesample | help',
plugins,
contextmenu: '',
autoresize_bottom_margin: 20,

2
package.json
View file

@ -75,7 +75,7 @@
"sass": "1.60.0",
"sass-loader": "^10.4.1",
"style-loader": "2.0.0",
"tinymce": "^6.1.2",
"tinymce": "^6.5.1",
"tui-code-snippet": "^1.5.0",
"tui-color-picker": "^2.2.0",
"tui-image-editor": "github:biosistemika/tui.image-editor#3_15_2_updated",

8
yarn.lock
View file

@ -6676,10 +6676,10 @@ tiny-emitter@^2.1.0:
resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
tinymce@^6.1.2:
version "6.4.1"
resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-6.4.1.tgz#9c28f798074668d53371805fb6f1c68e582a4549"
integrity sha512-+/cS2AM9l6p72IBs2uolHbGsBUztLs0WslqNgFaTXtmMksTNUOhh8p08xtA/fa03UGlWEC6/EJoeV95/QDXa2A==
tinymce@^6.5.1:
version "6.5.1"
resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-6.5.1.tgz#f228bf2dc1abf28565523f359b849dad1706357d"
integrity sha512-J67fxJiX3tjvVqer1dg1+cOxMeE2P55ESGhaakvqGPbAUU45HnCMLSioaOsxV1KfcXustw9WJo0rtn1SNQlVKQ==
tmp@^0.0.33:
version "0.0.33"