Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/desktop-new

Browse source
This commit is contained in:
Maxim Kadushkin 2018-02-23 00:21:35 +03:00
parent 39f29c5ef8 0773d58274
commit 691e57181d
5 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/documenteditor/main/locale/en.json
View file

@ -231,6 +231,7 @@
"Common.Views.ReviewChanges.txtAcceptAll": "Accept All Changes",
"Common.Views.ReviewChanges.txtAcceptChanges": "Accept changes",
"Common.Views.ReviewChanges.txtAcceptCurrent": "Accept Current Change",
"Common.Views.ReviewChanges.txtChat": "Chat",
"Common.Views.ReviewChanges.txtClose": "Close",
"Common.Views.ReviewChanges.txtCoAuthMode": "Co-editing Mode",
"Common.Views.ReviewChanges.txtDocLang": "Language",

1
apps/presentationeditor/main/locale/en.json
View file

@ -163,6 +163,7 @@
"Common.Views.ReviewChanges.txtAcceptAll": "Accept All Changes",
"Common.Views.ReviewChanges.txtAcceptChanges": "Accept changes",
"Common.Views.ReviewChanges.txtAcceptCurrent": "Accept Current Change",
"Common.Views.ReviewChanges.txtChat": "Chat",
"Common.Views.ReviewChanges.txtClose": "Close",
"Common.Views.ReviewChanges.txtCoAuthMode": "Co-editing Mode",
"Common.Views.ReviewChanges.txtDocLang": "Language",

2
apps/spreadsheeteditor/main/app/view/CellEditor.js
View file

@ -74,7 +74,7 @@ define([
});
this.btnNamedRanges.render($('#ce-cell-name-menu'));
this.btnNamedRanges.setVisible(false);
this.btnNamedRanges.menu.setOffset(-52);
this.btnNamedRanges.menu.setOffset(-81);
this.$cellname = $('#ce-cell-name', this.el);
this.$btnexpand = $('#ce-btn-expand', this.el);

1
apps/spreadsheeteditor/main/locale/en.json
View file

@ -150,6 +150,7 @@
"Common.Views.ReviewChanges.txtAcceptAll": "Accept All Changes",
"Common.Views.ReviewChanges.txtAcceptChanges": "Accept changes",
"Common.Views.ReviewChanges.txtAcceptCurrent": "Accept Current Change",
"Common.Views.ReviewChanges.txtChat": "Chat",
"Common.Views.ReviewChanges.txtClose": "Close",
"Common.Views.ReviewChanges.txtCoAuthMode": "Co-editing Mode",
"Common.Views.ReviewChanges.txtDocLang": "Language",

8
apps/spreadsheeteditor/main/resources/less/celleditor.less
View file

@ -11,9 +11,9 @@
background-color: @gray-light;
#ce-cell-name {
width: 70px;
width: 100px;
height: 19px;
padding: 0px 16px 0 4px;
padding: 0px 19px 0 4px;
vertical-align: top;
display: inline-block;
border: 0 none;
@ -30,7 +30,7 @@
#ce-cell-name-menu {
display: inline-block;
position: absolute;
left: 50px;
left: 80px;
background-color: @gray-light;
button {
@ -87,7 +87,7 @@
.ce-group-content {
padding-left: 1px;
margin: 0 16px 0 90px;
margin: 0 16px 0 120px;
height: 100%;
border-left: 1px solid @gray-dark;