From 92e56f78153b23e00bbfa68a1a7f9a1237f7493c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 19 Sep 2019 12:45:40 +0300 Subject: [PATCH 1/5] Fix Bug 42882 --- apps/common/main/resources/less/comments.less | 4 ++++ apps/common/main/resources/less/input.less | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less index 33a0e6c1c..ca3b3b5b4 100644 --- a/apps/common/main/resources/less/comments.less +++ b/apps/common/main/resources/less/comments.less @@ -187,6 +187,10 @@ &.user-select { cursor: text; } + &.user-select::selection { + background: #3494fb; + color: white; + } } .user-reply { diff --git a/apps/common/main/resources/less/input.less b/apps/common/main/resources/less/input.less index 60220b42f..a529b2ae2 100644 --- a/apps/common/main/resources/less/input.less +++ b/apps/common/main/resources/less/input.less @@ -80,3 +80,8 @@ input.error { input[type="password"] { font-size: 16px; } + +input[type="text"]::selection, textarea::selection { + background: #3494fb; + color: white; +} From 0153af839d3fbb184177114fa0dcd24a3bc7779c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 20 Sep 2019 13:33:35 +0300 Subject: [PATCH 2/5] [SSE] Fix autosum icon --- apps/common/main/resources/less/toolbar.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 76220cbc1..73006083d 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -520,7 +520,7 @@ .button-normal-icon(btn-watermark, 63, @toolbar-big-icon-size); .button-normal-icon(btn-color-schema, 64, @toolbar-big-icon-size); .button-normal-icon(btn-ins-formula, 65, @toolbar-big-icon-size); -.button-normal-icon(btn-autosumm, 66, @toolbar-big-icon-size); +.button-normal-icon(btn-autosum, 66, @toolbar-big-icon-size); .button-normal-icon(btn-recent, 67, @toolbar-big-icon-size); .button-normal-icon(btn-finance, 68, @toolbar-big-icon-size); .button-normal-icon(btn-logic, 69, @toolbar-big-icon-size); From 6f8950111853b13ff81d20fcac0f6f1940415153 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 25 Sep 2019 16:15:09 +0300 Subject: [PATCH 3/5] Fix Bug 42933 (fix rev.c823cb38fe55456f0c84886acfda459cba7cdf43, Bug 41193) --- apps/documenteditor/main/app/controller/Main.js | 2 +- apps/presentationeditor/main/app/controller/Main.js | 2 +- apps/spreadsheeteditor/main/app/controller/Main.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index aed29897b..c4ddc9092 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -237,7 +237,7 @@ define([ if (!e.relatedTarget || !/area_id/.test(e.target.id) && !(e.target.localName == 'input' && $(e.target).parent().find(e.relatedTarget).length>0) /* Check if focus in combobox goes from input to it's menu button or menu items, or from comment editing area to Ok/Cancel button */ - && !(e.target.localName == 'textarea' && $(e.target).closest('.asc-window').find(e.relatedTarget).length>0) /* Check if focus in comment goes from textarea to it's email menu */ + && !(e.target.localName == 'textarea' && $(e.target).closest('.asc-window').find('.dropdown-menu').find(e.relatedTarget).length>0) /* Check if focus in comment goes from textarea to it's email menu */ && (e.relatedTarget.localName != 'input' || !/form-control/.test(e.relatedTarget.className)) /* Check if focus goes to text input with class "form-control" */ && (e.relatedTarget.localName != 'textarea' || /area_id/.test(e.relatedTarget.id))) /* Check if focus goes to textarea, but not to "area_id" */ { if (Common.Utils.isIE && e.originalEvent && e.originalEvent.target && /area_id/.test(e.originalEvent.target.id) && (e.originalEvent.target === e.originalEvent.srcElement)) diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 20b123b3b..67c58fc25 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -215,7 +215,7 @@ define([ if (!e.relatedTarget || !/area_id/.test(e.target.id) && !(e.target.localName == 'input' && $(e.target).parent().find(e.relatedTarget).length>0) /* Check if focus in combobox goes from input to it's menu button or menu items, or from comment editing area to Ok/Cancel button */ - && !(e.target.localName == 'textarea' && $(e.target).closest('.asc-window').find(e.relatedTarget).length>0) /* Check if focus in comment goes from textarea to it's email menu */ + && !(e.target.localName == 'textarea' && $(e.target).closest('.asc-window').find('.dropdown-menu').find(e.relatedTarget).length>0) /* Check if focus in comment goes from textarea to it's email menu */ && (e.relatedTarget.localName != 'input' || !/form-control/.test(e.relatedTarget.className)) /* Check if focus goes to text input with class "form-control" */ && (e.relatedTarget.localName != 'textarea' || /area_id/.test(e.relatedTarget.id))) /* Check if focus goes to textarea, but not to "area_id" */ { if (Common.Utils.isIE && e.originalEvent && e.originalEvent.target && /area_id/.test(e.originalEvent.target.id) && (e.originalEvent.target === e.originalEvent.srcElement)) diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 8de80cf02..821dfc3a4 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -224,7 +224,7 @@ define([ if (!e.relatedTarget || !/area_id/.test(e.target.id) && !(e.target.localName == 'input' && $(e.target).parent().find(e.relatedTarget).length>0) /* Check if focus in combobox goes from input to it's menu button or menu items, or from comment editing area to Ok/Cancel button */ - && !(e.target.localName == 'textarea' && $(e.target).closest('.asc-window').find(e.relatedTarget).length>0) /* Check if focus in comment goes from textarea to it's email menu */ + && !(e.target.localName == 'textarea' && $(e.target).closest('.asc-window').find('.dropdown-menu').find(e.relatedTarget).length>0) /* Check if focus in comment goes from textarea to it's email menu */ && (e.relatedTarget.localName != 'input' || !/form-control/.test(e.relatedTarget.className)) /* Check if focus goes to text input with class "form-control" */ && (e.relatedTarget.localName != 'textarea' || /area_id/.test(e.relatedTarget.id))) /* Check if focus goes to textarea, but not to "area_id" */ { if (Common.Utils.isIE && e.originalEvent && e.originalEvent.target && /area_id/.test(e.originalEvent.target.id) && (e.originalEvent.target === e.originalEvent.srcElement)) From 03fb7e883c0bf44d0928879f987ca8917f7b4381 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 25 Sep 2019 16:18:38 +0300 Subject: [PATCH 4/5] [DE] Fix changing display mode for track changes (without plugins tab) --- apps/common/main/lib/view/Plugins.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/view/Plugins.js b/apps/common/main/lib/view/Plugins.js index 36c163b9b..0430cd768 100644 --- a/apps/common/main/lib/view/Plugins.js +++ b/apps/common/main/lib/view/Plugins.js @@ -190,7 +190,7 @@ define([ item.setDisabled(disable); }); - this.pluginsMask.css('display', disable ? 'block' : 'none'); + this.pluginsMask && this.pluginsMask.css('display', disable ? 'block' : 'none'); } }, From 3b82ac999d58354d6f57ae665247425970b4f21c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 26 Sep 2019 18:15:59 +0300 Subject: [PATCH 5/5] [SSE] Fix button icons (chat, comments) --- apps/spreadsheeteditor/main/resources/less/leftmenu.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index 7a666f012..8ceea12aa 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -11,8 +11,8 @@ } } -button.notify .btn-menu-chat {background-position: -0*@toolbar-icon-size -63*@toolbar-icon-size;} -button.notify .btn-menu-comments {background-position: -0*@toolbar-icon-size -60*@toolbar-icon-size;} +button.notify .btn-menu-chat {background-position: -0*@toolbar-icon-size -60*@toolbar-icon-size;} +button.notify .btn-menu-comments {background-position: -0*@toolbar-icon-size -2*@toolbar-icon-size;} .button-normal-icon(btn-menu-file, 61, @toolbar-icon-size); .button-normal-icon(btn-menu-search, 62, @toolbar-icon-size);