diff --git a/customize.dist/favicon.ico b/customize.dist/favicon.ico new file mode 100644 index 000000000..5541a6186 Binary files /dev/null and b/customize.dist/favicon.ico differ diff --git a/customize.dist/favicon/alt-favicon-code.ico b/customize.dist/favicon/alt-favicon-code.ico new file mode 100644 index 000000000..4ac11807b Binary files /dev/null and b/customize.dist/favicon/alt-favicon-code.ico differ diff --git a/customize.dist/favicon/alt-favicon-doc.ico b/customize.dist/favicon/alt-favicon-doc.ico new file mode 100644 index 000000000..ca711e170 Binary files /dev/null and b/customize.dist/favicon/alt-favicon-doc.ico differ diff --git a/customize.dist/favicon/alt-favicon-form.ico b/customize.dist/favicon/alt-favicon-form.ico new file mode 100644 index 000000000..b12e4eb00 Binary files /dev/null and b/customize.dist/favicon/alt-favicon-form.ico differ diff --git a/customize.dist/favicon/alt-favicon-kanban.ico b/customize.dist/favicon/alt-favicon-kanban.ico new file mode 100644 index 000000000..a15670c32 Binary files /dev/null and b/customize.dist/favicon/alt-favicon-kanban.ico differ diff --git a/customize.dist/favicon/alt-favicon-pad.ico b/customize.dist/favicon/alt-favicon-pad.ico new file mode 100644 index 000000000..6b4b5caeb Binary files /dev/null and b/customize.dist/favicon/alt-favicon-pad.ico differ diff --git a/customize.dist/favicon/alt-favicon-poll.ico b/customize.dist/favicon/alt-favicon-poll.ico new file mode 100644 index 000000000..b12e4eb00 Binary files /dev/null and b/customize.dist/favicon/alt-favicon-poll.ico differ diff --git a/customize.dist/favicon/alt-favicon-presentation.ico b/customize.dist/favicon/alt-favicon-presentation.ico new file mode 100644 index 000000000..0edd6d815 Binary files /dev/null and b/customize.dist/favicon/alt-favicon-presentation.ico differ diff --git a/customize.dist/favicon/alt-favicon-sheet.ico b/customize.dist/favicon/alt-favicon-sheet.ico new file mode 100644 index 000000000..c19083c29 Binary files /dev/null and b/customize.dist/favicon/alt-favicon-sheet.ico differ diff --git a/customize.dist/favicon/alt-favicon-slide.ico b/customize.dist/favicon/alt-favicon-slide.ico new file mode 100644 index 000000000..0619083c6 Binary files /dev/null and b/customize.dist/favicon/alt-favicon-slide.ico differ diff --git a/customize.dist/favicon/alt-favicon-whiteboard.ico b/customize.dist/favicon/alt-favicon-whiteboard.ico new file mode 100644 index 000000000..e46b2353e Binary files /dev/null and b/customize.dist/favicon/alt-favicon-whiteboard.ico differ diff --git a/customize.dist/favicon/alt-favicon.ico b/customize.dist/favicon/alt-favicon.ico new file mode 100644 index 000000000..0b55bc570 Binary files /dev/null and b/customize.dist/favicon/alt-favicon.ico differ diff --git a/customize.dist/favicon/main-favicon-code.ico b/customize.dist/favicon/main-favicon-code.ico new file mode 100644 index 000000000..c29c975bf Binary files /dev/null and b/customize.dist/favicon/main-favicon-code.ico differ diff --git a/customize.dist/favicon/main-favicon-doc.ico b/customize.dist/favicon/main-favicon-doc.ico new file mode 100644 index 000000000..07acc81a4 Binary files /dev/null and b/customize.dist/favicon/main-favicon-doc.ico differ diff --git a/customize.dist/favicon/main-favicon-form.ico b/customize.dist/favicon/main-favicon-form.ico new file mode 100644 index 000000000..ba44bf7bf Binary files /dev/null and b/customize.dist/favicon/main-favicon-form.ico differ diff --git a/customize.dist/favicon/main-favicon-kanban.ico b/customize.dist/favicon/main-favicon-kanban.ico new file mode 100644 index 000000000..a2e312a11 Binary files /dev/null and b/customize.dist/favicon/main-favicon-kanban.ico differ diff --git a/customize.dist/favicon/main-favicon-pad.ico b/customize.dist/favicon/main-favicon-pad.ico new file mode 100644 index 000000000..fdac69fd8 Binary files /dev/null and b/customize.dist/favicon/main-favicon-pad.ico differ diff --git a/customize.dist/favicon/main-favicon-poll.ico b/customize.dist/favicon/main-favicon-poll.ico new file mode 100644 index 000000000..ba44bf7bf Binary files /dev/null and b/customize.dist/favicon/main-favicon-poll.ico differ diff --git a/customize.dist/favicon/main-favicon-presentation.ico b/customize.dist/favicon/main-favicon-presentation.ico new file mode 100644 index 000000000..adffa135c Binary files /dev/null and b/customize.dist/favicon/main-favicon-presentation.ico differ diff --git a/customize.dist/favicon/main-favicon-sheet.ico b/customize.dist/favicon/main-favicon-sheet.ico new file mode 100644 index 000000000..306a1f862 Binary files /dev/null and b/customize.dist/favicon/main-favicon-sheet.ico differ diff --git a/customize.dist/favicon/main-favicon-slide.ico b/customize.dist/favicon/main-favicon-slide.ico new file mode 100644 index 000000000..c1817e307 Binary files /dev/null and b/customize.dist/favicon/main-favicon-slide.ico differ diff --git a/customize.dist/favicon/main-favicon-teams.ico b/customize.dist/favicon/main-favicon-teams.ico new file mode 100644 index 000000000..161e266e7 Binary files /dev/null and b/customize.dist/favicon/main-favicon-teams.ico differ diff --git a/customize.dist/favicon/main-favicon-whiteboard.ico b/customize.dist/favicon/main-favicon-whiteboard.ico new file mode 100644 index 000000000..f46466731 Binary files /dev/null and b/customize.dist/favicon/main-favicon-whiteboard.ico differ diff --git a/customize.dist/favicon/main-favicon.ico b/customize.dist/favicon/main-favicon.ico new file mode 100644 index 000000000..5541a6186 Binary files /dev/null and b/customize.dist/favicon/main-favicon.ico differ diff --git a/customize.dist/src/less2/include/drive.less b/customize.dist/src/less2/include/drive.less index 9311c4b62..4fea4e43a 100644 --- a/customize.dist/src/less2/include/drive.less +++ b/customize.dist/src/less2/include/drive.less @@ -291,7 +291,14 @@ margin-bottom: 3px; margin-left: -2px; } + .droppable-tree-element () { + .cp-app-drive-element-droppable { + background-color: @cp_drive-droppable-bg !important; + color: @cp_drive-droppable-fg !important; + } + } .cp-app-drive-tree-docs { + .droppable-tree-element(); margin-top: 15px; //padding: 0 0 0 20px; padding: 0; @@ -346,6 +353,7 @@ border-radius: @variables_radius; box-shadow: @cryptpad_ui_shadow; .cp-app-drive-tree-root { + .droppable-tree-element(); .fa-trash-o { padding-left: 2px; } diff --git a/www/code/index.html b/www/code/index.html index d82607880..6202e174f 100644 --- a/www/code/index.html +++ b/www/code/index.html @@ -9,6 +9,14 @@ + + diff --git a/www/common/notify.js b/www/common/notify.js index 729b27022..822c477fe 100644 --- a/www/common/notify.js +++ b/www/common/notify.js @@ -74,7 +74,6 @@ define(['/api/config'], function (ApiConfig) { return void console.error('document is not available in this context'); } console.debug("creating favicon"); - var fav = document.createElement('link'); var attrs = { id: 'favicon', type: 'image/png', @@ -83,10 +82,29 @@ define(['/api/config'], function (ApiConfig) { 'data-alt-favicon': DEFAULT_ALT, href: DEFAULT_MAIN, }; - Object.keys(attrs).forEach(function (k) { - fav.setAttribute(k, attrs[k]); - }); - document.head.appendChild(fav); + if(!document.getElementById("favicon")) { + var fav = document.createElement('link'); + Object.keys(attrs).forEach(function (k) { + fav.setAttribute(k, attrs[k]); + }); + document.head.appendChild(fav); + } + + if(!document.getElementById("favicon-ico")) { + var faviconLink = document.createElement('link'); + attrs.href = attrs.href.replaceAll(".png", ".ico"); + attrs.id = 'favicon-ico'; + attrs.type = 'image/x-icon'; + + delete attrs['data-main-favicon']; + delete attrs['data-alt-favicon']; + + Object.keys(attrs).forEach(function (k) { + faviconLink.setAttribute(k, attrs[k]); + }); + + document.head.appendChild(faviconLink); + } }; if (document && !document.getElementById('favicon')) { createFavicon(); } diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js index 9a7b8bb22..d6a1b24b4 100644 --- a/www/common/onlyoffice/inner.js +++ b/www/common/onlyoffice/inner.js @@ -2854,6 +2854,9 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null var $properties = common.createButton('properties', true); toolbar.$drawer.append($properties); + + var $copy = common.createButton('copy', true); + toolbar.$drawer.append($copy); }; var noCache = false; // Prevent reload loops diff --git a/www/doc/index.html b/www/doc/index.html index 782b55d09..138a3a7e8 100644 --- a/www/doc/index.html +++ b/www/doc/index.html @@ -9,6 +9,14 @@ + + diff --git a/www/form/index.html b/www/form/index.html index e5cef404e..576a5d22b 100644 --- a/www/form/index.html +++ b/www/form/index.html @@ -9,6 +9,14 @@ + + diff --git a/www/kanban/index.html b/www/kanban/index.html index e477e0577..5d99b18e3 100644 --- a/www/kanban/index.html +++ b/www/kanban/index.html @@ -9,6 +9,14 @@ + + diff --git a/www/pad/index.html b/www/pad/index.html index 5d80b8fad..5a77160c4 100644 --- a/www/pad/index.html +++ b/www/pad/index.html @@ -9,6 +9,14 @@ + + diff --git a/www/poll/index.html b/www/poll/index.html index e5cef404e..fccac63d2 100644 --- a/www/poll/index.html +++ b/www/poll/index.html @@ -9,6 +9,14 @@ + + diff --git a/www/presentation/index.html b/www/presentation/index.html index 782b55d09..907b072c0 100644 --- a/www/presentation/index.html +++ b/www/presentation/index.html @@ -9,6 +9,14 @@ + + diff --git a/www/sheet/index.html b/www/sheet/index.html index 782b55d09..c77cb7e25 100644 --- a/www/sheet/index.html +++ b/www/sheet/index.html @@ -9,6 +9,14 @@ + + diff --git a/www/slide/index.html b/www/slide/index.html index d82607880..c57d58856 100644 --- a/www/slide/index.html +++ b/www/slide/index.html @@ -9,6 +9,14 @@ + + diff --git a/www/teams/index.html b/www/teams/index.html index e5cef404e..23dd10546 100644 --- a/www/teams/index.html +++ b/www/teams/index.html @@ -9,6 +9,14 @@ + + diff --git a/www/whiteboard/index.html b/www/whiteboard/index.html index d82607880..3a4ea4b9c 100644 --- a/www/whiteboard/index.html +++ b/www/whiteboard/index.html @@ -9,6 +9,14 @@ + +