mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-26 00:36:59 +08:00 
			
		
		
		
	ckeditor upgrade to 29.2.0
This commit is contained in:
		
							parent
							
								
									4023c28f5e
								
							
						
					
					
						commit
						266807179c
					
				
					 3 changed files with 178 additions and 103 deletions
				
			
		|  | @ -5,14 +5,18 @@ | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| /* | /* | ||||||
|  * CKEditor 5 (v27.1.0) content styles. |  * CKEditor 5 (v29.2.0) content styles. | ||||||
|  * Generated on Wed, 21 Apr 2021 07:00:21 GMT. |  * Generated on Fri, 10 Sep 2021 10:54:09 GMT. | ||||||
|  * For more information, check out https://ckeditor.com/docs/ckeditor5/latest/builds/guides/integration/content-styles.html |  * For more information, check out https://ckeditor.com/docs/ckeditor5/latest/builds/guides/integration/content-styles.html | ||||||
|  */ |  */ | ||||||
| 
 | 
 | ||||||
| :root { | :root { | ||||||
|  |     --ck-color-image-caption-background: hsl(0, 0%, 97%); | ||||||
|  |     --ck-color-image-caption-text: hsl(0, 0%, 20%); | ||||||
|     --ck-color-mention-background: hsla(341, 100%, 30%, 0.1); |     --ck-color-mention-background: hsla(341, 100%, 30%, 0.1); | ||||||
|     --ck-color-mention-text: hsl(341, 100%, 30%); |     --ck-color-mention-text: hsl(341, 100%, 30%); | ||||||
|  |     --ck-color-table-caption-background: hsl(0, 0%, 97%); | ||||||
|  |     --ck-color-table-caption-text: hsl(0, 0%, 20%); | ||||||
|     --ck-highlight-marker-blue: hsl(201, 97%, 72%); |     --ck-highlight-marker-blue: hsl(201, 97%, 72%); | ||||||
|     --ck-highlight-marker-green: hsl(120, 93%, 68%); |     --ck-highlight-marker-green: hsl(120, 93%, 68%); | ||||||
|     --ck-highlight-marker-pink: hsl(345, 96%, 73%); |     --ck-highlight-marker-pink: hsl(345, 96%, 73%); | ||||||
|  | @ -20,9 +24,98 @@ | ||||||
|     --ck-highlight-pen-green: hsl(112, 100%, 27%); |     --ck-highlight-pen-green: hsl(112, 100%, 27%); | ||||||
|     --ck-highlight-pen-red: hsl(0, 85%, 49%); |     --ck-highlight-pen-red: hsl(0, 85%, 49%); | ||||||
|     --ck-image-style-spacing: 1.5em; |     --ck-image-style-spacing: 1.5em; | ||||||
|  |     --ck-inline-image-style-spacing: calc(var(--ck-image-style-spacing) / 2); | ||||||
|     --ck-todo-list-checkmark-size: 16px; |     --ck-todo-list-checkmark-size: 16px; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | /* ckeditor5-image/theme/imagecaption.css */ | ||||||
|  | .ck-content .image > figcaption { | ||||||
|  |     display: table-caption; | ||||||
|  |     caption-side: bottom; | ||||||
|  |     word-break: break-word; | ||||||
|  |     color: var(--ck-color-image-caption-text); | ||||||
|  |     background-color: var(--ck-color-image-caption-background); | ||||||
|  |     padding: .6em; | ||||||
|  |     font-size: .75em; | ||||||
|  |     outline-offset: -1px; | ||||||
|  | } | ||||||
|  | /* ckeditor5-font/theme/fontsize.css */ | ||||||
|  | .ck-content .text-tiny { | ||||||
|  |     font-size: .7em; | ||||||
|  | } | ||||||
|  | /* ckeditor5-font/theme/fontsize.css */ | ||||||
|  | .ck-content .text-small { | ||||||
|  |     font-size: .85em; | ||||||
|  | } | ||||||
|  | /* ckeditor5-font/theme/fontsize.css */ | ||||||
|  | .ck-content .text-big { | ||||||
|  |     font-size: 1.4em; | ||||||
|  | } | ||||||
|  | /* ckeditor5-font/theme/fontsize.css */ | ||||||
|  | .ck-content .text-huge { | ||||||
|  |     font-size: 1.8em; | ||||||
|  | } | ||||||
|  | /* ckeditor5-image/theme/imagestyle.css */ | ||||||
|  | .ck-content .image-style-block-align-left, | ||||||
|  | .ck-content .image-style-block-align-right { | ||||||
|  |     max-width: calc(100% - var(--ck-image-style-spacing)); | ||||||
|  | } | ||||||
|  | /* ckeditor5-image/theme/imagestyle.css */ | ||||||
|  | .ck-content .image-style-align-left, | ||||||
|  | .ck-content .image-style-align-right { | ||||||
|  |     clear: none; | ||||||
|  | } | ||||||
|  | /* ckeditor5-image/theme/imagestyle.css */ | ||||||
|  | .ck-content .image-style-side { | ||||||
|  |     float: right; | ||||||
|  |     margin-left: var(--ck-image-style-spacing); | ||||||
|  |     max-width: 50%; | ||||||
|  | } | ||||||
|  | /* ckeditor5-image/theme/imagestyle.css */ | ||||||
|  | .ck-content .image-style-align-left { | ||||||
|  |     float: left; | ||||||
|  |     margin-right: var(--ck-image-style-spacing); | ||||||
|  | } | ||||||
|  | /* ckeditor5-image/theme/imagestyle.css */ | ||||||
|  | .ck-content .image-style-align-center { | ||||||
|  |     margin-left: auto; | ||||||
|  |     margin-right: auto; | ||||||
|  | } | ||||||
|  | /* ckeditor5-image/theme/imagestyle.css */ | ||||||
|  | .ck-content .image-style-align-right { | ||||||
|  |     float: right; | ||||||
|  |     margin-left: var(--ck-image-style-spacing); | ||||||
|  | } | ||||||
|  | /* ckeditor5-image/theme/imagestyle.css */ | ||||||
|  | .ck-content .image-style-block-align-right { | ||||||
|  |     margin-right: 0; | ||||||
|  |     margin-left: auto; | ||||||
|  | } | ||||||
|  | /* ckeditor5-image/theme/imagestyle.css */ | ||||||
|  | .ck-content .image-style-block-align-left { | ||||||
|  |     margin-left: 0; | ||||||
|  |     margin-right: auto; | ||||||
|  | } | ||||||
|  | /* ckeditor5-image/theme/imagestyle.css */ | ||||||
|  | .ck-content p + .image-style-align-left, | ||||||
|  | .ck-content p + .image-style-align-right, | ||||||
|  | .ck-content p + .image-style-side { | ||||||
|  |     margin-top: 0; | ||||||
|  | } | ||||||
|  | /* ckeditor5-image/theme/imagestyle.css */ | ||||||
|  | .ck-content .image-inline.image-style-align-left, | ||||||
|  | .ck-content .image-inline.image-style-align-right { | ||||||
|  |     margin-top: var(--ck-inline-image-style-spacing); | ||||||
|  |     margin-bottom: var(--ck-inline-image-style-spacing); | ||||||
|  | } | ||||||
|  | /* ckeditor5-image/theme/imagestyle.css */ | ||||||
|  | .ck-content .image-inline.image-style-align-left { | ||||||
|  |     margin-right: var(--ck-inline-image-style-spacing); | ||||||
|  | } | ||||||
|  | /* ckeditor5-image/theme/imagestyle.css */ | ||||||
|  | .ck-content .image-inline.image-style-align-right { | ||||||
|  |     margin-left: var(--ck-inline-image-style-spacing); | ||||||
|  | } | ||||||
| /* ckeditor5-highlight/theme/highlight.css */ | /* ckeditor5-highlight/theme/highlight.css */ | ||||||
| .ck-content .marker-yellow { | .ck-content .marker-yellow { | ||||||
|     background-color: var(--ck-highlight-marker-yellow); |     background-color: var(--ck-highlight-marker-yellow); | ||||||
|  | @ -49,69 +142,6 @@ | ||||||
|     color: var(--ck-highlight-pen-green); |     color: var(--ck-highlight-pen-green); | ||||||
|     background-color: transparent; |     background-color: transparent; | ||||||
| } | } | ||||||
| /* ckeditor5-font/theme/fontsize.css */ |  | ||||||
| .ck-content .text-tiny { |  | ||||||
|     font-size: .7em; |  | ||||||
| } |  | ||||||
| /* ckeditor5-font/theme/fontsize.css */ |  | ||||||
| .ck-content .text-small { |  | ||||||
|     font-size: .85em; |  | ||||||
| } |  | ||||||
| /* ckeditor5-font/theme/fontsize.css */ |  | ||||||
| .ck-content .text-big { |  | ||||||
|     font-size: 1.4em; |  | ||||||
| } |  | ||||||
| /* ckeditor5-font/theme/fontsize.css */ |  | ||||||
| .ck-content .text-huge { |  | ||||||
|     font-size: 1.8em; |  | ||||||
| } |  | ||||||
| /* ckeditor5-image/theme/imagestyle.css */ |  | ||||||
| .ck-content .image-style-side { |  | ||||||
|     float: right; |  | ||||||
|     margin-left: var(--ck-image-style-spacing); |  | ||||||
|     max-width: 50%; |  | ||||||
| } |  | ||||||
| /* ckeditor5-image/theme/imagestyle.css */ |  | ||||||
| .ck-content .image-style-align-left { |  | ||||||
|     float: left; |  | ||||||
|     margin-right: var(--ck-image-style-spacing); |  | ||||||
| } |  | ||||||
| /* ckeditor5-image/theme/imagestyle.css */ |  | ||||||
| .ck-content .image-style-align-center { |  | ||||||
|     margin-left: auto; |  | ||||||
|     margin-right: auto; |  | ||||||
| } |  | ||||||
| /* ckeditor5-image/theme/imagestyle.css */ |  | ||||||
| .ck-content .image-style-align-right { |  | ||||||
|     float: right; |  | ||||||
|     margin-left: var(--ck-image-style-spacing); |  | ||||||
| } |  | ||||||
| /* ckeditor5-code-block/theme/codeblock.css */ |  | ||||||
| .ck-content pre { |  | ||||||
|     padding: 1em; |  | ||||||
|     color: hsl(0, 0%, 20.8%); |  | ||||||
|     background: hsla(0, 0%, 78%, 0.3); |  | ||||||
|     border: 1px solid hsl(0, 0%, 77%); |  | ||||||
|     border-radius: 2px; |  | ||||||
|     text-align: left; |  | ||||||
|     direction: ltr; |  | ||||||
|     tab-size: 4; |  | ||||||
|     white-space: pre-wrap; |  | ||||||
|     font-style: normal; |  | ||||||
|     min-width: 200px; |  | ||||||
| } |  | ||||||
| /* ckeditor5-code-block/theme/codeblock.css */ |  | ||||||
| .ck-content pre code { |  | ||||||
|     background: unset; |  | ||||||
|     padding: 0; |  | ||||||
|     border-radius: 0; |  | ||||||
| } |  | ||||||
| /* ckeditor5-html-embed/theme/htmlembed.css */ |  | ||||||
| .ck-content .raw-html-embed { |  | ||||||
|     margin: 1em auto; |  | ||||||
|     min-width: 15em; |  | ||||||
|     font-style: normal; |  | ||||||
| } |  | ||||||
| /* ckeditor5-horizontal-line/theme/horizontalline.css */ | /* ckeditor5-horizontal-line/theme/horizontalline.css */ | ||||||
| .ck-content hr { | .ck-content hr { | ||||||
|     margin: 15px 0; |     margin: 15px 0; | ||||||
|  | @ -119,16 +149,42 @@ | ||||||
|     background: hsl(0, 0%, 87%); |     background: hsl(0, 0%, 87%); | ||||||
|     border: 0; |     border: 0; | ||||||
| } | } | ||||||
| /* ckeditor5-image/theme/imagecaption.css */ | /* ckeditor5-image/theme/image.css */ | ||||||
| .ck-content .image > figcaption { | .ck-content .image { | ||||||
|     display: table-caption; |     display: table; | ||||||
|     caption-side: bottom; |     clear: both; | ||||||
|     word-break: break-word; |     text-align: center; | ||||||
|     color: hsl(0, 0%, 20%); |     margin: 0.9em auto; | ||||||
|     background-color: hsl(0, 0%, 97%); |     min-width: 50px; | ||||||
|     padding: .6em; | } | ||||||
|     font-size: .75em; | /* ckeditor5-image/theme/image.css */ | ||||||
|     outline-offset: -1px; | .ck-content .image img { | ||||||
|  |     display: block; | ||||||
|  |     margin: 0 auto; | ||||||
|  |     max-width: 100%; | ||||||
|  |     min-width: 100%; | ||||||
|  | } | ||||||
|  | /* ckeditor5-image/theme/image.css */ | ||||||
|  | .ck-content .image-inline { | ||||||
|  |     /* | ||||||
|  |      * Normally, the .image-inline would have "display: inline-block" and "img { width: 100% }" (to follow the wrapper while resizing).; | ||||||
|  |      * Unfortunately, together with "srcset", it gets automatically stretched up to the width of the editing root. | ||||||
|  |      * This strange behavior does not happen with inline-flex. | ||||||
|  |      */ | ||||||
|  |     display: inline-flex; | ||||||
|  |     max-width: 100%; | ||||||
|  |     align-items: flex-start; | ||||||
|  | } | ||||||
|  | /* ckeditor5-image/theme/image.css */ | ||||||
|  | .ck-content .image-inline picture { | ||||||
|  |     display: flex; | ||||||
|  | } | ||||||
|  | /* ckeditor5-image/theme/image.css */ | ||||||
|  | .ck-content .image-inline picture, | ||||||
|  | .ck-content .image-inline img { | ||||||
|  |     flex-grow: 1; | ||||||
|  |     flex-shrink: 1; | ||||||
|  |     max-width: 100%; | ||||||
| } | } | ||||||
| /* ckeditor5-image/theme/imageresize.css */ | /* ckeditor5-image/theme/imageresize.css */ | ||||||
| .ck-content .image.image_resized { | .ck-content .image.image_resized { | ||||||
|  | @ -144,30 +200,6 @@ | ||||||
| .ck-content .image.image_resized > figcaption { | .ck-content .image.image_resized > figcaption { | ||||||
|     display: block; |     display: block; | ||||||
| } | } | ||||||
| /* ckeditor5-image/theme/image.css */ |  | ||||||
| .ck-content .image { |  | ||||||
|     display: table; |  | ||||||
|     clear: both; |  | ||||||
|     text-align: center; |  | ||||||
|     margin: 1em auto; |  | ||||||
| } |  | ||||||
| /* ckeditor5-image/theme/image.css */ |  | ||||||
| .ck-content .image img { |  | ||||||
|     display: block; |  | ||||||
|     margin: 0 auto; |  | ||||||
|     max-width: 100%; |  | ||||||
|     min-width: 50px; |  | ||||||
| } |  | ||||||
| /* ckeditor5-language/theme/language.css */ |  | ||||||
| .ck-content span[lang] { |  | ||||||
|     font-style: italic; |  | ||||||
| } |  | ||||||
| /* ckeditor5-basic-styles/theme/code.css */ |  | ||||||
| .ck-content code { |  | ||||||
|     background-color: hsla(0, 0%, 78%, 0.3); |  | ||||||
|     padding: .15em; |  | ||||||
|     border-radius: 2px; |  | ||||||
| } |  | ||||||
| /* ckeditor5-block-quote/theme/blockquote.css */ | /* ckeditor5-block-quote/theme/blockquote.css */ | ||||||
| .ck-content blockquote { | .ck-content blockquote { | ||||||
|     overflow: hidden; |     overflow: hidden; | ||||||
|  | @ -183,9 +215,27 @@ | ||||||
|     border-left: 0; |     border-left: 0; | ||||||
|     border-right: solid 5px hsl(0, 0%, 80%); |     border-right: solid 5px hsl(0, 0%, 80%); | ||||||
| } | } | ||||||
|  | /* ckeditor5-basic-styles/theme/code.css */ | ||||||
|  | .ck-content code { | ||||||
|  |     background-color: hsla(0, 0%, 78%, 0.3); | ||||||
|  |     padding: .15em; | ||||||
|  |     border-radius: 2px; | ||||||
|  | } | ||||||
|  | /* ckeditor5-table/theme/tablecaption.css */ | ||||||
|  | .ck-content .table > figcaption { | ||||||
|  |     display: table-caption; | ||||||
|  |     caption-side: top; | ||||||
|  |     word-break: break-word; | ||||||
|  |     text-align: center; | ||||||
|  |     color: var(--ck-color-table-caption-text); | ||||||
|  |     background-color: var(--ck-color-table-caption-background); | ||||||
|  |     padding: .6em; | ||||||
|  |     font-size: .75em; | ||||||
|  |     outline-offset: -1px; | ||||||
|  | } | ||||||
| /* ckeditor5-table/theme/table.css */ | /* ckeditor5-table/theme/table.css */ | ||||||
| .ck-content .table { | .ck-content .table { | ||||||
|     margin: 1em auto; |     margin: 0.9em auto; | ||||||
|     display: table; |     display: table; | ||||||
| } | } | ||||||
| /* ckeditor5-table/theme/table.css */ | /* ckeditor5-table/theme/table.css */ | ||||||
|  | @ -255,7 +305,7 @@ | ||||||
| /* ckeditor5-media-embed/theme/mediaembed.css */ | /* ckeditor5-media-embed/theme/mediaembed.css */ | ||||||
| .ck-content .media { | .ck-content .media { | ||||||
|     clear: both; |     clear: both; | ||||||
|     margin: 1em 0; |     margin: 0.9em 0; | ||||||
|     display: block; |     display: block; | ||||||
|     min-width: 15em; |     min-width: 15em; | ||||||
| } | } | ||||||
|  | @ -326,6 +376,30 @@ | ||||||
| .ck-content .todo-list .todo-list__label .todo-list__label__description { | .ck-content .todo-list .todo-list__label .todo-list__label__description { | ||||||
|     vertical-align: middle; |     vertical-align: middle; | ||||||
| } | } | ||||||
|  | /* ckeditor5-language/theme/language.css */ | ||||||
|  | .ck-content span[lang] { | ||||||
|  |     font-style: italic; | ||||||
|  | } | ||||||
|  | /* ckeditor5-code-block/theme/codeblock.css */ | ||||||
|  | .ck-content pre { | ||||||
|  |     padding: 1em; | ||||||
|  |     color: hsl(0, 0%, 20.8%); | ||||||
|  |     background: hsla(0, 0%, 78%, 0.3); | ||||||
|  |     border: 1px solid hsl(0, 0%, 77%); | ||||||
|  |     border-radius: 2px; | ||||||
|  |     text-align: left; | ||||||
|  |     direction: ltr; | ||||||
|  |     tab-size: 4; | ||||||
|  |     white-space: pre-wrap; | ||||||
|  |     font-style: normal; | ||||||
|  |     min-width: 200px; | ||||||
|  | } | ||||||
|  | /* ckeditor5-code-block/theme/codeblock.css */ | ||||||
|  | .ck-content pre code { | ||||||
|  |     background: unset; | ||||||
|  |     padding: 0; | ||||||
|  |     border-radius: 0; | ||||||
|  | } | ||||||
| /* ckeditor5-mention/theme/mention.css */ | /* ckeditor5-mention/theme/mention.css */ | ||||||
| .ck-content .mention { | .ck-content .mention { | ||||||
|     background: var(--ck-color-mention-background); |     background: var(--ck-color-mention-background); | ||||||
|  | @ -341,3 +415,4 @@ | ||||||
|         display: none; |         display: none; | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | 
 | ||||||
|  |  | ||||||
							
								
								
									
										2
									
								
								libraries/ckeditor/ckeditor.js
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								libraries/ckeditor/ckeditor.js
									
										
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
		Loading…
	
	Add table
		
		Reference in a new issue