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

[mobile] Comments (remove textarea border, increased font, remove tabs animation, add placeholder, changed modal window of delete comment draft)

Browse source
This commit is contained in:
JuliaSvinareva 2020-05-07 19:28:58 +03:00
parent add8ec8621
commit b944ddccfc
32 changed files with 143 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/mobile/lib/view/Collaboration.js
View file

@ -355,7 +355,7 @@ define([
'<div class="user-name">' + name + '</div>' + '<div class="user-name">' + name + '</div>' +
'<div class="comment-date">' + date + '</div>' + '<div class="comment-date">' + date + '</div>' +
(isAndroid ? '</div></div>' : '') + (isAndroid ? '</div></div>' : '') +
'<div><textarea class="reply-textarea">' + '</textarea></div>' + '<div><textarea class="reply-textarea" placeholder="' + this.textAddReply + '"></textarea></div>' +
'</div>' + '</div>' +
'</div>' + '</div>' +
'</div>' + '</div>' +

19
apps/common/mobile/resources/less/ios/_collaboration.less
View file

@ -126,7 +126,7 @@
font-weight: bold; font-weight: bold;
} }
.comment-date, .reply-date { .comment-date, .reply-date {
font-size: 12px; font-size: 13px;
line-height: 18px; line-height: 18px;
color: #6d6d72; color: #6d6d72;
margin: 0; margin: 0;
@ -184,8 +184,8 @@
background:transparent; background:transparent;
outline:none; outline:none;
width: 100%; width: 100%;
font-size: 15px; font-size: 17px;
border: 1px solid #c4c4c4; border: none;
border-radius: 3px; border-radius: 3px;
min-height: 100px; min-height: 100px;
} }
@ -354,20 +354,29 @@
} }
.user-name { .user-name {
font-weight: bold; font-weight: bold;
font-size: 17px;
padding-left: 5px;
} }
.comment-date { .comment-date {
font-size: 12px; font-size: 13px;
color: #6d6d72; color: #6d6d72;
padding-left: 5px;
} }
.wrap-textarea { .wrap-textarea {
margin-top: 16px; margin-top: 16px;
padding-right: 6px; padding-right: 6px;
.comment-textarea { .comment-textarea {
border: 1px solid #c4c4c4; font-size: 17px;
border: none;
margin-top: 0; margin-top: 0;
min-height: 100px; min-height: 100px;
border-radius: 4px; border-radius: 4px;
width: 100%; width: 100%;
padding-left: 5px;
&::placeholder {
color: @gray;
font-size: 17px;
}
} }
} }
} }

10
apps/common/mobile/resources/less/material/_collaboration.less
View file

@ -378,20 +378,26 @@
justify-content: flex-start; justify-content: flex-start;
} }
.user-name { .user-name {
font-size: 17px;
font-weight: bold; font-weight: bold;
} }
.comment-date { .comment-date {
font-size: 12px; font-size: 13px;
color: #6d6d72; color: #6d6d72;
} }
.wrap-textarea { .wrap-textarea {
margin-top: 16px; margin-top: 16px;
padding-right: 6px; padding-right: 6px;
.comment-textarea { .comment-textarea {
border: 1px solid #c4c4c4; font-size: 17px;
border: none;
margin-top: 0; margin-top: 0;
min-height: 100px; min-height: 100px;
border-radius: 4px; border-radius: 4px;
&::placeholder {
color: @gray;
font-size: 17px;
}
} }
} }
} }

7
apps/documenteditor/mobile/app/controller/add/AddContainer.js
View file

@ -75,7 +75,7 @@ define([
uiApp.closeModal(); uiApp.closeModal();
me._showByStack(Common.SharedSettings.get('phone')); me._showByStack(Common.SharedSettings.get('phone'));
//uiApp.showTab('#add-other'); uiApp.showTab('#add-other');
DE.getController('Toolbar').getView('Toolbar').hideSearch(); DE.getController('Toolbar').getView('Toolbar').hideSearch();
}, },
@ -184,10 +184,7 @@ define([
var $layoutPages = $( var $layoutPages = $(
'<div class="pages">' + '<div class="pages">' +
'<div class="page" data-page="index">' + '<div class="page" data-page="index">' +
'<div class="page-content">' + '<div class="page-content tabs">' +
'<div class="tabs-animated-wrap">' +
'<div class="tabs"></div>' +
'</div>' +
'</div>' + '</div>' +
'</div>' + '</div>' +
'</div>' '</div>'

8
apps/documenteditor/mobile/app/controller/add/AddOther.js
View file

@ -179,7 +179,8 @@ define([
text: this.textCancel text: this.textCancel
}, },
{ {
text: this.textContinue, text: this.textDelete,
bold: true,
onClick: function () { onClick: function () {
DE.getController('AddContainer').rootView.router.back(); DE.getController('AddContainer').rootView.router.back();
} }
@ -188,7 +189,7 @@ define([
} else { } else {
DE.getController('AddContainer').rootView.router.back(); DE.getController('AddContainer').rootView.router.back();
} }
}, this)) }, this));
} }
}, },
@ -457,7 +458,8 @@ define([
textBelowText: 'Below Text', textBelowText: 'Below Text',
textDeleteDraft: 'Do you really want to delete draft?', textDeleteDraft: 'Do you really want to delete draft?',
textCancel: 'Cancel', textCancel: 'Cancel',
textContinue: 'Continue' //textContinue: 'Continue',
textDelete: 'Delete'
} }
})(), DE.Controllers.AddOther || {})) })(), DE.Controllers.AddOther || {}))

