@ckeditor/ckeditor5-comments 49.0.1 → 49.1.0-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (84) hide show
  1. package/dist/comments/ui/view/basecommentthreadview.d.ts +16 -2
  2. package/dist/comments/ui/view/commentcontentview.d.ts +18 -0
  3. package/dist/comments/ui/view/commentthreadheaderview.d.ts +0 -10
  4. package/dist/comments/ui/view/commentthreadview.d.ts +6 -2
  5. package/dist/index-content.css +10 -4
  6. package/dist/index-editor.css +142 -95
  7. package/dist/index.css +152 -99
  8. package/dist/index.d.ts +1 -1
  9. package/dist/index.js +11 -11
  10. package/dist/translations/af.umd.js +1 -1
  11. package/dist/translations/ar.umd.js +1 -1
  12. package/dist/translations/ast.umd.js +1 -1
  13. package/dist/translations/az.umd.js +1 -1
  14. package/dist/translations/be.umd.js +1 -1
  15. package/dist/translations/bg.umd.js +1 -1
  16. package/dist/translations/bn.umd.js +1 -1
  17. package/dist/translations/bs.umd.js +1 -1
  18. package/dist/translations/ca.umd.js +1 -1
  19. package/dist/translations/cs.umd.js +1 -1
  20. package/dist/translations/da.umd.js +1 -1
  21. package/dist/translations/de-ch.umd.js +1 -1
  22. package/dist/translations/de.umd.js +1 -1
  23. package/dist/translations/el.umd.js +1 -1
  24. package/dist/translations/en-au.umd.js +1 -1
  25. package/dist/translations/en-gb.umd.js +1 -1
  26. package/dist/translations/en.umd.js +1 -1
  27. package/dist/translations/eo.umd.js +1 -1
  28. package/dist/translations/es-co.umd.js +1 -1
  29. package/dist/translations/es.umd.js +1 -1
  30. package/dist/translations/et.umd.js +1 -1
  31. package/dist/translations/eu.umd.js +1 -1
  32. package/dist/translations/fa.umd.js +1 -1
  33. package/dist/translations/fi.umd.js +1 -1
  34. package/dist/translations/fr.umd.js +1 -1
  35. package/dist/translations/gl.umd.js +1 -1
  36. package/dist/translations/gu.umd.js +1 -1
  37. package/dist/translations/he.umd.js +1 -1
  38. package/dist/translations/hi.umd.js +1 -1
  39. package/dist/translations/hr.umd.js +1 -1
  40. package/dist/translations/hu.umd.js +1 -1
  41. package/dist/translations/hy.umd.js +1 -1
  42. package/dist/translations/id.umd.js +1 -1
  43. package/dist/translations/it.umd.js +1 -1
  44. package/dist/translations/ja.umd.js +1 -1
  45. package/dist/translations/jv.umd.js +1 -1
  46. package/dist/translations/kk.umd.js +1 -1
  47. package/dist/translations/km.umd.js +1 -1
  48. package/dist/translations/kn.umd.js +1 -1
  49. package/dist/translations/ko.umd.js +1 -1
  50. package/dist/translations/ku.umd.js +1 -1
  51. package/dist/translations/lt.umd.js +1 -1
  52. package/dist/translations/lv.umd.js +1 -1
  53. package/dist/translations/ms.umd.js +1 -1
  54. package/dist/translations/nb.umd.js +1 -1
  55. package/dist/translations/ne.umd.js +1 -1
  56. package/dist/translations/nl.umd.js +1 -1
  57. package/dist/translations/no.umd.js +1 -1
  58. package/dist/translations/oc.umd.js +1 -1
  59. package/dist/translations/pl.umd.js +1 -1
  60. package/dist/translations/pt-br.umd.js +1 -1
  61. package/dist/translations/pt.umd.js +1 -1
  62. package/dist/translations/ro.umd.js +1 -1
  63. package/dist/translations/ru.umd.js +1 -1
  64. package/dist/translations/si.umd.js +1 -1
  65. package/dist/translations/sk.umd.js +1 -1
  66. package/dist/translations/sl.umd.js +1 -1
  67. package/dist/translations/sq.umd.js +1 -1
  68. package/dist/translations/sr-latn.umd.js +1 -1
  69. package/dist/translations/sr.umd.js +1 -1
  70. package/dist/translations/sv.umd.js +1 -1
  71. package/dist/translations/th.umd.js +1 -1
  72. package/dist/translations/ti.umd.js +1 -1
  73. package/dist/translations/tk.umd.js +1 -1
  74. package/dist/translations/tr.umd.js +1 -1
  75. package/dist/translations/tt.umd.js +1 -1
  76. package/dist/translations/ug.umd.js +1 -1
  77. package/dist/translations/uk.umd.js +1 -1
  78. package/dist/translations/ur.umd.js +1 -1
  79. package/dist/translations/uz.umd.js +1 -1
  80. package/dist/translations/vi.umd.js +1 -1
  81. package/dist/translations/zh-cn.umd.js +1 -1
  82. package/dist/translations/zh.umd.js +1 -1
  83. package/dist/utils/trimcontextvalue.d.ts +8 -1
  84. package/package.json +16 -16
@@ -55,9 +55,14 @@ export declare class BaseCommentThreadView extends View {
55
55
  */
56
56
  readonly commentsListView: CommentsListView;
57
57
  /**
58
- * The comment thread header. It should be used as a part of the view template.
59
- * This header is used only for resolved comment threads.
58
+ * The comment thread header.
60
59
  *
60
+ * **This property has been deprecated and will be removed in the future versions of CKEditor. The default
61
+ * {@link module:comments/comments/ui/view/commentthreadview~CommentThreadView comment thread view} does not render it.
62
+ * The comment thread context is displayed in the first comment and the reopen button is available as
63
+ * {@link module:comments/comments/ui/view/commentthreadview~CommentThreadView#reopenButton `CommentThreadView#reopenButton`}.**
64
+ *
65
+ * @deprecated
61
66
  * @readonly
62
67
  */
63
68
  readonly commentThreadHeaderView: CommentThreadHeaderView;
@@ -146,3 +151,12 @@ export type UIResolveCommentThreadEvent = {
146
151
  name: "resolveCommentThread";
147
152
  args: [id: string];
148
153
  };
154
+ /**
155
+ * Fired when a user performed an action that should lead to reopen the resolved comment thread.
156
+ *
157
+ * @eventName ~BaseCommentThreadView#reopenCommentThread
158
+ */
159
+ export type UIReopenCommentThreadEvent = {
160
+ name: "reopenCommentThread";
161
+ args: [id: string];
162
+ };
@@ -16,6 +16,24 @@ export declare class CommentContentView extends View {
16
16
  * @observable
17
17
  */
18
18
  contextValue: string | null;
19
+ /**
20
+ * Defines whether the comment thread is archived. The full {@link #contextValue} is then displayed in a tooltip
21
+ * when it does not fit in a single line.
22
+ *
23
+ * @observable
24
+ */
25
+ isThreadArchived: boolean;
26
+ /**
27
+ * Defines whether the comment thread is unlinked, that is, its commented content was removed from the document.
28
+ * The {@link #contextValue} is then displayed with an icon instead of the quote border.
29
+ *
30
+ * @observable
31
+ */
32
+ isThreadUnlinked: boolean;
19
33
  constructor(locale: Locale);
20
34
  override render(): void;
35
+ /**
36
+ * @inheritDoc
37
+ */
38
+ override destroy(): void;
21
39
  }
@@ -9,7 +9,6 @@ import { View, ButtonView, FocusCycler, type FocusableView, type ViewCollection
9
9
  import { FocusTracker, KeystrokeHandler, type Locale } from "@ckeditor/ckeditor5-utils";
10
10
  import type { CommentThread } from "../../commentsrepository.js";
11
11
  import { CommentThreadHeaderContextView } from "./commentthreadheadercontextview.js";
12
- export declare const MAX_CONTENT_LENGTH = 150;
13
12
  /**
14
13
  * A view for the comment thread header.
15
14
  */
@@ -65,12 +64,3 @@ export declare class CommentThreadHeaderView extends View implements FocusableVi
65
64
  */
66
65
  focus(): void;
67
66
  }
68
- /**
69
- * Fired when a user performed an action that should lead to reopen the resolved comment thread.
70
- *
71
- * @eventName ~CommentThreadHeaderView#reopenCommentThread
72
- */
73
- export type UIReopenCommentThreadEvent = {
74
- name: "reopenCommentThread";
75
- args: [id: string];
76
- };
@@ -38,8 +38,6 @@ export declare class CommentThreadView extends _CommentThreadViewBase implements
38
38
  *
39
39
  * These views are:
40
40
  *
41
- * * {@link ~CommentThreadView#commentThreadHeaderView `commentThreadHeaderView`} (added at the beginning when the comment thread is
42
- * resolved),
43
41
  * * {@link ~CommentThreadView#commentsListView `commentsListView`},
44
42
  * * {@link ~CommentThreadView#commentThreadInputView `commentThreadInputView`}.
45
43
  *
@@ -61,6 +59,12 @@ export declare class CommentThreadView extends _CommentThreadViewBase implements
61
59
  */
62
60
  readonly resolveButton: LateFocusButtonView;
63
61
  /**
62
+ * Reopen button view. Reopen button fires the 'reopenCommentThread' event when submitted.
63
+ *
64
+ * @readonly
65
+ */
66
+ readonly reopenButton: LateFocusButtonView;
67
+ /**
64
68
  * @inheritDoc
65
69
  */
66
70
  constructor(locale: Locale, model: CommentThread, localUser: User, config: CommentThreadConfig);
@@ -5,28 +5,34 @@
5
5
  :root, :host {
6
6
  --ck-comment-marker-color: #fdecc3;
7
7
  --ck-comment-marker-active-color: #fbd988;
8
+ --ck-comment-marker-border-width: 3px;
9
+ --ck-comment-marker-border-style: solid;
10
+ --ck-comment-marker-border-color: initial;
11
+ --ck-comment-marker-active-border-color: initial;
8
12
  }
9
13
 
10
14
  .ck-content .ck-comment-marker {
11
15
  background: var(--ck-color-comment-marker, var(--ck-comment-marker-color));
12
- border-top: 3px solid #0000;
13
- border-bottom: 3px solid #0000;
16
+ border-top: var(--ck-comment-marker-border-width) var(--ck-comment-marker-border-style) var(--ck-comment-marker-border-color, transparent);
17
+ border-bottom: var(--ck-comment-marker-border-width) var(--ck-comment-marker-border-style) var(--ck-comment-marker-border-color, transparent);
14
18
 
15
19
  &.ck-widget {
16
- border: 3px solid var(--ck-color-comment-marker, var(--ck-comment-marker-color));
20
+ border: var(--ck-comment-marker-border-width) var(--ck-comment-marker-border-style)
21
+ var(--ck-comment-marker-border-color, var(--ck-color-comment-marker, var(--ck-comment-marker-color)));
17
22
  background-color: #0000;
18
23
  }
19
24
  }
20
25
 
21
26
  .ck-content .ck-comment-marker--active {
22
27
  background: var(--ck-color-comment-marker-active, var(--ck-comment-marker-active-color));
28
+ border-color: var(--ck-comment-marker-active-border-color, var(--ck-comment-marker-border-color, transparent));
23
29
 
24
30
  & .ck-comment-marker {
25
31
  background: var(--ck-color-comment-marker-active, var(--ck-comment-marker-active-color));
26
32
  }
27
33
 
28
34
  &.ck-widget {
29
- border-color: var(--ck-color-comment-marker-active, var(--ck-comment-marker-active-color));
35
+ border-color: var(--ck-comment-marker-active-border-color, var(--ck-color-comment-marker-active, var(--ck-comment-marker-active-color)));
30
36
 
31
37
  & .ck-comment-marker {
32
38
  background-color: var(--ck-color-comment-marker, var(--ck-comment-marker-color));
@@ -4,7 +4,8 @@
4
4
  */
5
5
  :root, :host {
6
6
  --ck-comment-background-color: #f7f9fd;
7
- --ck-comment-focus-background-color: var(--ck-color-interactive-hover-surface);
7
+ --ck-comment-focus-border-color: var(--ck-interactive-focus-border-color);
8
+ --ck-comment-focus-shadow: var(--ck-interactive-focus-shadow);
8
9
  --ck-comment-separator-color: var(--ck-color-comment-separator, #cddeef);
9
10
  --ck-comment-remove-background-color: var(--ck-color-comment-remove-background, var(--ck-color-light-red));
10
11
  --ck-comment-input-background-color: var(--ck-color-surface-canvas);
@@ -12,6 +13,9 @@
12
13
  --ck-comment-content-font-size: var(--ck-font-size-md);
13
14
  --ck-comment-content-font-color: var(--ck-color-text);
14
15
  --ck-comment-context-border-color: var(--ck-color-base-attention);
16
+ --ck-comment-context-text-color: var(--ck-color-text-secondary);
17
+ --ck-comment-context-icon-size: calc(var(--ck-comment-content-font-size) * 16 / 14);
18
+ --ck-comment-context-tooltip-padding: var(--ck-spacing-padding-compact) var(--ck-spacing-padding);
15
19
  --ck-comment-thread-line-size: 1px;
16
20
  --ck-comment-border-radius: var(--ck-border-radius-surface);
17
21
  }
@@ -26,43 +30,42 @@
26
30
  transition: none;
27
31
  }
28
32
 
29
- &:first-of-type {
30
- border-top-right-radius: var(--ck-comment-border-radius);
31
- border-top-left-radius: var(--ck-comment-border-radius);
33
+ &:focus:before {
34
+ content: "";
35
+ inset: var(--ck-focus-shadow-spread);
36
+ border: 1px solid var(--ck-comment-focus-border-color);
37
+ border-radius: calc(var(--ck-comment-border-radius) - var(--ck-focus-shadow-spread));
38
+ box-shadow: var(--ck-comment-focus-shadow);
39
+ pointer-events: none;
40
+ z-index: 1;
41
+ position: absolute;
32
42
  }
43
+ }
33
44
 
34
- &:focus {
35
- background: var(--ck-comment-focus-background-color);
36
- }
45
+ .ck .ck-comment:after, .ck .ck-thread__comment-count:before {
46
+ content: "";
47
+ opacity: 1;
48
+ left: calc(var(--ck-spacing-standard, var(--ck-spacing-base)) + ( var(--ck-user-avatar-size) / 2 )
37
49
 
38
- &:has( + .ck-thread__comment-count) {
39
- & .ck-comment {
40
- &:after {
41
- height: calc(100% - var(--ck-user-avatar-size) - var(--ck-spacing-padding)
42
- + var(--ck-size-control-min-height) /* Comment count button height */);
43
- }
44
- }
45
- }
50
+ /* Half width of line. */
51
+ - calc(var(--ck-comment-thread-line-size) / 2)
52
+ /* Avatar margin size) */
53
+ + 2px);
54
+ width: var(--ck-comment-thread-line-size);
55
+ background-color: var(--ck-color-comment-separator, var(--ck-comment-separator-color));
56
+ border-radius: var(--ck-comment-border-radius);
57
+ display: block;
58
+ position: absolute;
46
59
  }
47
60
 
48
- .ck .ck-comment {
49
- &:after {
50
- content: "";
51
- opacity: 1;
52
- left: calc(var(--ck-spacing-standard, var(--ck-spacing-base)) + ( var(--ck-user-avatar-size) / 2 )
53
-
54
- /* Half width of line. */
55
- - calc(var(--ck-comment-thread-line-size) / 2)
56
- /* Avatar margin size) */
57
- + 2px);
58
- width: var(--ck-comment-thread-line-size);
59
- background-color: var(--ck-color-comment-separator, var(--ck-comment-separator-color));
60
- top: calc(var(--ck-user-avatar-size) + (2 * var(--ck-spacing-padding, var(--ck-spacing-sm))));
61
- height: calc(100% - var(--ck-user-avatar-size) - var(--ck-spacing-padding));
62
- border-radius: var(--ck-comment-border-radius);
63
- display: block;
64
- position: absolute;
65
- }
61
+ .ck .ck-comment:after {
62
+ top: calc(var(--ck-user-avatar-size) + (2 * var(--ck-spacing-padding, var(--ck-spacing-sm))));
63
+ height: calc(100% - var(--ck-user-avatar-size) - var(--ck-spacing-padding));
64
+ }
65
+
66
+ .ck .ck-thread__comment-count:before {
67
+ height: calc(100% + var(--ck-spacing-padding));
68
+ top: 0;
66
69
  }
67
70
 
68
71
  .ck .ck-comment--edit {
@@ -71,10 +74,6 @@
71
74
  &:after {
72
75
  opacity: 0;
73
76
  }
74
-
75
- & .ck-comment__input-actions {
76
- margin-top: var(--ck-spacing-standard, var(--ck-spacing-base));
77
- }
78
77
  }
79
78
 
80
79
  .ck .ck-comment__content {
@@ -87,7 +86,7 @@
87
86
  border-inline-start: 3px solid var(--ck-comment-context-border-color);
88
87
  margin-top: var(--ck-spacing-tiny, var(--ck-spacing-xs));
89
88
  margin-bottom: var(--ck-spacing-standard, var(--ck-spacing-base));
90
- color: var(--ck-color-base-text-light);
89
+ color: var(--ck-comment-context-text-color);
91
90
  padding-inline-start: var(--ck-spacing-standard, var(--ck-spacing-base));
92
91
 
93
92
  & > p {
@@ -95,9 +94,28 @@
95
94
  text-overflow: ellipsis;
96
95
  overflow: hidden;
97
96
  }
97
+
98
+ &.ck-comment__context_unlinked {
99
+ align-items: center;
100
+ gap: var(--ck-spacing-gap-compact);
101
+ border-inline-start: 0;
102
+ padding-inline-start: 0;
103
+ display: flex;
104
+
105
+ & > .ck-icon {
106
+ width: var(--ck-comment-context-icon-size);
107
+ height: var(--ck-comment-context-icon-size);
108
+ flex-shrink: 0;
109
+ }
110
+ }
98
111
  }
99
112
  }
100
113
 
114
+ .ck.ck-tooltip.ck-comment__context-tooltip {
115
+ --ck-tooltip-padding: var(--ck-comment-context-tooltip-padding);
116
+ --ck-tooltip-multiline-padding: 0;
117
+ }
118
+
101
119
  .ck .ck-comment--info {
102
120
  & .ck-comment__content {
103
121
  font-style: italic;
@@ -138,10 +156,6 @@
138
156
  flex-direction: column;
139
157
  display: flex;
140
158
  position: relative;
141
-
142
- & .ck-comment__input {
143
- padding: 0;
144
- }
145
159
  }
146
160
  }
147
161
 
@@ -150,17 +164,11 @@
150
164
  }
151
165
 
152
166
  .ck-comment__input-actions .ck.ck-button.ck-comment__input-actions--submit {
153
- color: #fff;
154
-
155
167
  &.ck-disabled {
156
168
  cursor: default;
157
169
  }
158
170
  }
159
171
 
160
- .ck-comment__input-actions .ck.ck-button.ck-comment__input-actions--cancel {
161
- color: var(--ck-color-text);
162
- }
163
-
164
172
  .ck .ck-comment__external {
165
173
  color: var(--ck-color-annotation-info, var(--ck-annotation-info-color));
166
174
  font-style: italic;
@@ -178,12 +186,12 @@
178
186
  margin: 0;
179
187
 
180
188
  & .ck-list__item {
181
- color: var(--ck-color-text);
182
189
  min-width: auto;
183
190
  font-size: 1.2em;
184
191
 
185
192
  & .ck-button {
186
- color: var(--ck-color-text);
193
+ --ck-button-default-text-color: inherit;
194
+ --_ck-button-fallback-text-color: var(--ck-color-text);
187
195
  }
188
196
  }
189
197
  }
@@ -191,7 +199,8 @@
191
199
 
192
200
  :root, :host {
193
201
  --ck-thread-remove-background-color: var(--ck-color-thread-remove-background, var(--ck-comment-remove-background-color));
194
- --ck-comment-count-color: #223047;
202
+ --ck-comment-count-color: var(--ck-color-text-secondary);
203
+ --ck-thread-focus-shadow: initial;
195
204
  --ck-thread-header-background-color: var(--ck-color-thread-header-background, #f3f6fd);
196
205
  --ck-thread-header-active-background-color: var(--ck-color-thread-header-active-background, var(--ck-color-interactive-selected-surface));
197
206
  --ck-thread-header-button-hover-background: var(--ck-color-interactive-primary-surface-muted);
@@ -222,13 +231,13 @@
222
231
 
223
232
  &:focus {
224
233
  outline: var(--ck-interactive-focus-ring);
225
- box-shadow: 0 0 0 4px var(--ck-color-focus-outer-shadow);
234
+ box-shadow: var(--ck-thread-focus-shadow, 0 0 0 4px var(--ck-color-focus-outer-shadow));
226
235
  }
227
236
  }
228
237
 
229
238
  .ck-balloon-panel:has(.ck-thread:focus) {
230
239
  border: var(--ck-interactive-focus-ring);
231
- box-shadow: var(--ck-shadow-surface-floating), var(--ck-focus-outer-shadow, var(--ck-interactive-focus-shadow)), 0 0;
240
+ box-shadow: var(--ck-drop-shadow, var(--ck-shadow-surface-floating)), var(--ck-focus-outer-shadow, var(--ck-interactive-focus-shadow)), 0 0;
232
241
  outline: none;
233
242
  }
234
243
 
@@ -307,15 +316,16 @@
307
316
  }
308
317
 
309
318
  .ck .ck-thread__comment-count {
310
- --ck-user-avatar-size: 28px;
319
+ --ck-user-avatar-size: var(--ck-annotation-user-avatar-size);
311
320
  padding-left: calc(var(--ck-user-avatar-size) + var(--ck-spacing-standard, var(--ck-spacing-base)) * 2);
312
- color: var(--ck-color-comment-count, var(--ck-color-base-text-light));
321
+ color: var(--ck-color-comment-count, var(--ck-comment-count-color));
313
322
  font-size: var(--ck-font-size-small, var(--ck-font-size-sm));
314
323
  cursor: pointer;
315
324
  transition: background-color var(--ck-transition-duration-control-emphasized) ease;
325
+ position: relative;
316
326
 
317
327
  & .ck-button {
318
- color: var(--ck-color-base-text-light);
328
+ color: var(--ck-color-comment-count, var(--ck-comment-count-color));
319
329
  }
320
330
 
321
331
  & .ck-button .ck-button__icon {
@@ -344,6 +354,10 @@
344
354
  opacity: 0;
345
355
  }
346
356
  }
357
+
358
+ & .ck-thread__comment-count:before {
359
+ opacity: 0;
360
+ }
347
361
  }
348
362
 
349
363
  .ck .ck-thread__comments .ck-comment__wrapper {
@@ -377,11 +391,15 @@
377
391
  }
378
392
 
379
393
  .ck .ck-thread__input {
380
- width: calc(100% - var(--ck-user-avatar-size));
381
394
  white-space: normal;
395
+ min-width: 0;
382
396
  transition: background-color var(--ck-transition-duration-control) ease-in-out;
383
397
  border-radius: var(--ck-thread-input-border-radius);
384
- min-height: 38px;
398
+ min-height: max(var(--ck-input-min-height-small),
399
+ calc(var(--ck-comment-content-font-size) * var(--ck-line-height-base) +
400
+ 2 * var(--ck-spacing-padding-tight) +
401
+ 2 * var(--ck-border-width-control)));
402
+ flex: 1 1 0;
385
403
  }
386
404
 
387
405
  .ck .ck-thread--active {
@@ -410,46 +428,58 @@
410
428
 
411
429
  :root, :host {
412
430
  --ck-comment-input-padding: var(--ck-spacing-padding) var(--ck-spacing-padding);
431
+ --ck-comment-input-container-background-color: transparent;
413
432
  }
414
433
 
415
434
  .ck .ck-comment__input-container {
416
- --ck-user-avatar-size: 28px;
435
+ --ck-user-avatar-size: var(--ck-annotation-user-avatar-size);
436
+ --ck-user-name-font-size: var(--ck-font-size-sm);
417
437
  font-size: var(--ck-font-size-normal, var(--ck-font-size-base));
418
438
  padding: var(--ck-comment-input-padding);
439
+ background-color: var(--ck-comment-input-container-background-color);
419
440
  display: none;
420
-
421
- & .ck-user {
422
- margin-top: calc(var(--ck-spacing-padding) * .8);
423
- }
424
441
  }
425
442
 
426
443
  .ck .ck-comment__input-container--active {
427
444
  align-items: flex-start;
445
+ gap: var(--ck-spacing-gap);
428
446
  display: flex;
447
+
448
+ & .ck-user {
449
+ margin-block: 0;
450
+ }
429
451
  }
430
452
 
431
453
  .ck .ck-comment__input {
432
- padding: var(--ck-comment-input-padding);
433
- color: var(--ck-color-text);
454
+ box-sizing: border-box;
455
+ min-height: var(--ck-input-min-height-small);
456
+ padding: var(--ck-comment-input-field-padding, var(--ck-input-padding-small));
457
+ color: var(--ck-color-input-text, var(--ck-input-text-color));
458
+ border: var(--ck-input-border);
459
+ border-radius: var(--ck-input-border-radius);
434
460
  resize: none;
435
- transition: color var(--ck-transition-duration-control-emphasized) ease-in-out;
436
- background-color: #0000;
437
- border-width: 0;
461
+ background-color: var(--ck-color-input-background, var(--ck-input-background-color));
462
+ transition: var(--ck-transition-control-fast);
438
463
 
439
464
  @media (prefers-reduced-motion: reduce) {
440
- transition: none;
465
+ transition: var(--ck-transition-none);
441
466
  }
442
467
 
443
468
  &:focus {
444
469
  outline: none;
445
470
  }
446
471
 
472
+ &:focus-within {
473
+ border-color: var(--ck-input-focus-border-color);
474
+ box-shadow: var(--ck-focus-outer-shadow, var(--ck-interactive-focus-shadow)), 0 0;
475
+ }
476
+
447
477
  & .ck-editor__editable_inline {
448
- --ck-focus-ring: none;
449
478
  --ck-inner-shadow: none;
450
479
  --ck-inset-shadow-sm: none;
451
480
  font-family: var(--ck-comment-content-font-family);
452
481
  font-size: var(--ck-comment-content-font-size);
482
+ line-height: var(--ck-line-height-base);
453
483
  color: var(--ck-comment-content-font-color);
454
484
  word-break: normal;
455
485
  overflow-wrap: anywhere;
@@ -457,6 +487,11 @@
457
487
  border: 0;
458
488
  padding: 0;
459
489
  overflow: visible;
490
+
491
+ & p {
492
+ line-height: inherit;
493
+ padding: 0;
494
+ }
460
495
  }
461
496
  }
462
497
 
@@ -469,8 +504,10 @@
469
504
  }
470
505
 
471
506
  .ck .ck-comment__input-actions {
472
- text-align: right;
473
507
  width: 100%;
508
+ margin-top: var(--ck-spacing-gap);
509
+ text-align: right;
510
+ line-height: 0;
474
511
  display: none;
475
512
 
476
513
  &.ck-comment__input-actions--active {
@@ -479,14 +516,9 @@
479
516
 
480
517
  & .ck.ck-button {
481
518
  cursor: pointer;
482
- min-height: var(--ck-ui-component-min-height, var(--ck-size-min-height));
483
- min-width: 60px;
484
- font-size: var(--ck-annotation-button-size);
485
- margin-left: var(--ck-spacing-large, var(--ck-spacing-lg));
486
- padding: 0 var(--ck-spacing-control-padding-inline);
487
- justify-content: center;
488
- align-items: center;
489
- display: inline-flex;
519
+ margin-left: var(--ck-spacing-gap);
520
+ --ck-button-default-text-color: inherit;
521
+ --_ck-button-fallback-text-color: var(--ck-color-text);
490
522
  }
491
523
  }
492
524
 
@@ -538,9 +570,10 @@
538
570
  --ck-annotation-counter-badge-top: 1px;
539
571
  --ck-annotation-counter-badge-gap: 1px;
540
572
  --ck-annotation-counter-badge-size: var(--ck-annotation-counter-icon-font-size);
541
- --ck-annotation-counter-color: var(--ck-color-base-text-light);
542
- --ck-annotation-counter-hover-color: var(--ck-color-base-text);
543
- --ck-annotation-counter-focus-color: var(--ck-color-base-active);
573
+ --ck-annotation-counter-color: var(--ck-color-text-secondary);
574
+ --ck-annotation-counter-hover-color: var(--ck-color-text-primary);
575
+ --ck-annotation-counter-focus-color: var(--ck-color-interactive-selected-text);
576
+ --ck-annotation-counter-badge-text-color: var(--ck-color-text-inverse);
544
577
  }
545
578
 
546
579
  .ck.ck-sidebar--narrow .ck-sidebar-item {
@@ -590,7 +623,7 @@
590
623
  width: var(--ck-annotation-counter-badge-size);
591
624
  height: var(--ck-annotation-counter-badge-size);
592
625
  background: var(--ck-annotation-counter-color);
593
- color: #fff;
626
+ color: var(--ck-annotation-counter-badge-text-color);
594
627
  font-weight: bold;
595
628
  font-size: var(--ck-annotation-counter-number-size);
596
629
  font-family: var(--ck-font-face, var(--ck-font-family));
@@ -615,8 +648,10 @@
615
648
  --ck-annotation-info-name-color: var(--ck-color-text);
616
649
  --ck-annotation-info-icon-color: var(--ck-color-text-secondary);
617
650
  --ck-annotation-info-time-color: var(--ck-color-text-secondary);
651
+ --ck-annotation-content-font-color: var(--ck-comment-content-font-color);
618
652
  --ck-annotation-button-size: .85em;
619
653
  --ck-annotation-dropdown-button-size: 14px;
654
+ --ck-annotation-user-avatar-size: 28px;
620
655
  --ck-annotation-padding: var(--ck-spacing-padding) var(--ck-spacing-padding);
621
656
  --ck-annotation-content-wrapper-padding-inline-end: var(--ck-spacing-padding);
622
657
  --ck-annotation-main-border-radius: var(--ck-border-radius-surface);
@@ -624,7 +659,8 @@
624
659
  }
625
660
 
626
661
  .ck .ck-annotation {
627
- --ck-user-avatar-size: 28px;
662
+ --ck-user-avatar-size: var(--ck-annotation-user-avatar-size);
663
+ --ck-user-name-font-size: var(--ck-font-size-sm);
628
664
  font-size: var(--ck-font-size-normal, var(--ck-font-size-base));
629
665
  animation: annotationFadeInLeft var(--ck-animation-duration-surface-entrance);
630
666
  transition: background-color var(--ck-transition-duration-control-emphasized) ease;
@@ -639,18 +675,17 @@
639
675
  }
640
676
 
641
677
  & .ck-button {
642
- min-width: unset;
643
- min-height: unset;
644
- color: var(--ck-color-annotation-icon, var(--ck-annotation-icon-color));
678
+ --ck-button-default-text-color: var(--ck-color-annotation-icon, var(--ck-annotation-icon-color));
645
679
  border-radius: var(--ck-annotation-button-border-radius);
646
680
 
647
681
  &:not(.ck-disabled) {
648
682
  cursor: pointer;
649
683
  }
650
- }
651
684
 
652
- & .ck-user {
653
- font-size: 12px;
685
+ &:not(.ck-button_small) {
686
+ min-width: unset;
687
+ min-height: unset;
688
+ }
654
689
  }
655
690
 
656
691
  & .ck-dropdown .ck-list {
@@ -682,11 +717,13 @@
682
717
  .ck .ck-annotation__main p {
683
718
  white-space: normal;
684
719
  font-size: var(--ck-comment-content-font-size);
720
+ color: inherit;
685
721
  margin: 0;
686
722
  line-height: 1.5em;
687
723
 
688
724
  & .ck-suggestion-type {
689
725
  font-size: var(--ck-comment-content-font-size);
726
+ color: inherit;
690
727
  line-height: 1.5em;
691
728
  }
692
729
  }
@@ -748,10 +785,11 @@
748
785
  }
749
786
 
750
787
  .ck .ck-annotation__content-wrapper {
751
- grid-area: content;
752
788
  width: 100%;
789
+ color: var(--ck-annotation-content-font-color);
790
+ grid-area: content;
753
791
 
754
- &:not(:has(.ck-comment__input-wrapper)), & .ck-comment__input-wrapper .ck-comment__input {
792
+ &:not(:has(.ck-comment__input-wrapper)) {
755
793
  padding-inline-end: var(--ck-annotation-content-wrapper-padding-inline-end);
756
794
  }
757
795
  }
@@ -769,9 +807,12 @@
769
807
  }
770
808
 
771
809
  :root, :host {
772
- --ck-annotation-wrapper-background-color: var(--ck-color-annotation-wrapper-background, #fff);
773
- --ck-annotation-wrapper-shadow: var(--ck-color-annotation-wrapper-drop-shadow, 0 1px 1px 1px #e6e6e6);
810
+ --ck-annotation-wrapper-background-color: var(--ck-color-annotation-wrapper-background, var(--ck-color-surface-container));
811
+ --ck-annotation-wrapper-shadow: var(--ck-color-annotation-wrapper-drop-shadow, none);
774
812
  --ck-annotation-wrapper-border-radius: var(--ck-border-radius-surface);
813
+ --ck-annotation-wrapper-border: var(--ck-border-surface);
814
+ --ck-annotation-wrapper-active-border: initial;
815
+ --ck-annotation-wrapper-active-shadow: initial;
775
816
  }
776
817
 
777
818
  .ck.ck-sidebar {
@@ -801,10 +842,16 @@
801
842
  .ck.ck-annotation-wrapper {
802
843
  border-radius: var(--ck-annotation-wrapper-border-radius);
803
844
  background: var(--ck-color-annotation-wrapper-background, var(--ck-annotation-wrapper-background-color));
804
- border: var(--ck-border-surface);
845
+ border: var(--ck-annotation-wrapper-border);
846
+ box-shadow: var(--ck-color-annotation-wrapper-drop-shadow, var(--ck-annotation-wrapper-shadow));
805
847
  outline: 0;
806
848
  }
807
849
 
850
+ :where(.ck-sidebar) .ck.ck-annotation-wrapper--active {
851
+ border: var(--ck-annotation-wrapper-active-border, var(--ck-annotation-wrapper-border));
852
+ box-shadow: var(--ck-annotation-wrapper-active-shadow, var(--ck-color-annotation-wrapper-drop-shadow, var(--ck-annotation-wrapper-shadow)));
853
+ }
854
+
808
855
  .ck.ck-annotation-wrapper--active, .ck.ck-annotation-wrapper:hover {
809
856
  & .ck-annotation__actions {
810
857
  opacity: 1;