diff --git a/apps/common/main/resources/less/combobox.less b/apps/common/main/resources/less/combobox.less
index 700a223e49..c2a7c5a8ac 100644
--- a/apps/common/main/resources/less/combobox.less
+++ b/apps/common/main/resources/less/combobox.less
@@ -13,10 +13,10 @@
font-size: @font-size-base;
line-height: @line-height-base;
- -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
- -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
- -moz-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
- transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+ -o-transition: none;
+ -webkit-transition: none;
+ -moz-transition: none;
+ transition: none;
border-top-right-radius: 2px !important;
border-bottom-right-radius: 2px !important;
@@ -59,6 +59,7 @@
}
.btn-default.disabled {
+ padding-right: 5px;
border-top-color: transparent;
border-bottom-color: transparent;
diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js
index 1e5c0283ab..8764f1e859 100644
--- a/apps/spreadsheeteditor/main/app/controller/Main.js
+++ b/apps/spreadsheeteditor/main/app/controller/Main.js
@@ -1619,10 +1619,14 @@ define([
config.msg = this.errorSetPassword;
break;
- case Asc.c_oAscError.ID.PivotGroup :
+ case Asc.c_oAscError.ID.PivotGroup:
config.msg = this.errorPivotGroup;
break;
+ case Asc.c_oAscError.ID.PasteMultiSelectError:
+ config.msg = this.errorPasteMultiSelect;
+ break;
+
default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break;
@@ -2837,7 +2841,8 @@ define([
txtMonths: 'Months',
txtQuarters: 'Quarters',
txtYears: 'Years',
- errorPivotGroup: 'Cannot group that selection.'
+ errorPivotGroup: 'Cannot group that selection.',
+ errorPasteMultiSelect: 'This action cannot be done on a multiple range selection.
Select a single range and try again.'
}
})(), SSE.Controllers.Main || {}))
});
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index 2a1c9719dc..2f68ecc779 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -921,6 +921,7 @@
"SSE.Controllers.Main.warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.
Contact %1 sales team for personal upgrade terms.",
"SSE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
"SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
+ "SSE.Controllers.Main.errorPasteMultiSelect": "This action cannot be done on a multiple range selection.
Select a single range and try again.",
"SSE.Controllers.Print.strAllSheets": "All Sheets",
"SSE.Controllers.Print.textFirstCol": "First column",
"SSE.Controllers.Print.textFirstRow": "First row",