From b944ddccfcb44be3f14207791c46d9b41a4547c5 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 7 May 2020 19:28:58 +0300 Subject: [PATCH] [mobile] Comments (remove textarea border, increased font, remove tabs animation, add placeholder, changed modal window of delete comment draft) --- apps/common/mobile/lib/view/Collaboration.js | 2 +- .../resources/less/ios/_collaboration.less | 19 +++++++++++++----- .../less/material/_collaboration.less | 10 ++++++++-- .../mobile/app/controller/add/AddContainer.js | 7 ++----- .../mobile/app/controller/add/AddOther.js | 8 +++++--- .../app/controller/edit/EditContainer.js | 5 +---- .../mobile/app/template/EditChart.template | 8 ++++---- .../mobile/app/template/EditShape.template | 4 +--- .../mobile/app/template/EditTable.template | 4 +--- .../mobile/app/view/add/AddOther.js | 6 ++++-- apps/documenteditor/mobile/locale/en.json | 1 + .../mobile/resources/css/app-ios.css | 20 ++++++++++++++----- .../mobile/resources/css/app-material.css | 11 ++++++++-- .../mobile/app/controller/add/AddContainer.js | 5 +---- .../mobile/app/controller/add/AddOther.js | 6 ++++-- .../app/controller/edit/EditContainer.js | 5 +---- .../mobile/app/template/EditChart.template | 6 ++---- .../mobile/app/template/EditShape.template | 4 +--- .../mobile/app/template/EditTable.template | 4 +--- .../mobile/app/view/add/AddOther.js | 6 ++++-- apps/presentationeditor/mobile/locale/en.json | 1 + .../mobile/resources/css/app-ios.css | 20 ++++++++++++++----- .../mobile/resources/css/app-material.css | 11 ++++++++-- .../mobile/app/controller/add/AddContainer.js | 6 +----- .../mobile/app/controller/add/AddOther.js | 6 ++++-- .../app/controller/edit/EditContainer.js | 5 +---- .../mobile/app/template/EditChart.template | 6 ++---- .../mobile/app/template/EditShape.template | 4 +--- .../mobile/app/view/add/AddOther.js | 6 ++++-- apps/spreadsheeteditor/mobile/locale/en.json | 1 + .../mobile/resources/css/app-ios.css | 20 ++++++++++++++----- .../mobile/resources/css/app-material.css | 11 ++++++++-- 32 files changed, 143 insertions(+), 95 deletions(-) diff --git a/apps/common/mobile/lib/view/Collaboration.js b/apps/common/mobile/lib/view/Collaboration.js index 66b26c2d9..1b228d5d9 100644 --- a/apps/common/mobile/lib/view/Collaboration.js +++ b/apps/common/mobile/lib/view/Collaboration.js @@ -355,7 +355,7 @@ define([ '
' + name + '
' + '
' + date + '
' + (isAndroid ? '' : '') + - '
' + + '
' + '' + '' + '' + diff --git a/apps/common/mobile/resources/less/ios/_collaboration.less b/apps/common/mobile/resources/less/ios/_collaboration.less index 698a6d96a..7a6cf1ebc 100644 --- a/apps/common/mobile/resources/less/ios/_collaboration.less +++ b/apps/common/mobile/resources/less/ios/_collaboration.less @@ -126,7 +126,7 @@ font-weight: bold; } .comment-date, .reply-date { - font-size: 12px; + font-size: 13px; line-height: 18px; color: #6d6d72; margin: 0; @@ -184,8 +184,8 @@ background:transparent; outline:none; width: 100%; - font-size: 15px; - border: 1px solid #c4c4c4; + font-size: 17px; + border: none; border-radius: 3px; min-height: 100px; } @@ -354,20 +354,29 @@ } .user-name { font-weight: bold; + font-size: 17px; + padding-left: 5px; } .comment-date { - font-size: 12px; + font-size: 13px; color: #6d6d72; + padding-left: 5px; } .wrap-textarea { margin-top: 16px; padding-right: 6px; .comment-textarea { - border: 1px solid #c4c4c4; + font-size: 17px; + border: none; margin-top: 0; min-height: 100px; border-radius: 4px; width: 100%; + padding-left: 5px; + &::placeholder { + color: @gray; + font-size: 17px; + } } } } diff --git a/apps/common/mobile/resources/less/material/_collaboration.less b/apps/common/mobile/resources/less/material/_collaboration.less index 0f0e93925..38a9ef3b9 100644 --- a/apps/common/mobile/resources/less/material/_collaboration.less +++ b/apps/common/mobile/resources/less/material/_collaboration.less @@ -378,20 +378,26 @@ justify-content: flex-start; } .user-name { + font-size: 17px; font-weight: bold; } .comment-date { - font-size: 12px; + font-size: 13px; color: #6d6d72; } .wrap-textarea { margin-top: 16px; padding-right: 6px; .comment-textarea { - border: 1px solid #c4c4c4; + font-size: 17px; + border: none; margin-top: 0; min-height: 100px; border-radius: 4px; + &::placeholder { + color: @gray; + font-size: 17px; + } } } } diff --git a/apps/documenteditor/mobile/app/controller/add/AddContainer.js b/apps/documenteditor/mobile/app/controller/add/AddContainer.js index 265a0412b..c1d6bc969 100644 --- a/apps/documenteditor/mobile/app/controller/add/AddContainer.js +++ b/apps/documenteditor/mobile/app/controller/add/AddContainer.js @@ -75,7 +75,7 @@ define([ uiApp.closeModal(); me._showByStack(Common.SharedSettings.get('phone')); - //uiApp.showTab('#add-other'); + uiApp.showTab('#add-other'); DE.getController('Toolbar').getView('Toolbar').hideSearch(); }, @@ -184,10 +184,7 @@ define([ var $layoutPages = $( '
' + '
' + - '
' + - '
' + - '
' + - '
' + + '
' + '
' + '
' + '
' diff --git a/apps/documenteditor/mobile/app/controller/add/AddOther.js b/apps/documenteditor/mobile/app/controller/add/AddOther.js index 7ab12a1e3..24f9b2553 100644 --- a/apps/documenteditor/mobile/app/controller/add/AddOther.js +++ b/apps/documenteditor/mobile/app/controller/add/AddOther.js @@ -179,7 +179,8 @@ define([ text: this.textCancel }, { - text: this.textContinue, + text: this.textDelete, + bold: true, onClick: function () { DE.getController('AddContainer').rootView.router.back(); } @@ -188,7 +189,7 @@ define([ } else { DE.getController('AddContainer').rootView.router.back(); } - }, this)) + }, this)); } }, @@ -457,7 +458,8 @@ define([ textBelowText: 'Below Text', textDeleteDraft: 'Do you really want to delete draft?', textCancel: 'Cancel', - textContinue: 'Continue' + //textContinue: 'Continue', + textDelete: 'Delete' } })(), DE.Controllers.AddOther || {})) diff --git a/apps/documenteditor/mobile/app/controller/edit/EditContainer.js b/apps/documenteditor/mobile/app/controller/edit/EditContainer.js index e9196532d..699bc2bc0 100644 --- a/apps/documenteditor/mobile/app/controller/edit/EditContainer.js +++ b/apps/documenteditor/mobile/app/controller/edit/EditContainer.js @@ -238,10 +238,7 @@ define([ var $layoutPages = $( '
' + '
' + - '
' + - '
' + - '
' + - '
' + + '
' + '
' + '
' + '
' diff --git a/apps/documenteditor/mobile/app/template/EditChart.template b/apps/documenteditor/mobile/app/template/EditChart.template index c420cb543..9041d6a12 100644 --- a/apps/documenteditor/mobile/app/template/EditChart.template +++ b/apps/documenteditor/mobile/app/template/EditChart.template @@ -303,9 +303,9 @@
<% if (phone) { %><% } %>
+
-
-
+
<% _.each(types, function(row) { %>
    @@ -317,7 +317,7 @@
<% }); %>
-
+
@@ -353,7 +353,7 @@
-
+
diff --git a/apps/documenteditor/mobile/app/template/EditShape.template b/apps/documenteditor/mobile/app/template/EditShape.template index 06c6c5dee..9817a01c9 100644 --- a/apps/documenteditor/mobile/app/template/EditShape.template +++ b/apps/documenteditor/mobile/app/template/EditShape.template @@ -335,8 +335,7 @@
-
-
+
@@ -389,7 +388,6 @@
-
diff --git a/apps/documenteditor/mobile/app/template/EditTable.template b/apps/documenteditor/mobile/app/template/EditTable.template index 825b2fdff..45d5b1fe0 100644 --- a/apps/documenteditor/mobile/app/template/EditTable.template +++ b/apps/documenteditor/mobile/app/template/EditTable.template @@ -250,8 +250,7 @@
-
-
+
    @@ -331,7 +330,6 @@
-
diff --git a/apps/documenteditor/mobile/app/view/add/AddOther.js b/apps/documenteditor/mobile/app/view/add/AddOther.js index ce0261455..61947bff8 100644 --- a/apps/documenteditor/mobile/app/view/add/AddOther.js +++ b/apps/documenteditor/mobile/app/view/add/AddOther.js @@ -162,6 +162,7 @@ define([ }, renderComment: function(comment) { + var me = this; _.delay(function () { var $commentInfo = $('#comment-info'); var template = [ @@ -169,11 +170,12 @@ define([ '
<%= comment.username %>
', '
<%= comment.date %>
', '<% if (android) { %><% } %>', - '
' + '
' ].join(''); var insert = _.template(template)({ android: Framework7.prototype.device.android, - comment: comment + comment: comment, + textAddComment: me.textAddComment }); $commentInfo.html(insert); _.defer(function () { diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index f80c28ea9..7b392a88d 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -105,6 +105,7 @@ "DE.Controllers.AddOther.textDeleteDraft": "Do you really want to delete draft?", "DE.Controllers.AddOther.textCancel": "Cancel", "DE.Controllers.AddOther.textContinue": "Continue", + "DE.Controllers.AddOther.textDelete": "Delete", "DE.Controllers.AddTable.textCancel": "Cancel", "DE.Controllers.AddTable.textColumns": "Columns", "DE.Controllers.AddTable.textRows": "Rows", diff --git a/apps/documenteditor/mobile/resources/css/app-ios.css b/apps/documenteditor/mobile/resources/css/app-ios.css index 9d6be9bf5..b63c03cf7 100644 --- a/apps/documenteditor/mobile/resources/css/app-ios.css +++ b/apps/documenteditor/mobile/resources/css/app-ios.css @@ -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-add-reply .reply-date, .page-edit-reply .reply-date { - font-size: 12px; + font-size: 13px; line-height: 18px; color: #6d6d72; margin: 0; @@ -6748,8 +6748,8 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after background: transparent; outline: none; width: 100%; - font-size: 15px; - border: 1px solid #c4c4c4; + font-size: 17px; + border: none; border-radius: 3px; 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-reply .user-name { font-weight: bold; + font-size: 17px; + padding-left: 5px; } .page-add-comment .wrap-comment .comment-date, .page-add-comment .wrap-reply .comment-date { - font-size: 12px; + font-size: 13px; color: #6d6d72; + padding-left: 5px; } .page-add-comment .wrap-comment .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-reply .wrap-textarea .comment-textarea { - border: 1px solid #c4c4c4; + font-size: 17px; + border: none; margin-top: 0; min-height: 100px; border-radius: 4px; 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 { height: 100%; diff --git a/apps/documenteditor/mobile/resources/css/app-material.css b/apps/documenteditor/mobile/resources/css/app-material.css index 0beb5df9f..7d6f7b7b2 100644 --- a/apps/documenteditor/mobile/resources/css/app-material.css +++ b/apps/documenteditor/mobile/resources/css/app-material.css @@ -6532,11 +6532,12 @@ html.phone .document-menu .list-block .item-link { } .page-add-comment .wrap-comment .user-name, .page-add-comment .wrap-reply .user-name { + font-size: 17px; font-weight: bold; } .page-add-comment .wrap-comment .comment-date, .page-add-comment .wrap-reply .comment-date { - font-size: 12px; + font-size: 13px; color: #6d6d72; } .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-reply .wrap-textarea .comment-textarea { - border: 1px solid #c4c4c4; + font-size: 17px; + border: none; margin-top: 0; min-height: 100px; 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-add-reply { height: 100%; diff --git a/apps/presentationeditor/mobile/app/controller/add/AddContainer.js b/apps/presentationeditor/mobile/app/controller/add/AddContainer.js index c7ca039ae..f0d1c59d4 100644 --- a/apps/presentationeditor/mobile/app/controller/add/AddContainer.js +++ b/apps/presentationeditor/mobile/app/controller/add/AddContainer.js @@ -183,10 +183,7 @@ define([ var $layoutPages = $( '
' + '
' + - '
' + - '
' + - '
' + - '
' + + '
' + '
' + '
' + '
' diff --git a/apps/presentationeditor/mobile/app/controller/add/AddOther.js b/apps/presentationeditor/mobile/app/controller/add/AddOther.js index 1699b6d60..77308a714 100644 --- a/apps/presentationeditor/mobile/app/controller/add/AddOther.js +++ b/apps/presentationeditor/mobile/app/controller/add/AddOther.js @@ -153,7 +153,8 @@ define([ text: this.textCancel }, { - text: this.textContinue, + text: this.textDelete, + bold: true, onClick: function () { PE.getController('AddContainer').rootView.router.back(); } @@ -176,7 +177,8 @@ define([ textDeleteDraft: 'Do you really want to delete draft?', textCancel: 'Cancel', - textContinue: 'Continue' + //textContinue: 'Continue', + textDelete: 'Delete' } })(), PE.Controllers.AddOther || {})) diff --git a/apps/presentationeditor/mobile/app/controller/edit/EditContainer.js b/apps/presentationeditor/mobile/app/controller/edit/EditContainer.js index 5281fd7df..722f33e5d 100644 --- a/apps/presentationeditor/mobile/app/controller/edit/EditContainer.js +++ b/apps/presentationeditor/mobile/app/controller/edit/EditContainer.js @@ -230,10 +230,7 @@ define([ var $layoutPages = $( '
' + '
' + - '
' + - '
' + - '
' + - '
' + + '
' + '
' + '
' + '
' diff --git a/apps/presentationeditor/mobile/app/template/EditChart.template b/apps/presentationeditor/mobile/app/template/EditChart.template index 6c9ec42f5..64e193d10 100644 --- a/apps/presentationeditor/mobile/app/template/EditChart.template +++ b/apps/presentationeditor/mobile/app/template/EditChart.template @@ -131,8 +131,7 @@
-
-
+
<% _.each(types, function(row) { %>
    @@ -144,7 +143,7 @@
<% }); %>
-
+
@@ -180,7 +179,6 @@
-
diff --git a/apps/presentationeditor/mobile/app/template/EditShape.template b/apps/presentationeditor/mobile/app/template/EditShape.template index e8a7579af..1c330e770 100644 --- a/apps/presentationeditor/mobile/app/template/EditShape.template +++ b/apps/presentationeditor/mobile/app/template/EditShape.template @@ -162,8 +162,7 @@
-
-
+
@@ -216,7 +215,6 @@
-
diff --git a/apps/presentationeditor/mobile/app/template/EditTable.template b/apps/presentationeditor/mobile/app/template/EditTable.template index 8b6d3b379..2846e673f 100644 --- a/apps/presentationeditor/mobile/app/template/EditTable.template +++ b/apps/presentationeditor/mobile/app/template/EditTable.template @@ -110,8 +110,7 @@
-
-
+
    @@ -191,7 +190,6 @@
-
diff --git a/apps/presentationeditor/mobile/app/view/add/AddOther.js b/apps/presentationeditor/mobile/app/view/add/AddOther.js index 6aafebc96..5748aeb36 100644 --- a/apps/presentationeditor/mobile/app/view/add/AddOther.js +++ b/apps/presentationeditor/mobile/app/view/add/AddOther.js @@ -138,6 +138,7 @@ define([ }, renderComment: function(comment) { + var me = this; _.delay(function () { var $commentInfo = $('#comment-info'); var template = [ @@ -145,11 +146,12 @@ define([ '
<%= comment.username %>
', '
<%= comment.date %>
', '<% if (android) { %><% } %>', - '
' + '
' ].join(''); var insert = _.template(template)({ android: Framework7.prototype.device.android, - comment: comment + comment: comment, + textAddComment: me.textAddComment }); $commentInfo.html(insert); _.defer(function () { diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index 310b6d726..cc3f490f2 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -50,6 +50,7 @@ "PE.Controllers.AddOther.textDeleteDraft": "Do you really want to delete draft?", "PE.Controllers.AddOther.textCancel": "Cancel", "PE.Controllers.AddOther.textContinue": "Continue", + "PE.Controllers.AddOther.textDelete": "Delete", "PE.Controllers.DocumentHolder.menuAddLink": "Add Link", "PE.Controllers.DocumentHolder.menuCopy": "Copy", "PE.Controllers.DocumentHolder.menuCut": "Cut", diff --git a/apps/presentationeditor/mobile/resources/css/app-ios.css b/apps/presentationeditor/mobile/resources/css/app-ios.css index 4c53197da..c7c2a84e9 100644 --- a/apps/presentationeditor/mobile/resources/css/app-ios.css +++ b/apps/presentationeditor/mobile/resources/css/app-ios.css @@ -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-add-reply .reply-date, .page-edit-reply .reply-date { - font-size: 12px; + font-size: 13px; line-height: 18px; color: #6d6d72; margin: 0; @@ -6748,8 +6748,8 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after background: transparent; outline: none; width: 100%; - font-size: 15px; - border: 1px solid #c4c4c4; + font-size: 17px; + border: none; border-radius: 3px; 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-reply .user-name { font-weight: bold; + font-size: 17px; + padding-left: 5px; } .page-add-comment .wrap-comment .comment-date, .page-add-comment .wrap-reply .comment-date { - font-size: 12px; + font-size: 13px; color: #6d6d72; + padding-left: 5px; } .page-add-comment .wrap-comment .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-reply .wrap-textarea .comment-textarea { - border: 1px solid #c4c4c4; + font-size: 17px; + border: none; margin-top: 0; min-height: 100px; border-radius: 4px; 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 { height: 100%; diff --git a/apps/presentationeditor/mobile/resources/css/app-material.css b/apps/presentationeditor/mobile/resources/css/app-material.css index db85e3b04..351416bdf 100644 --- a/apps/presentationeditor/mobile/resources/css/app-material.css +++ b/apps/presentationeditor/mobile/resources/css/app-material.css @@ -6532,11 +6532,12 @@ html.phone .document-menu .list-block .item-link { } .page-add-comment .wrap-comment .user-name, .page-add-comment .wrap-reply .user-name { + font-size: 17px; font-weight: bold; } .page-add-comment .wrap-comment .comment-date, .page-add-comment .wrap-reply .comment-date { - font-size: 12px; + font-size: 13px; color: #6d6d72; } .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-reply .wrap-textarea .comment-textarea { - border: 1px solid #c4c4c4; + font-size: 17px; + border: none; margin-top: 0; min-height: 100px; 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-add-reply { height: 100%; diff --git a/apps/spreadsheeteditor/mobile/app/controller/add/AddContainer.js b/apps/spreadsheeteditor/mobile/app/controller/add/AddContainer.js index 70c6a8adf..9581680ad 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/add/AddContainer.js +++ b/apps/spreadsheeteditor/mobile/app/controller/add/AddContainer.js @@ -256,12 +256,8 @@ define([ var $layoutPages = $('
' + '
' + - '
' + - '
' + - '
' + + '
' + _arrangePages({pages: layoutAdds}) + - '
' + - '
' + '
' + '
' + '
'); diff --git a/apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js b/apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js index e62a322e1..70605b823 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js +++ b/apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js @@ -142,7 +142,8 @@ define([ text: this.textCancel }, { - text: this.textContinue, + text: this.textDelete, + bold: true, onClick: function () { 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\"', textDeleteDraft: 'Do you really want to delete draft?', textCancel: 'Cancel', - textContinue: 'Continue' + //textContinue: 'Continue', + textDelete: 'Delete' } })(), SSE.Controllers.AddOther || {})) }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditContainer.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditContainer.js index f60bfcead..24b694b84 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditContainer.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditContainer.js @@ -231,10 +231,7 @@ define([ var $layoutPages = $( '
' + '
' + - '
' + - '
' + - '
' + - '
' + + '
' + '
' + '
' + '
' diff --git a/apps/spreadsheeteditor/mobile/app/template/EditChart.template b/apps/spreadsheeteditor/mobile/app/template/EditChart.template index 54c2da199..8cee747c5 100644 --- a/apps/spreadsheeteditor/mobile/app/template/EditChart.template +++ b/apps/spreadsheeteditor/mobile/app/template/EditChart.template @@ -153,8 +153,7 @@ <% } %>
-
-
+
<% _.each(types, function(row) { %>
    @@ -166,7 +165,7 @@
<% }); %>
-
+
@@ -202,7 +201,6 @@
-
diff --git a/apps/spreadsheeteditor/mobile/app/template/EditShape.template b/apps/spreadsheeteditor/mobile/app/template/EditShape.template index 30844ae54..cb5026491 100644 --- a/apps/spreadsheeteditor/mobile/app/template/EditShape.template +++ b/apps/spreadsheeteditor/mobile/app/template/EditShape.template @@ -153,8 +153,7 @@
-
-
+
@@ -207,7 +206,6 @@
-
diff --git a/apps/spreadsheeteditor/mobile/app/view/add/AddOther.js b/apps/spreadsheeteditor/mobile/app/view/add/AddOther.js index fbc7d6967..96d7d37bc 100644 --- a/apps/spreadsheeteditor/mobile/app/view/add/AddOther.js +++ b/apps/spreadsheeteditor/mobile/app/view/add/AddOther.js @@ -212,6 +212,7 @@ define([ }, renderComment: function(comment) { + var me = this; _.delay(function () { var $commentInfo = $('#comment-info'); var template = [ @@ -219,11 +220,12 @@ define([ '
<%= comment.username %>
', '
<%= comment.date %>
', '<% if (android) { %><% } %>', - '
' + '
' ].join(''); var insert = _.template(template)({ android: Framework7.prototype.device.android, - comment: comment + comment: comment, + textAddComment: me.textAddComment }); $commentInfo.html(insert); _.defer(function () { diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 65cf7a6b6..dd1ba534c 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -42,6 +42,7 @@ "SSE.Controllers.AddOther.textDeleteDraft": "Do you really want to delete draft?", "SSE.Controllers.AddOther.textCancel": "Cancel", "SSE.Controllers.AddOther.textContinue": "Continue", + "SSE.Controllers.AddOther.textDelete": "Delete", "SSE.Controllers.DocumentHolder.menuAddLink": "Add Link", "SSE.Controllers.DocumentHolder.menuCell": "Cell", "SSE.Controllers.DocumentHolder.menuCopy": "Copy", diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css index b18dcba25..d27b028a1 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css @@ -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-add-reply .reply-date, .page-edit-reply .reply-date { - font-size: 12px; + font-size: 13px; line-height: 18px; color: #6d6d72; margin: 0; @@ -6741,8 +6741,8 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after background: transparent; outline: none; width: 100%; - font-size: 15px; - border: 1px solid #c4c4c4; + font-size: 17px; + border: none; border-radius: 3px; 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-reply .user-name { font-weight: bold; + font-size: 17px; + padding-left: 5px; } .page-add-comment .wrap-comment .comment-date, .page-add-comment .wrap-reply .comment-date { - font-size: 12px; + font-size: 13px; color: #6d6d72; + padding-left: 5px; } .page-add-comment .wrap-comment .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-reply .wrap-textarea .comment-textarea { - border: 1px solid #c4c4c4; + font-size: 17px; + border: none; margin-top: 0; min-height: 100px; border-radius: 4px; 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 { height: 100%; diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-material.css b/apps/spreadsheeteditor/mobile/resources/css/app-material.css index 8d86bf5ee..441eb853b 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-material.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-material.css @@ -6542,11 +6542,12 @@ html.phone .document-menu .list-block .item-link { } .page-add-comment .wrap-comment .user-name, .page-add-comment .wrap-reply .user-name { + font-size: 17px; font-weight: bold; } .page-add-comment .wrap-comment .comment-date, .page-add-comment .wrap-reply .comment-date { - font-size: 12px; + font-size: 13px; color: #6d6d72; } .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-reply .wrap-textarea .comment-textarea { - border: 1px solid #c4c4c4; + font-size: 17px; + border: none; margin-top: 0; min-height: 100px; 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-add-reply { height: 100%;