From add8ec86219c69ba73c9c4556d7ae7f1da6fe746 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Wed, 6 May 2020 15:46:12 +0300 Subject: [PATCH] [mobile] Fix comments --- .../mobile/lib/controller/Collaboration.js | 12 ++++++++---- apps/common/mobile/lib/view/Collaboration.js | 6 +++--- .../resources/less/ios/_collaboration.less | 4 ---- .../less/material/_collaboration.less | 9 --------- .../mobile/app/controller/Main.js | 2 +- .../mobile/app/controller/Settings.js | 6 +++--- .../mobile/app/controller/add/AddContainer.js | 2 +- .../mobile/resources/css/app-ios.css | 6 ------ .../mobile/resources/css/app-material.css | 19 +++++-------------- .../resources/less/material/_icons.less | 10 +++++----- .../mobile/resources/css/app-ios.css | 6 ------ .../mobile/resources/css/app-material.css | 19 +++++-------------- .../resources/less/material/_icons.less | 10 +++++----- .../mobile/app/controller/Main.js | 2 +- .../mobile/app/controller/Settings.js | 6 +++--- .../mobile/resources/css/app-ios.css | 6 ------ .../mobile/resources/css/app-material.css | 19 +++++-------------- .../resources/less/material/_icons.less | 10 +++++----- 18 files changed, 50 insertions(+), 104 deletions(-) diff --git a/apps/common/mobile/lib/controller/Collaboration.js b/apps/common/mobile/lib/controller/Collaboration.js index 3f2694a0a..2b00c0b13 100644 --- a/apps/common/mobile/lib/controller/Collaboration.js +++ b/apps/common/mobile/lib/controller/Collaboration.js @@ -786,7 +786,7 @@ define([ disabledViewComments: function(disabled) { if ($('.container-view-comment').length > 0) { if (disabled) { - $('.comment-resolve, .comment-menu, .add-reply').addClass('disabled'); + $('.comment-resolve, .comment-menu, .add-reply, .reply-menu').addClass('disabled'); if (!$('.prev-comment').hasClass('disabled')) { $('.prev-comment').addClass('disabled'); } @@ -794,7 +794,7 @@ define([ $('.next-comment').addClass('disabled'); } } else { - $('.comment-resolve, .comment-menu, .add-reply').removeClass('disabled'); + $('.comment-resolve, .comment-menu, .add-reply, .reply-menu').removeClass('disabled'); if (this.showComments.length > 1) { $('.prev-comment, .next-comment').removeClass('disabled'); } @@ -1268,6 +1268,7 @@ define([ $textarea.selectionStart = $textarea.value.length; }, 100); } else { + me.disabledViewComments(true); if ($('.comment-textarea').length === 0) { var $viewComment = $('.container-view-comment'); var oldComment = $viewComment.find('.comment-text span').text(); @@ -1348,6 +1349,7 @@ define([ }); $('.popup').css('z-index', '20000'); } else { + me.disabledViewComments(true); var $reply = $('.reply-item[data-ind=' + indReply + ']'); var $viewComment = $('.container-view-comment'); $reply.find('.reply-text').css('display', 'none'); @@ -1369,7 +1371,7 @@ define([ $textarea.selectionStart = $textarea.value.length; }); $('#edit-reply').single('click', _.bind(me.onEditReply, me, comment, indReply)); - $('.cancel-reply').single('click', _.bind(me.onCancelEditReply, me)); + $('.cancel-reply').single('click', _.bind(me.onCancelEditReply, me, indReply)); } } }, @@ -1404,7 +1406,9 @@ define([ } }, - onCancelEditReply: function() { + onCancelEditReply: function(indReply) { + var $viewComment = $('.container-view-comment'), + $reply = $('.reply-item[data-ind=' + indReply + ']'); $viewComment.find('a#edit-reply, a.cancel-reply, .edit-reply-textarea').remove(); $reply.find('.reply-text').css('display', 'block'); $viewComment.find('a.prev-comment, a.next-comment, a.add-reply').css('display', 'flex'); diff --git a/apps/common/mobile/lib/view/Collaboration.js b/apps/common/mobile/lib/view/Collaboration.js index 13a47f164..66b26c2d9 100644 --- a/apps/common/mobile/lib/view/Collaboration.js +++ b/apps/common/mobile/lib/view/Collaboration.js @@ -344,7 +344,7 @@ define([ '
' + '
' + (isAndroid ? '' : '' + this.textCancel + '') + '
' + '
' + this.textAddReply + '
' + - '
' + (isAndroid ? '' : '' + this.textDone + '') + '
' + + '
' + (isAndroid ? '' : '' + this.textDone + '') + '
' + '
' + '' + '
' + @@ -392,7 +392,7 @@ define([ '
' + '
' + (isAndroid ? ' ' : '' + this.textCancel + '') + '
' + '
' + this.textEditСomment + '
' + - '
' + (isAndroid ? '' : '' + this.textDone + '') + '
' + + '
' + (isAndroid ? '' : '' + this.textDone + '') + '
' + '
' + '
' + '
' + @@ -417,7 +417,7 @@ define([ '
' + '
' + (isAndroid ? '' : '' + this.textCancel + '') + '
' + '
' + this.textEditReply + '
' + - '
' + (isAndroid ? '' : '' + this.textDone + '') + '
' + + '
' + (isAndroid ? '' : '' + this.textDone + '') + '
' + '
' + '
' + '
' + diff --git a/apps/common/mobile/resources/less/ios/_collaboration.less b/apps/common/mobile/resources/less/ios/_collaboration.less index d3a89c340..698a6d96a 100644 --- a/apps/common/mobile/resources/less/ios/_collaboration.less +++ b/apps/common/mobile/resources/less/ios/_collaboration.less @@ -195,9 +195,6 @@ } .container-edit-comment { - .navbar { - background-color: #FFFFFF; - } .page { background-color: #FFFFFF; } @@ -378,7 +375,6 @@ .container-add-reply { height: 100%; .navbar { - background-color: #FFFFFF; a.link i + span { margin-left: 0; } diff --git a/apps/common/mobile/resources/less/material/_collaboration.less b/apps/common/mobile/resources/less/material/_collaboration.less index d58a5a7ee..0f0e93925 100644 --- a/apps/common/mobile/resources/less/material/_collaboration.less +++ b/apps/common/mobile/resources/less/material/_collaboration.less @@ -220,13 +220,6 @@ display: none; } -.container-edit-comment { - .navbar { - background-color: #FFFFFF; - color: @themeColor; - } -} - //view comment .container-view-comment { position: fixed; @@ -407,8 +400,6 @@ .container-edit-comment, .container-add-reply { height: 100%; .navbar { - background-color: #FFFFFF; - color: #000; &:after { content: ''; position: absolute; diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index 2f0351f5b..a630bb57c 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -528,7 +528,7 @@ define([ me.api.asc_SetTrackRevisions(me.appOptions.isReviewOnly || Common.localStorage.getBool("de-mobile-track-changes-" + (me.appOptions.fileKey || ''))); /** coauthoring begin **/ - this.isLiveCommenting = Common.localStorage.getBool("de-settings-livecomment", true); + this.isLiveCommenting = Common.localStorage.getBool("de-mobile-settings-livecomment", true); var resolved = Common.localStorage.getBool("de-settings-resolvedcomment", true); this.isLiveCommenting ? this.api.asc_showComments(resolved) : this.api.asc_hideComments(); /** coauthoring end **/ diff --git a/apps/documenteditor/mobile/app/controller/Settings.js b/apps/documenteditor/mobile/app/controller/Settings.js index a1205cd8f..c058d65bd 100644 --- a/apps/documenteditor/mobile/app/controller/Settings.js +++ b/apps/documenteditor/mobile/app/controller/Settings.js @@ -237,7 +237,7 @@ define([ $('#settings-hidden-borders input:checkbox').attr('checked', (Common.localStorage.getItem("de-mobile-hidden-borders") == 'true') ? true : false); $('#settings-hidden-borders input:checkbox').single('change', _.bind(me.onShowTableEmptyLine, me)); $('#settings-orthography').single('click', _.bind(me.onOrthographyCheck, me)); - var displayComments = Common.localStorage.getBool("de-settings-livecomment", true); + var displayComments = Common.localStorage.getBool("de-mobile-settings-livecomment", true); $('#settings-display-comments input:checkbox').attr('checked', displayComments); $('#settings-display-comments input:checkbox').single('change', _.bind(me.onChangeDisplayComments, me)); var displayResolved = Common.localStorage.getBool("de-settings-resolvedcomment", true); @@ -285,11 +285,11 @@ define([ this.api.asc_showComments(resolved); $("#settings-display-resolved").removeClass("disabled"); } - Common.localStorage.setBool("de-settings-livecomment", displayComments); + Common.localStorage.setBool("de-mobile-settings-livecomment", displayComments); }, onChangeDisplayResolved: function(e) { - var displayComments = Common.localStorage.getBool("de-settings-livecomment"); + var displayComments = Common.localStorage.getBool("de-mobile-settings-livecomment"); if (displayComments) { var resolved = $(e.currentTarget).is(':checked'); if (this.api) { diff --git a/apps/documenteditor/mobile/app/controller/add/AddContainer.js b/apps/documenteditor/mobile/app/controller/add/AddContainer.js index 6a5975fef..265a0412b 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(); }, diff --git a/apps/documenteditor/mobile/resources/css/app-ios.css b/apps/documenteditor/mobile/resources/css/app-ios.css index 3c06ccd77..9d6be9bf5 100644 --- a/apps/documenteditor/mobile/resources/css/app-ios.css +++ b/apps/documenteditor/mobile/resources/css/app-ios.css @@ -6757,9 +6757,6 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after .settings.popover .list-block ul.list-reply:last-child:after { display: none; } -.container-edit-comment .navbar { - background-color: #FFFFFF; -} .container-edit-comment .page { background-color: #FFFFFF; } @@ -6930,9 +6927,6 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after .container-add-reply { height: 100%; } -.container-add-reply .navbar { - background-color: #FFFFFF; -} .container-add-reply .navbar a.link i + span { margin-left: 0; } diff --git a/apps/documenteditor/mobile/resources/css/app-material.css b/apps/documenteditor/mobile/resources/css/app-material.css index 67d4bd728..0beb5df9f 100644 --- a/apps/documenteditor/mobile/resources/css/app-material.css +++ b/apps/documenteditor/mobile/resources/css/app-material.css @@ -6387,10 +6387,6 @@ html.phone .document-menu .list-block .item-link { .settings.popover .list-block ul.list-reply:last-child:after { display: none; } -.container-edit-comment .navbar { - background-color: #FFFFFF; - color: #446995; -} .container-view-comment { position: fixed; -webkit-transition: height 100ms; @@ -6559,11 +6555,6 @@ html.phone .document-menu .list-block .item-link { .container-add-reply { height: 100%; } -.container-edit-comment .navbar, -.container-add-reply .navbar { - background-color: #FFFFFF; - color: #000; -} .container-edit-comment .navbar:after, .container-add-reply .navbar:after { content: ''; @@ -7101,11 +7092,6 @@ i.icon.icon-next-comment { height: 24px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M9.98438%206L15.9844%2012L9.98438%2018L8.57812%2016.5938L13.1719%2012L8.57812%207.40625L9.98438%206Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); } -i.icon.icon-close-comment { - width: 24px; - height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M18.9844%206.42188L13.4062%2012L18.9844%2017.5781L17.5781%2018.9844L12%2013.4062L6.42188%2018.9844L5.01562%2017.5781L10.5938%2012L5.01562%206.42188L6.42188%205.01562L12%2010.5938L17.5781%205.01562L18.9844%206.42188Z%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%200.6)%22%2F%3E%3C%2Fsvg%3E"); -} i.icon.icon-done-comment { width: 24px; height: 24px; @@ -7201,6 +7187,11 @@ i.icon.icon-done-comment-white { height: 24px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M7%2012C7%2013.6569%205.65685%2015%204%2015C2.34315%2015%201%2013.6569%201%2012C1%2010.3431%202.34315%209%204%209C5.65685%209%207%2010.3431%207%2012ZM15%2012C15%2013.6569%2013.6569%2015%2012%2015C10.3431%2015%209%2013.6569%209%2012C9%2010.3431%2010.3431%209%2012%209C13.6569%209%2015%2010.3431%2015%2012ZM20%2015C21.6569%2015%2023%2013.6569%2023%2012C23%2010.3431%2021.6569%209%2020%209C18.3431%209%2017%2010.3431%2017%2012C17%2013.6569%2018.3431%2015%2020%2015Z%22%20fill%3D%22%23fff%22%2F%3E%3C%2Fsvg%3E"); } +.navbar i.icon.icon-close-comment { + width: 24px; + height: 24px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M18.9844%206.42188L13.4062%2012L18.9844%2017.5781L17.5781%2018.9844L12%2013.4062L6.42188%2018.9844L5.01562%2017.5781L10.5938%2012L5.01562%206.42188L6.42188%205.01562L12%2010.5938L17.5781%205.01562L18.9844%206.42188Z%22%20fill%3D%22%23fff%22%2F%3E%3C%2Fsvg%3E"); +} .sailfish i.icon.icon-text-align-center { background-color: transparent; -webkit-mask-image: none; diff --git a/apps/documenteditor/mobile/resources/less/material/_icons.less b/apps/documenteditor/mobile/resources/less/material/_icons.less index 4db39aeac..8e6ee9569 100644 --- a/apps/documenteditor/mobile/resources/less/material/_icons.less +++ b/apps/documenteditor/mobile/resources/less/material/_icons.less @@ -429,11 +429,6 @@ i.icon { height: 24px; .encoded-svg-background(''); } - &.icon-close-comment { - width: 24px; - height: 24px; - .encoded-svg-background(''); - } &.icon-done-comment { width: 24px; height: 24px; @@ -535,5 +530,10 @@ i.icon { height: 24px; .encoded-svg-background(''); } + &.icon-close-comment { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } } } \ No newline at end of file diff --git a/apps/presentationeditor/mobile/resources/css/app-ios.css b/apps/presentationeditor/mobile/resources/css/app-ios.css index 954b546fb..4c53197da 100644 --- a/apps/presentationeditor/mobile/resources/css/app-ios.css +++ b/apps/presentationeditor/mobile/resources/css/app-ios.css @@ -6757,9 +6757,6 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after .settings.popover .list-block ul.list-reply:last-child:after { display: none; } -.container-edit-comment .navbar { - background-color: #FFFFFF; -} .container-edit-comment .page { background-color: #FFFFFF; } @@ -6930,9 +6927,6 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after .container-add-reply { height: 100%; } -.container-add-reply .navbar { - background-color: #FFFFFF; -} .container-add-reply .navbar a.link i + span { margin-left: 0; } diff --git a/apps/presentationeditor/mobile/resources/css/app-material.css b/apps/presentationeditor/mobile/resources/css/app-material.css index bf6b594e0..db85e3b04 100644 --- a/apps/presentationeditor/mobile/resources/css/app-material.css +++ b/apps/presentationeditor/mobile/resources/css/app-material.css @@ -6387,10 +6387,6 @@ html.phone .document-menu .list-block .item-link { .settings.popover .list-block ul.list-reply:last-child:after { display: none; } -.container-edit-comment .navbar { - background-color: #FFFFFF; - color: #aa5252; -} .container-view-comment { position: fixed; -webkit-transition: height 100ms; @@ -6559,11 +6555,6 @@ html.phone .document-menu .list-block .item-link { .container-add-reply { height: 100%; } -.container-edit-comment .navbar, -.container-add-reply .navbar { - background-color: #FFFFFF; - color: #000; -} .container-edit-comment .navbar:after, .container-add-reply .navbar:after { content: ''; @@ -7081,11 +7072,6 @@ i.icon.icon-next-comment { height: 24px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M9.98438%206L15.9844%2012L9.98438%2018L8.57812%2016.5938L13.1719%2012L8.57812%207.40625L9.98438%206Z%22%20fill%3D%22%23aa5252%22%2F%3E%3C%2Fsvg%3E"); } -i.icon.icon-close-comment { - width: 24px; - height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M18.9844%206.42188L13.4062%2012L18.9844%2017.5781L17.5781%2018.9844L12%2013.4062L6.42188%2018.9844L5.01562%2017.5781L10.5938%2012L5.01562%206.42188L6.42188%205.01562L12%2010.5938L17.5781%205.01562L18.9844%206.42188Z%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%200.6)%22%2F%3E%3C%2Fsvg%3E"); -} i.icon.icon-done-comment { width: 24px; height: 24px; @@ -7196,6 +7182,11 @@ i.icon.icon-link { height: 24px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M7%2012C7%2013.6569%205.65685%2015%204%2015C2.34315%2015%201%2013.6569%201%2012C1%2010.3431%202.34315%209%204%209C5.65685%209%207%2010.3431%207%2012ZM15%2012C15%2013.6569%2013.6569%2015%2012%2015C10.3431%2015%209%2013.6569%209%2012C9%2010.3431%2010.3431%209%2012%209C13.6569%209%2015%2010.3431%2015%2012ZM20%2015C21.6569%2015%2023%2013.6569%2023%2012C23%2010.3431%2021.6569%209%2020%209C18.3431%209%2017%2010.3431%2017%2012C17%2013.6569%2018.3431%2015%2020%2015Z%22%20fill%3D%22%23fff%22%2F%3E%3C%2Fsvg%3E"); } +.navbar i.icon.icon-close-comment { + width: 24px; + height: 24px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M18.9844%206.42188L13.4062%2012L18.9844%2017.5781L17.5781%2018.9844L12%2013.4062L6.42188%2018.9844L5.01562%2017.5781L10.5938%2012L5.01562%206.42188L6.42188%205.01562L12%2010.5938L17.5781%205.01562L18.9844%206.42188Z%22%20fill%3D%22%23fff%22%2F%3E%3C%2Fsvg%3E"); +} .sailfish i.icon.icon-text-align-center { background-color: transparent; -webkit-mask-image: none; diff --git a/apps/presentationeditor/mobile/resources/less/material/_icons.less b/apps/presentationeditor/mobile/resources/less/material/_icons.less index d998fdfa3..ef2e2e839 100644 --- a/apps/presentationeditor/mobile/resources/less/material/_icons.less +++ b/apps/presentationeditor/mobile/resources/less/material/_icons.less @@ -416,11 +416,6 @@ i.icon { height: 24px; .encoded-svg-background(''); } - &.icon-close-comment { - width: 24px; - height: 24px; - .encoded-svg-background(''); - } &.icon-done-comment { width: 24px; height: 24px; @@ -536,5 +531,10 @@ i.icon { height: 24px; .encoded-svg-background(''); } + &.icon-close-comment { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index 2f38c4a03..bf5493a3c 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -526,7 +526,7 @@ define([ this.api.asc_setZoom(zf>0 ? zf : 1); /** coauthoring begin **/ - this.isLiveCommenting = Common.localStorage.getBool("sse-settings-livecomment", true); + this.isLiveCommenting = Common.localStorage.getBool("sse-mobile-settings-livecomment", true); var resolved = Common.localStorage.getBool("sse-settings-resolvedcomment", true); this.isLiveCommenting ? this.api.asc_showComments(resolved) : this.api.asc_hideComments(); diff --git a/apps/spreadsheeteditor/mobile/app/controller/Settings.js b/apps/spreadsheeteditor/mobile/app/controller/Settings.js index bb74e6fc9..847826eed 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Settings.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Settings.js @@ -595,7 +595,7 @@ define([ $r1c1Style.single('change', _.bind(me.clickR1C1Style, me)); //init Commenting Display - var displayComments = Common.localStorage.getBool("sse-settings-livecomment", true); + var displayComments = Common.localStorage.getBool("sse-mobile-settings-livecomment", true); $('#settings-display-comments input:checkbox').attr('checked', displayComments); $('#settings-display-comments input:checkbox').single('change', _.bind(me.onChangeDisplayComments, me)); var displayResolved = Common.localStorage.getBool("sse-settings-resolvedcomment", true); @@ -619,11 +619,11 @@ define([ this.api.asc_showComments(resolved); $("#settings-display-resolved").removeClass("disabled"); } - Common.localStorage.setBool("sse-settings-livecomment", displayComments); + Common.localStorage.setBool("sse-mobile-settings-livecomment", displayComments); }, onChangeDisplayResolved: function(e) { - var displayComments = Common.localStorage.getBool("sse-settings-livecomment"); + var displayComments = Common.localStorage.getBool("sse-mobile-settings-livecomment"); if (displayComments) { var resolved = $(e.currentTarget).is(':checked'); if (this.api) { diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css index 828087606..b18dcba25 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css @@ -6750,9 +6750,6 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after .settings.popover .list-block ul.list-reply:last-child:after { display: none; } -.container-edit-comment .navbar { - background-color: #FFFFFF; -} .container-edit-comment .page { background-color: #FFFFFF; } @@ -6923,9 +6920,6 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after .container-add-reply { height: 100%; } -.container-add-reply .navbar { - background-color: #FFFFFF; -} .container-add-reply .navbar a.link i + span { margin-left: 0; } diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-material.css b/apps/spreadsheeteditor/mobile/resources/css/app-material.css index dfaba16c0..8d86bf5ee 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-material.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-material.css @@ -6397,10 +6397,6 @@ html.phone .document-menu .list-block .item-link { .settings.popover .list-block ul.list-reply:last-child:after { display: none; } -.container-edit-comment .navbar { - background-color: #FFFFFF; - color: #40865c; -} .container-view-comment { position: fixed; -webkit-transition: height 100ms; @@ -6569,11 +6565,6 @@ html.phone .document-menu .list-block .item-link { .container-add-reply { height: 100%; } -.container-edit-comment .navbar, -.container-add-reply .navbar { - background-color: #FFFFFF; - color: #000; -} .container-edit-comment .navbar:after, .container-add-reply .navbar:after { content: ''; @@ -7075,11 +7066,6 @@ i.icon.icon-next-comment { height: 24px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M9.98438%206L15.9844%2012L9.98438%2018L8.57812%2016.5938L13.1719%2012L8.57812%207.40625L9.98438%206Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fsvg%3E"); } -i.icon.icon-close-comment { - width: 24px; - height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M18.9844%206.42188L13.4062%2012L18.9844%2017.5781L17.5781%2018.9844L12%2013.4062L6.42188%2018.9844L5.01562%2017.5781L10.5938%2012L5.01562%206.42188L6.42188%205.01562L12%2010.5938L17.5781%205.01562L18.9844%206.42188Z%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%200.6)%22%2F%3E%3C%2Fsvg%3E"); -} i.icon.icon-done-comment { width: 24px; height: 24px; @@ -7180,6 +7166,11 @@ i.icon.icon-done-comment-white { height: 24px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M7%2012C7%2013.6569%205.65685%2015%204%2015C2.34315%2015%201%2013.6569%201%2012C1%2010.3431%202.34315%209%204%209C5.65685%209%207%2010.3431%207%2012ZM15%2012C15%2013.6569%2013.6569%2015%2012%2015C10.3431%2015%209%2013.6569%209%2012C9%2010.3431%2010.3431%209%2012%209C13.6569%209%2015%2010.3431%2015%2012ZM20%2015C21.6569%2015%2023%2013.6569%2023%2012C23%2010.3431%2021.6569%209%2020%209C18.3431%209%2017%2010.3431%2017%2012C17%2013.6569%2018.3431%2015%2020%2015Z%22%20fill%3D%22%23fff%22%2F%3E%3C%2Fsvg%3E"); } +.navbar i.icon.icon-close-comment { + width: 24px; + height: 24px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M18.9844%206.42188L13.4062%2012L18.9844%2017.5781L17.5781%2018.9844L12%2013.4062L6.42188%2018.9844L5.01562%2017.5781L10.5938%2012L5.01562%206.42188L6.42188%205.01562L12%2010.5938L17.5781%205.01562L18.9844%206.42188Z%22%20fill%3D%22%23fff%22%2F%3E%3C%2Fsvg%3E"); +} .chart-types .thumb.bar-normal { background-image: url('../img/charts/chart-03.png'); } diff --git a/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less b/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less index f75328c16..2cc96f141 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less +++ b/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less @@ -368,11 +368,6 @@ i.icon { height: 24px; .encoded-svg-background(''); } - &.icon-close-comment { - width: 24px; - height: 24px; - .encoded-svg-background(''); - } &.icon-done-comment { width: 24px; height: 24px; @@ -478,6 +473,11 @@ i.icon { height: 24px; .encoded-svg-background(''); } + &.icon-close-comment { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } } }