diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 3990d166e7..15f8bbd223 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -12,7 +12,7 @@ "@gatsbyjs/reach-router": "1.3.9", "@seafile/react-image-lightbox": "2.0.2", "@seafile/resumablejs": "1.1.16", - "@seafile/sdoc-editor": "0.3.22", + "@seafile/sdoc-editor": "0.3.23", "@seafile/seafile-calendar": "0.0.12", "@seafile/seafile-editor": "0.4.8", "@uiw/codemirror-extensions-langs": "^4.19.4", @@ -4616,9 +4616,9 @@ "integrity": "sha512-8rBbmAEuuwOAGHYGCtEzpx+bxAcGS+V30otMmhRe7bPAdh4E57RWgCa8x7pkzHGFlY1t5d+ILz1gojvPVMYQig==" }, "node_modules/@seafile/sdoc-editor": { - "version": "0.3.22", - "resolved": "https://registry.npmjs.org/@seafile/sdoc-editor/-/sdoc-editor-0.3.22.tgz", - "integrity": "sha512-qAbbhLFZjwh/DdLxWrS/xFB2rJMGvmemokq2wr3g44IE0Gq/t/s2y0SXK4l0ubBjJqs+U18MK+6qL/ywA/VMUw==", + "version": "0.3.23", + "resolved": "https://registry.npmjs.org/@seafile/sdoc-editor/-/sdoc-editor-0.3.23.tgz", + "integrity": "sha512-J1LAV2dEoZFkLG1Wjluen8ERkBFISPY/TAEnLXrjWoVxX/8cknab/jzCcRwyirtPhSar3DQ03P4OE0dzu/tVMg==", "dependencies": { "@seafile/react-image-lightbox": "2.0.4", "@seafile/slate": "0.91.8", @@ -29850,9 +29850,9 @@ "integrity": "sha512-8rBbmAEuuwOAGHYGCtEzpx+bxAcGS+V30otMmhRe7bPAdh4E57RWgCa8x7pkzHGFlY1t5d+ILz1gojvPVMYQig==" }, "@seafile/sdoc-editor": { - "version": "0.3.22", - "resolved": "https://registry.npmjs.org/@seafile/sdoc-editor/-/sdoc-editor-0.3.22.tgz", - "integrity": "sha512-qAbbhLFZjwh/DdLxWrS/xFB2rJMGvmemokq2wr3g44IE0Gq/t/s2y0SXK4l0ubBjJqs+U18MK+6qL/ywA/VMUw==", + "version": "0.3.23", + "resolved": "https://registry.npmjs.org/@seafile/sdoc-editor/-/sdoc-editor-0.3.23.tgz", + "integrity": "sha512-J1LAV2dEoZFkLG1Wjluen8ERkBFISPY/TAEnLXrjWoVxX/8cknab/jzCcRwyirtPhSar3DQ03P4OE0dzu/tVMg==", "requires": { "@seafile/react-image-lightbox": "2.0.4", "@seafile/slate": "0.91.8", diff --git a/frontend/package.json b/frontend/package.json index c674a80d16..bfe6621ac9 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -7,7 +7,7 @@ "@gatsbyjs/reach-router": "1.3.9", "@seafile/react-image-lightbox": "2.0.2", "@seafile/resumablejs": "1.1.16", - "@seafile/sdoc-editor": "0.3.22", + "@seafile/sdoc-editor": "0.3.23", "@seafile/seafile-calendar": "0.0.12", "@seafile/seafile-editor": "0.4.8", "@uiw/codemirror-extensions-langs": "^4.19.4", diff --git a/media/sdoc-editor/sdoc-editor-font.css b/media/sdoc-editor/sdoc-editor-font.css index b32ad94daf..c1e0b8eef7 100644 --- a/media/sdoc-editor/sdoc-editor-font.css +++ b/media/sdoc-editor/sdoc-editor-font.css @@ -1,11 +1,11 @@ @font-face { font-family: "sdocfont"; /* Project id 4097705 */ - src: url('./sdoc-editor-font/iconfont.eot?t=1700642464361'); /* IE9 */ - src: url('./sdoc-editor-font/iconfont.eot?t=1700642464361#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('./sdoc-editor-font/iconfont.woff2?t=1700642464361') format('woff2'), - url('./sdoc-editor-font/iconfont.woff?t=1700642464361') format('woff'), - url('./sdoc-editor-font/iconfont.ttf?t=1700642464361') format('truetype'), - url('./sdoc-editor-font/iconfont.svg?t=1700642464361#sdocfont') format('svg'); + src: url('./sdoc-editor-font/iconfont.eot?t=1702000194437'); /* IE9 */ + src: url('./sdoc-editor-font/iconfont.eot?t=1702000194437#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('./sdoc-editor-font/iconfont.woff2?t=1702000194437') format('woff2'), + url('./sdoc-editor-font/iconfont.woff?t=1702000194437') format('woff'), + url('./sdoc-editor-font/iconfont.ttf?t=1702000194437') format('truetype'), + url('./sdoc-editor-font/iconfont.svg?t=1702000194437#sdocfont') format('svg'); } .sdocfont { @@ -16,8 +16,12 @@ -moz-osx-font-smoothing: grayscale; } -.sdoc-selected-text:before { - content: "\e65e"; +.sdoc-comment-quote:before { + content: "\e660"; +} + +.sdoc-find-replace:before { + content: "\e65f"; } .sdoc-freezed:before { @@ -36,10 +40,6 @@ content: "\e65b"; } -.sdoc-notification:before { - content: "\e65a"; -} - .sdoc-add:before { content: "\e658"; } @@ -391,3 +391,4 @@ .sdoc-user:before { content: "\e629"; } + diff --git a/media/sdoc-editor/sdoc-editor-font/iconfont.eot b/media/sdoc-editor/sdoc-editor-font/iconfont.eot index a939d5127a..2639db2272 100644 Binary files a/media/sdoc-editor/sdoc-editor-font/iconfont.eot and b/media/sdoc-editor/sdoc-editor-font/iconfont.eot differ diff --git a/media/sdoc-editor/sdoc-editor-font/iconfont.svg b/media/sdoc-editor/sdoc-editor-font/iconfont.svg index 25af4d628e..ee4598043a 100644 --- a/media/sdoc-editor/sdoc-editor-font/iconfont.svg +++ b/media/sdoc-editor/sdoc-editor-font/iconfont.svg @@ -14,24 +14,18 @@ /> -<<<<<<< HEAD - + + + -======= -<<<<<<< HEAD ->>>>>>> 4ad4d178 (feat: change icon) -======= ->>>>>>> 0183ac39 (feat: change icon) - - diff --git a/media/sdoc-editor/sdoc-editor-font/iconfont.ttf b/media/sdoc-editor/sdoc-editor-font/iconfont.ttf index b14d9a48ef..2d67813278 100644 Binary files a/media/sdoc-editor/sdoc-editor-font/iconfont.ttf and b/media/sdoc-editor/sdoc-editor-font/iconfont.ttf differ diff --git a/media/sdoc-editor/sdoc-editor-font/iconfont.woff b/media/sdoc-editor/sdoc-editor-font/iconfont.woff index e223e68b4d..4be0cd6aca 100644 Binary files a/media/sdoc-editor/sdoc-editor-font/iconfont.woff and b/media/sdoc-editor/sdoc-editor-font/iconfont.woff differ diff --git a/media/sdoc-editor/sdoc-editor-font/iconfont.woff2 b/media/sdoc-editor/sdoc-editor-font/iconfont.woff2 index 03ac9ad318..4e5ecbcca6 100644 Binary files a/media/sdoc-editor/sdoc-editor-font/iconfont.woff2 and b/media/sdoc-editor/sdoc-editor-font/iconfont.woff2 differ