5
apps/documenteditor/mobile/app/controller/edit/EditContainer.js
View file

@ -238,10 +238,7 @@ define([
var $layoutPages = $( var $layoutPages = $(
'<div class="pages">' + '<div class="pages">' +
'<div class="page" data-page="index">' + '<div class="page" data-page="index">' +
'<div class="page-content">' + '<div class="page-content tabs">' +
'<div class="tabs-animated-wrap">' +
'<div class="tabs"></div>' +
'</div>' +
'</div>' + '</div>' +
'</div>' + '</div>' +
'</div>' '</div>'

8
apps/documenteditor/mobile/app/template/EditChart.template
View file

@ -303,9 +303,9 @@
<div class="right"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></div> <div class="right"><% if (phone) { %><a href="#" class="link icon-only close-picker"><i class="icon icon-expand-down"></i></a><% } %></div>
</div> </div>
</div> </div>
<div class="pages">
<div class="page" data-page="edit-chart-style"> <div class="page" data-page="edit-chart-style">
<div class="tabs-animated-wrap"> <div class="page-content tabs" style="padding-top: 0;">
<div class="tabs">
<div id="tab-chart-type" class="page-content tab active dataview chart-types"> <div id="tab-chart-type" class="page-content tab active dataview chart-types">
<% _.each(types, function(row) { %> <% _.each(types, function(row) { %>
<ul class="row"> <ul class="row">
@ -317,7 +317,7 @@
</ul> </ul>
<% }); %> <% }); %>
</div> </div>
<div id="tab-chart-style" class="page-content tab dataview chart-styles"> <div id="tab-chart-style" class="page-content tab dataview chart-styles" style="width: 100%;">
<!--Styles--> <!--Styles-->
</div> </div>
<div id="tab-chart-fill" class="page-content tab"> <div id="tab-chart-fill" class="page-content tab">
@ -353,7 +353,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>

4
apps/documenteditor/mobile/app/template/EditShape.template
View file

@ -335,8 +335,7 @@
</div> </div>
</div> </div>
<div class="page" data-page="edit-shape-style"> <div class="page" data-page="edit-shape-style">
<div class="tabs-animated-wrap"> <div class="page-content tabs" style="padding-top: 0;">
<div class="tabs">
<div id="tab-shape-fill" class="page-content tab active"> <div id="tab-shape-fill" class="page-content tab active">
<!--Fill colors--> <!--Fill colors-->
</div> </div>
@ -389,7 +388,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
</div> </div>

4
apps/documenteditor/mobile/app/template/EditTable.template
View file

@ -250,8 +250,7 @@
</div> </div>
</div> </div>
<div class="page" data-page="edit-table-style"> <div class="page" data-page="edit-table-style">
<div class="tabs-animated-wrap"> <div class="page-content tabs" style="padding-top: 0;">
<div class="tabs">
<div id="tab-table-style" class="page-content tab active"> <div id="tab-table-style" class="page-content tab active">
<div class="list-block"> <div class="list-block">
<ul> <ul>
@ -331,7 +330,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
</div> </div>

6
apps/documenteditor/mobile/app/view/add/AddOther.js
View file

@ -162,6 +162,7 @@ define([
}, },
renderComment: function(comment) { renderComment: function(comment) {
var me = this;
_.delay(function () { _.delay(function () {
var $commentInfo = $('#comment-info'); var $commentInfo = $('#comment-info');
var template = [ var template = [
@ -169,11 +170,12 @@ define([
'<div class="user-name"><%= comment.username %></div>', '<div class="user-name"><%= comment.username %></div>',
'<div class="comment-date"><%= comment.date %></div>', '<div class="comment-date"><%= comment.date %></div>',
'<% if (android) { %></div></div><% } %>', '<% if (android) { %></div></div><% } %>',
'<div class="wrap-textarea"><textarea id="comment-text" class="comment-textarea" autofocus></textarea></div>' '<div class="wrap-textarea"><textarea id="comment-text" class="comment-textarea" placeholder="<%= textAddComment %>" autofocus></textarea></div>'
].join(''); ].join('');
var insert = _.template(template)({ var insert = _.template(template)({
android: Framework7.prototype.device.android, android: Framework7.prototype.device.android,
comment: comment comment: comment,
textAddComment: me.textAddComment
}); });
$commentInfo.html(insert); $commentInfo.html(insert);
_.defer(function () { _.defer(function () {

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

@ -105,6 +105,7 @@
"DE.Controllers.AddOther.textDeleteDraft": "Do you really want to delete draft?", "DE.Controllers.AddOther.textDeleteDraft": "Do you really want to delete draft?",
"DE.Controllers.AddOther.textCancel": "Cancel", "DE.Controllers.AddOther.textCancel": "Cancel",
"DE.Controllers.AddOther.textContinue": "Continue", "DE.Controllers.AddOther.textContinue": "Continue",
"DE.Controllers.AddOther.textDelete": "Delete",
"DE.Controllers.AddTable.textCancel": "Cancel", "DE.Controllers.AddTable.textCancel": "Cancel",
"DE.Controllers.AddTable.textColumns": "Columns", "DE.Controllers.AddTable.textColumns": "Columns",
"DE.Controllers.AddTable.textRows": "Rows", "DE.Controllers.AddTable.textRows": "Rows",

20
apps/documenteditor/mobile/resources/css/app-ios.css
View file

@ -6603,7 +6603,7 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
.page-edit-comment .reply-date, .page-edit-comment .reply-date,
.page-add-reply .reply-date, .page-add-reply .reply-date,
.page-edit-reply .reply-date { .page-edit-reply .reply-date {
font-size: 12px; font-size: 13px;
line-height: 18px; line-height: 18px;
color: #6d6d72; color: #6d6d72;
margin: 0; margin: 0;
@ -6748,8 +6748,8 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
background: transparent; background: transparent;
outline: none; outline: none;
width: 100%; width: 100%;
font-size: 15px; font-size: 17px;
border: 1px solid #c4c4c4; border: none;
border-radius: 3px; border-radius: 3px;
min-height: 100px; min-height: 100px;
} }
@ -6905,11 +6905,14 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
.page-add-comment .wrap-comment .user-name, .page-add-comment .wrap-comment .user-name,
.page-add-comment .wrap-reply .user-name { .page-add-comment .wrap-reply .user-name {
font-weight: bold; font-weight: bold;
font-size: 17px;
padding-left: 5px;
} }
.page-add-comment .wrap-comment .comment-date, .page-add-comment .wrap-comment .comment-date,
.page-add-comment .wrap-reply .comment-date { .page-add-comment .wrap-reply .comment-date {
font-size: 12px; font-size: 13px;
color: #6d6d72; color: #6d6d72;
padding-left: 5px;
} }
.page-add-comment .wrap-comment .wrap-textarea, .page-add-comment .wrap-comment .wrap-textarea,
.page-add-comment .wrap-reply .wrap-textarea { .page-add-comment .wrap-reply .wrap-textarea {
@ -6918,11 +6921,18 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
} }
.page-add-comment .wrap-comment .wrap-textarea .comment-textarea, .page-add-comment .wrap-comment .wrap-textarea .comment-textarea,
.page-add-comment .wrap-reply .wrap-textarea .comment-textarea { .page-add-comment .wrap-reply .wrap-textarea .comment-textarea {
border: 1px solid #c4c4c4; font-size: 17px;
border: none;
margin-top: 0; margin-top: 0;
min-height: 100px; min-height: 100px;
border-radius: 4px; border-radius: 4px;
width: 100%; width: 100%;
padding-left: 5px;
}
.page-add-comment .wrap-comment .wrap-textarea .comment-textarea::placeholder,
.page-add-comment .wrap-reply .wrap-textarea .comment-textarea::placeholder {
color: #8e8e93;
font-size: 17px;
} }
.container-add-reply { .container-add-reply {
height: 100%; height: 100%;

11
apps/documenteditor/mobile/resources/css/app-material.css
View file

@ -6532,11 +6532,12 @@ html.phone .document-menu .list-block .item-link {
} }
.page-add-comment .wrap-comment .user-name, .page-add-comment .wrap-comment .user-name,
.page-add-comment .wrap-reply .user-name { .page-add-comment .wrap-reply .user-name {
font-size: 17px;
font-weight: bold; font-weight: bold;
} }
.page-add-comment .wrap-comment .comment-date, .page-add-comment .wrap-comment .comment-date,
.page-add-comment .wrap-reply .comment-date { .page-add-comment .wrap-reply .comment-date {
font-size: 12px; font-size: 13px;
color: #6d6d72; color: #6d6d72;
} }
.page-add-comment .wrap-comment .wrap-textarea, .page-add-comment .wrap-comment .wrap-textarea,
@ -6546,11 +6547,17 @@ html.phone .document-menu .list-block .item-link {
} }
.page-add-comment .wrap-comment .wrap-textarea .comment-textarea, .page-add-comment .wrap-comment .wrap-textarea .comment-textarea,
.page-add-comment .wrap-reply .wrap-textarea .comment-textarea { .page-add-comment .wrap-reply .wrap-textarea .comment-textarea {
border: 1px solid #c4c4c4; font-size: 17px;
border: none;
margin-top: 0; margin-top: 0;
min-height: 100px; min-height: 100px;
border-radius: 4px; border-radius: 4px;
} }
.page-add-comment .wrap-comment .wrap-textarea .comment-textarea::placeholder,
.page-add-comment .wrap-reply .wrap-textarea .comment-textarea::placeholder {
color: #9e9e9e;
font-size: 17px;
}
.container-edit-comment, .container-edit-comment,
.container-add-reply { .container-add-reply {
height: 100%; height: 100%;

5
apps/presentationeditor/mobile/app/controller/add/AddContainer.js
View file

@ -183,10 +183,7 @@ define([
var $layoutPages = $( var $layoutPages = $(
'<div class="pages">' + '<div class="pages">' +
'<div class="page" data-page="index">' + '<div class="page" data-page="index">' +
'<div class="page-content">' + '<div class="page-content tabs">' +
'<div class="tabs-animated-wrap">' +
'<div class="tabs"></div>' +
'</div>' +
'</div>' + '</div>' +
'</div>' + '</div>' +
'</div>' '</div>'

6
apps/presentationeditor/mobile/app/controller/add/AddOther.js
View file

@ -153,7 +153,8 @@ define([
text: this.textCancel text: this.textCancel
}, },
{ {
text: this.textContinue, text: this.textDelete,
bold: true,
onClick: function () { onClick: function () {
PE.getController('AddContainer').rootView.router.back(); PE.getController('AddContainer').rootView.router.back();
} }
@ -176,7 +177,8 @@ define([
textDeleteDraft: 'Do you really want to delete draft?', textDeleteDraft: 'Do you really want to delete draft?',
textCancel: 'Cancel', textCancel: 'Cancel',
textContinue: 'Continue' //textContinue: 'Continue',
textDelete: 'Delete'
} }
})(), PE.Controllers.AddOther || {})) })(), PE.Controllers.AddOther || {}))

5
apps/presentationeditor/mobile/app/controller/edit/EditContainer.js
View file

@ -230,10 +230,7 @@ define([
var $layoutPages = $( var $layoutPages = $(
'<div class="pages">' + '<div class="pages">' +
'<div class="page" data-page="index">' + '<div class="page" data-page="index">' +
'<div class="page-content">' + '<div class="page-content tabs">' +
'<div class="tabs-animated-wrap">' +
'<div class="tabs"></div>' +
'</div>' +
'</div>' + '</div>' +
'</div>' + '</div>' +
'</div>' '</div>'

6
apps/presentationeditor/mobile/app/template/EditChart.template
View file

@ -131,8 +131,7 @@
</div> </div>
</div> </div>
<div class="page" data-page="edit-chart-style"> <div class="page" data-page="edit-chart-style">
<div class="tabs-animated-wrap"> <div class="page-content tabs" style="padding-top: 0;">
<div class="tabs">
<div id="tab-chart-type" class="page-content tab active dataview chart-types"> <div id="tab-chart-type" class="page-content tab active dataview chart-types">
<% _.each(types, function(row) { %> <% _.each(types, function(row) { %>
<ul class="row"> <ul class="row">
@ -144,7 +143,7 @@
</ul> </ul>
<% }); %> <% }); %>
</div> </div>
<div id="tab-chart-style" class="page-content tab dataview chart-styles"> <div id="tab-chart-style" class="page-content tab dataview chart-styles" style="width: 100%;">
<!--Styles--> <!--Styles-->
</div> </div>
<div id="tab-chart-fill" class="page-content tab"> <div id="tab-chart-fill" class="page-content tab">
@ -180,7 +179,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
</div> </div>

4
apps/presentationeditor/mobile/app/template/EditShape.template
View file

@ -162,8 +162,7 @@
</div> </div>
</div> </div>
<div class="page" data-page="edit-shape-style"> <div class="page" data-page="edit-shape-style">
<div class="tabs-animated-wrap"> <div class="page-content tabs" style="padding-top: 0;">
<div class="tabs">
<div id="tab-shape-fill" class="page-content tab active"> <div id="tab-shape-fill" class="page-content tab active">
<!--Fill colors--> <!--Fill colors-->
</div> </div>
@ -216,7 +215,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
</div> </div>

4
apps/presentationeditor/mobile/app/template/EditTable.template
View file

@ -110,8 +110,7 @@
</div> </div>
</div> </div>
<div class="page" data-page="edit-table-style"> <div class="page" data-page="edit-table-style">
<div class="tabs-animated-wrap"> <div class="page-content tabs" style="padding-top: 0;">
<div class="tabs">
<div id="tab-table-style" class="page-content tab active"> <div id="tab-table-style" class="page-content tab active">
<div class="list-block"> <div class="list-block">
<ul> <ul>
@ -191,7 +190,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
</div> </div>

6
apps/presentationeditor/mobile/app/view/add/AddOther.js
View file

@ -138,6 +138,7 @@ define([
}, },
renderComment: function(comment) { renderComment: function(comment) {
var me = this;
_.delay(function () { _.delay(function () {
var $commentInfo = $('#comment-info'); var $commentInfo = $('#comment-info');
var template = [ var template = [
@ -145,11 +146,12 @@ define([
'<div class="user-name"><%= comment.username %></div>', '<div class="user-name"><%= comment.username %></div>',
'<div class="comment-date"><%= comment.date %></div>', '<div class="comment-date"><%= comment.date %></div>',
'<% if (android) { %></div></div><% } %>', '<% if (android) { %></div></div><% } %>',
'<div class="wrap-textarea"><textarea id="comment-text" class="comment-textarea" autofocus></textarea></div>' '<div class="wrap-textarea"><textarea id="comment-text" class="comment-textarea" placeholder="<%= textAddComment %>" autofocus></textarea></div>'
].join(''); ].join('');
var insert = _.template(template)({ var insert = _.template(template)({
android: Framework7.prototype.device.android, android: Framework7.prototype.device.android,
comment: comment comment: comment,
textAddComment: me.textAddComment
}); });
$commentInfo.html(insert); $commentInfo.html(insert);
_.defer(function () { _.defer(function () {

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

@ -50,6 +50,7 @@
"PE.Controllers.AddOther.textDeleteDraft": "Do you really want to delete draft?", "PE.Controllers.AddOther.textDeleteDraft": "Do you really want to delete draft?",
"PE.Controllers.AddOther.textCancel": "Cancel", "PE.Controllers.AddOther.textCancel": "Cancel",
"PE.Controllers.AddOther.textContinue": "Continue", "PE.Controllers.AddOther.textContinue": "Continue",
"PE.Controllers.AddOther.textDelete": "Delete",
"PE.Controllers.DocumentHolder.menuAddLink": "Add Link", "PE.Controllers.DocumentHolder.menuAddLink": "Add Link",
"PE.Controllers.DocumentHolder.menuCopy": "Copy", "PE.Controllers.DocumentHolder.menuCopy": "Copy",
"PE.Controllers.DocumentHolder.menuCut": "Cut", "PE.Controllers.DocumentHolder.menuCut": "Cut",

20
apps/presentationeditor/mobile/resources/css/app-ios.css
View file

@ -6603,7 +6603,7 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
.page-edit-comment .reply-date, .page-edit-comment .reply-date,
.page-add-reply .reply-date, .page-add-reply .reply-date,
.page-edit-reply .reply-date { .page-edit-reply .reply-date {
font-size: 12px; font-size: 13px;
line-height: 18px; line-height: 18px;
color: #6d6d72; color: #6d6d72;
margin: 0; margin: 0;
@ -6748,8 +6748,8 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
background: transparent; background: transparent;
outline: none; outline: none;
width: 100%; width: 100%;
font-size: 15px; font-size: 17px;
border: 1px solid #c4c4c4; border: none;
border-radius: 3px; border-radius: 3px;
min-height: 100px; min-height: 100px;
} }
@ -6905,11 +6905,14 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
.page-add-comment .wrap-comment .user-name, .page-add-comment .wrap-comment .user-name,
.page-add-comment .wrap-reply .user-name { .page-add-comment .wrap-reply .user-name {
font-weight: bold; font-weight: bold;
font-size: 17px;
padding-left: 5px;
} }
.page-add-comment .wrap-comment .comment-date, .page-add-comment .wrap-comment .comment-date,
.page-add-comment .wrap-reply .comment-date { .page-add-comment .wrap-reply .comment-date {
font-size: 12px; font-size: 13px;
color: #6d6d72; color: #6d6d72;
padding-left: 5px;
} }
.page-add-comment .wrap-comment .wrap-textarea, .page-add-comment .wrap-comment .wrap-textarea,
.page-add-comment .wrap-reply .wrap-textarea { .page-add-comment .wrap-reply .wrap-textarea {
@ -6918,11 +6921,18 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
} }
.page-add-comment .wrap-comment .wrap-textarea .comment-textarea, .page-add-comment .wrap-comment .wrap-textarea .comment-textarea,
.page-add-comment .wrap-reply .wrap-textarea .comment-textarea { .page-add-comment .wrap-reply .wrap-textarea .comment-textarea {
border: 1px solid #c4c4c4; font-size: 17px;
border: none;
margin-top: 0; margin-top: 0;
min-height: 100px; min-height: 100px;
border-radius: 4px; border-radius: 4px;
width: 100%; width: 100%;
padding-left: 5px;
}
.page-add-comment .wrap-comment .wrap-textarea .comment-textarea::placeholder,
.page-add-comment .wrap-reply .wrap-textarea .comment-textarea::placeholder {
color: #8e8e93;
font-size: 17px;
} }
.container-add-reply { .container-add-reply {
height: 100%; height: 100%;

11
apps/presentationeditor/mobile/resources/css/app-material.css
View file

@ -6532,11 +6532,12 @@ html.phone .document-menu .list-block .item-link {
} }
.page-add-comment .wrap-comment .user-name, .page-add-comment .wrap-comment .user-name,
.page-add-comment .wrap-reply .user-name { .page-add-comment .wrap-reply .user-name {
font-size: 17px;
font-weight: bold; font-weight: bold;
} }
.page-add-comment .wrap-comment .comment-date, .page-add-comment .wrap-comment .comment-date,
.page-add-comment .wrap-reply .comment-date { .page-add-comment .wrap-reply .comment-date {
font-size: 12px; font-size: 13px;
color: #6d6d72; color: #6d6d72;
} }
.page-add-comment .wrap-comment .wrap-textarea, .page-add-comment .wrap-comment .wrap-textarea,
@ -6546,11 +6547,17 @@ html.phone .document-menu .list-block .item-link {
} }
.page-add-comment .wrap-comment .wrap-textarea .comment-textarea, .page-add-comment .wrap-comment .wrap-textarea .comment-textarea,
.page-add-comment .wrap-reply .wrap-textarea .comment-textarea { .page-add-comment .wrap-reply .wrap-textarea .comment-textarea {
border: 1px solid #c4c4c4; font-size: 17px;
border: none;
margin-top: 0; margin-top: 0;
min-height: 100px; min-height: 100px;
border-radius: 4px; border-radius: 4px;
} }
.page-add-comment .wrap-comment .wrap-textarea .comment-textarea::placeholder,
.page-add-comment .wrap-reply .wrap-textarea .comment-textarea::placeholder {
color: #9e9e9e;
font-size: 17px;
}
.container-edit-comment, .container-edit-comment,
.container-add-reply { .container-add-reply {
height: 100%; height: 100%;

6
apps/spreadsheeteditor/mobile/app/controller/add/AddContainer.js
View file

@ -256,12 +256,8 @@ define([
var $layoutPages = $('<div class="pages">' + var $layoutPages = $('<div class="pages">' +
'<div class="page" data-page="index">' + '<div class="page" data-page="index">' +
'<div class="page-content">' + '<div class="page-content tabs">' +
'<div class="tabs-animated-wrap">' +
'<div class="tabs">' +
_arrangePages({pages: layoutAdds}) + _arrangePages({pages: layoutAdds}) +
'</div>' +
'</div>' +
'</div>' + '</div>' +
'</div>' + '</div>' +
'</div>'); '</div>');

6
apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js
View file

@ -142,7 +142,8 @@ define([
text: this.textCancel text: this.textCancel
}, },
{ {
text: this.textContinue, text: this.textDelete,
bold: true,
onClick: function () { onClick: function () {
SSE.getController('AddContainer').rootView.router.back(); SSE.getController('AddContainer').rootView.router.back();
} }
@ -200,7 +201,8 @@ define([
txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"', txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"',
textDeleteDraft: 'Do you really want to delete draft?', textDeleteDraft: 'Do you really want to delete draft?',
textCancel: 'Cancel', textCancel: 'Cancel',
textContinue: 'Continue' //textContinue: 'Continue',
textDelete: 'Delete'
} }
})(), SSE.Controllers.AddOther || {})) })(), SSE.Controllers.AddOther || {}))
}); });

5
apps/spreadsheeteditor/mobile/app/controller/edit/EditContainer.js
View file

@ -231,10 +231,7 @@ define([
var $layoutPages = $( var $layoutPages = $(
'<div class="pages">' + '<div class="pages">' +
'<div class="page" data-page="index">' + '<div class="page" data-page="index">' +
'<div class="page-content">' + '<div class="page-content tabs">' +
'<div class="tabs-animated-wrap">' +
'<div class="tabs"></div>' +
'</div>' +
'</div>' + '</div>' +
'</div>' + '</div>' +
'</div>' '</div>'

6
apps/spreadsheeteditor/mobile/app/template/EditChart.template
View file

@ -153,8 +153,7 @@
<% } %> <% } %>
</div> </div>
<div class="page with-subnavbar" data-page="edit-chart-style"> <div class="page with-subnavbar" data-page="edit-chart-style">
<div class="tabs-animated-wrap"> <div class="page-content tabs" style="padding-top: 0;">
<div class="tabs">
<div id="tab-chart-type" class="page-content tab dataview chart-types active"> <div id="tab-chart-type" class="page-content tab dataview chart-types active">
<% _.each(types, function(row) { %> <% _.each(types, function(row) { %>
<ul class="row"> <ul class="row">
@ -166,7 +165,7 @@
</ul> </ul>
<% }); %> <% }); %>
</div> </div>
<div id="tab-chart-style" class="page-content tab dataview chart-styles"> <div id="tab-chart-style" class="page-content tab dataview chart-styles" style="width: 100%;">
<!--Style--> <!--Style-->
</div> </div>
<div id="tab-chart-fill" class="page-content tab"> <div id="tab-chart-fill" class="page-content tab">
@ -202,7 +201,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
</div> </div>

4
apps/spreadsheeteditor/mobile/app/template/EditShape.template
View file

@ -153,8 +153,7 @@
</div> </div>
</div> </div>
<div class="page" data-page="edit-shape-style"> <div class="page" data-page="edit-shape-style">
<div class="tabs-animated-wrap"> <div class="page-content tabs" style="padding-top: 0;">
<div class="tabs">
<div id="tab-shape-fill" class="page-content tab active"> <div id="tab-shape-fill" class="page-content tab active">
<!--Fill colors--> <!--Fill colors-->
</div> </div>
@ -207,7 +206,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
</div> </div>

6
apps/spreadsheeteditor/mobile/app/view/add/AddOther.js
View file

@ -212,6 +212,7 @@ define([
}, },
renderComment: function(comment) { renderComment: function(comment) {
var me = this;
_.delay(function () { _.delay(function () {
var $commentInfo = $('#comment-info'); var $commentInfo = $('#comment-info');
var template = [ var template = [
@ -219,11 +220,12 @@ define([
'<div class="user-name"><%= comment.username %></div>', '<div class="user-name"><%= comment.username %></div>',
'<div class="comment-date"><%= comment.date %></div>', '<div class="comment-date"><%= comment.date %></div>',
'<% if (android) { %></div></div><% } %>', '<% if (android) { %></div></div><% } %>',
'<div class="wrap-textarea"><textarea id="comment-text" class="comment-textarea" autofocus></textarea></div>' '<div class="wrap-textarea"><textarea id="comment-text" class="comment-textarea" placeholder="<%= textAddComment %>" autofocus></textarea></div>'
].join(''); ].join('');
var insert = _.template(template)({ var insert = _.template(template)({
android: Framework7.prototype.device.android, android: Framework7.prototype.device.android,
comment: comment comment: comment,
textAddComment: me.textAddComment
}); });
$commentInfo.html(insert); $commentInfo.html(insert);
_.defer(function () { _.defer(function () {

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

@ -42,6 +42,7 @@
"SSE.Controllers.AddOther.textDeleteDraft": "Do you really want to delete draft?", "SSE.Controllers.AddOther.textDeleteDraft": "Do you really want to delete draft?",
"SSE.Controllers.AddOther.textCancel": "Cancel", "SSE.Controllers.AddOther.textCancel": "Cancel",
"SSE.Controllers.AddOther.textContinue": "Continue", "SSE.Controllers.AddOther.textContinue": "Continue",
"SSE.Controllers.AddOther.textDelete": "Delete",
"SSE.Controllers.DocumentHolder.menuAddLink": "Add Link", "SSE.Controllers.DocumentHolder.menuAddLink": "Add Link",
"SSE.Controllers.DocumentHolder.menuCell": "Cell", "SSE.Controllers.DocumentHolder.menuCell": "Cell",
"SSE.Controllers.DocumentHolder.menuCopy": "Copy", "SSE.Controllers.DocumentHolder.menuCopy": "Copy",

20
apps/spreadsheeteditor/mobile/resources/css/app-ios.css
View file

@ -6596,7 +6596,7 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
.page-edit-comment .reply-date, .page-edit-comment .reply-date,
.page-add-reply .reply-date, .page-add-reply .reply-date,
.page-edit-reply .reply-date { .page-edit-reply .reply-date {
font-size: 12px; font-size: 13px;
line-height: 18px; line-height: 18px;
color: #6d6d72; color: #6d6d72;
margin: 0; margin: 0;
@ -6741,8 +6741,8 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
background: transparent; background: transparent;
outline: none; outline: none;
width: 100%; width: 100%;
font-size: 15px; font-size: 17px;
border: 1px solid #c4c4c4; border: none;
border-radius: 3px; border-radius: 3px;
min-height: 100px; min-height: 100px;
} }
@ -6898,11 +6898,14 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
.page-add-comment .wrap-comment .user-name, .page-add-comment .wrap-comment .user-name,
.page-add-comment .wrap-reply .user-name { .page-add-comment .wrap-reply .user-name {
font-weight: bold; font-weight: bold;
font-size: 17px;
padding-left: 5px;
} }
.page-add-comment .wrap-comment .comment-date, .page-add-comment .wrap-comment .comment-date,
.page-add-comment .wrap-reply .comment-date { .page-add-comment .wrap-reply .comment-date {
font-size: 12px; font-size: 13px;
color: #6d6d72; color: #6d6d72;
padding-left: 5px;
} }
.page-add-comment .wrap-comment .wrap-textarea, .page-add-comment .wrap-comment .wrap-textarea,
.page-add-comment .wrap-reply .wrap-textarea { .page-add-comment .wrap-reply .wrap-textarea {
@ -6911,11 +6914,18 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after
} }
.page-add-comment .wrap-comment .wrap-textarea .comment-textarea, .page-add-comment .wrap-comment .wrap-textarea .comment-textarea,
.page-add-comment .wrap-reply .wrap-textarea .comment-textarea { .page-add-comment .wrap-reply .wrap-textarea .comment-textarea {
border: 1px solid #c4c4c4; font-size: 17px;
border: none;
margin-top: 0; margin-top: 0;
min-height: 100px; min-height: 100px;
border-radius: 4px; border-radius: 4px;
width: 100%; width: 100%;
padding-left: 5px;
}
.page-add-comment .wrap-comment .wrap-textarea .comment-textarea::placeholder,
.page-add-comment .wrap-reply .wrap-textarea .comment-textarea::placeholder {
color: #8e8e93;
font-size: 17px;
} }
.container-add-reply { .container-add-reply {
height: 100%; height: 100%;

11
apps/spreadsheeteditor/mobile/resources/css/app-material.css
View file

@ -6542,11 +6542,12 @@ html.phone .document-menu .list-block .item-link {
} }
.page-add-comment .wrap-comment .user-name, .page-add-comment .wrap-comment .user-name,
.page-add-comment .wrap-reply .user-name { .page-add-comment .wrap-reply .user-name {
font-size: 17px;
font-weight: bold; font-weight: bold;
} }
.page-add-comment .wrap-comment .comment-date, .page-add-comment .wrap-comment .comment-date,
.page-add-comment .wrap-reply .comment-date { .page-add-comment .wrap-reply .comment-date {
font-size: 12px; font-size: 13px;
color: #6d6d72; color: #6d6d72;
} }
.page-add-comment .wrap-comment .wrap-textarea, .page-add-comment .wrap-comment .wrap-textarea,
@ -6556,11 +6557,17 @@ html.phone .document-menu .list-block .item-link {
} }
.page-add-comment .wrap-comment .wrap-textarea .comment-textarea, .page-add-comment .wrap-comment .wrap-textarea .comment-textarea,
.page-add-comment .wrap-reply .wrap-textarea .comment-textarea { .page-add-comment .wrap-reply .wrap-textarea .comment-textarea {
border: 1px solid #c4c4c4; font-size: 17px;
border: none;
margin-top: 0; margin-top: 0;
min-height: 100px; min-height: 100px;
border-radius: 4px; border-radius: 4px;
} }
.page-add-comment .wrap-comment .wrap-textarea .comment-textarea::placeholder,
.page-add-comment .wrap-reply .wrap-textarea .comment-textarea::placeholder {
color: #9e9e9e;
font-size: 17px;
}
.container-edit-comment, .container-edit-comment,
.container-add-reply { .container-add-reply {
height: 100%; height: 100%;