diff --git a/apps/common/mobile/lib/controller/Collaboration.js b/apps/common/mobile/lib/controller/Collaboration.js index 2b00c0b13..b46a24420 100644 --- a/apps/common/mobile/lib/controller/Collaboration.js +++ b/apps/common/mobile/lib/controller/Collaboration.js @@ -374,10 +374,19 @@ define([ if(arrChangeReview.length == 0) { $('#current-change').css('display','none'); $('.accept-reject').find('a').addClass('disabled'); + $('#current-change').after(_.template('
' + this.textNoChanges + '
')); } else { - $('#current-change #date-change').html(arrChangeReview[0].date); - $('#current-change #user-name').html(arrChangeReview[0].user); - $('#current-change #text-change').html(arrChangeReview[0].changetext); + if ($('#no-changes').length > 0) { + $('#no-changes').remove(); + } + var arr = { + date: arrChangeReview[0].date, + user: arrChangeReview[0].user, + color: arrChangeReview[0].usercolor.get_hex(), + text: arrChangeReview[0].changetext, + initials: this.getInitials(arrChangeReview[0].user) + }; + this.view.renderChangeReview(arr); goto = arrChangeReview[0].goto; } if (goto) { @@ -395,7 +404,7 @@ define([ $('#btn-accept-change').remove(); $('#btn-reject-change').remove(); if(arrChangeReview.length != 0 && arrChangeReview[0].editable) { - $('.accept-reject').html('
'); + $('.accept-reject').html('' + this.textDelete + ''); $('#btn-delete-change').single('click', _.bind(this.onDeleteChange, this)); } } @@ -449,6 +458,7 @@ define([ $('#btn-goto-change').hide(); $('#btn-delete-change').hide(); $('.accept-reject').find('a').addClass('disabled'); + $('#current-change').after(_.template('
' + this.textNoChanges + '
')); } else { $('#current-change').show(); $('.accept-reject').find('a').removeClass('disabled'); @@ -650,12 +660,13 @@ define([ } var date = (item.get_DateTime() == '') ? new Date() : new Date(item.get_DateTime()), user = item.get_UserName(), + userColor = item.get_UserColor(), goto = (item.get_MoveType() == Asc.c_oAscRevisionsMove.MoveTo || item.get_MoveType() == Asc.c_oAscRevisionsMove.MoveFrom); date = me.dateToLocaleTimeString(date); var editable = (item.get_UserId() == _userId); - arr.push({date: date, user: user, changetext: changetext, goto: goto, editable: editable}); + arr.push({date: date, user: user, usercolor: userColor, changetext: changetext, goto: goto, editable: editable}); }); arrChangeReview = arr; dateChange = data; @@ -1771,7 +1782,9 @@ define([ textReopen: 'Reopen', textMessageDeleteComment: 'Do you really want to delete this comment?', textMessageDeleteReply: 'Do you really want to delete this reply?', - textYes: 'Yes' + textYes: 'Yes', + textDelete: 'Delete', + textNoChanges: 'There are no changes.' } })(), Common.Controllers.Collaboration || {})) diff --git a/apps/common/mobile/lib/template/Collaboration.template b/apps/common/mobile/lib/template/Collaboration.template index d1be94a44..8981fba35 100644 --- a/apps/common/mobile/lib/template/Collaboration.template +++ b/apps/common/mobile/lib/template/Collaboration.template @@ -14,6 +14,9 @@
  • +
    + +
    <%= scope.textEditUsers %>
    @@ -23,6 +26,9 @@
  • +
    + +
    <%= scope.textСomments %>
    @@ -33,6 +39,9 @@
  • +
    + +
    <%= scope.textReviewing %>
    @@ -102,9 +111,16 @@
    • + + +
    +
    -
    +
      -
    • +
      • -
    • +
      • -
    • +
      • @@ -196,22 +227,19 @@
      + + + <%= scope.textAccept %> + <%= scope.textReject %> + + + - - - - - - -
      -

      -

      -

      diff --git a/apps/common/mobile/lib/view/Collaboration.js b/apps/common/mobile/lib/view/Collaboration.js index d47f11d1f..aa9ebb472 100644 --- a/apps/common/mobile/lib/view/Collaboration.js +++ b/apps/common/mobile/lib/view/Collaboration.js @@ -439,6 +439,16 @@ define([ return template; }, + renderChangeReview: function(change) { + var isAndroid = Framework7.prototype.device.android === true; + var template = (isAndroid ? '
      ' + change.initials + '
      ' : '') + + '
      ' + change.user + '
      ' + + '
      ' + change.date + '
      ' + + (isAndroid ? '
      ' : '') + + '
      ' + change.text + '
      '; + $('#current-change').html(_.template(template)); + }, + textCollaboration: 'Collaboration', textReviewing: 'Review', textСomments: 'Сomments', @@ -457,7 +467,12 @@ define([ textDone: 'Done', textAddReply: 'Add Reply', textEditReply: 'Edit Reply', - textCancel: 'Cancel' + textCancel: 'Cancel', + textAllChangesEditing: 'All changes (Editing)', + textAllChangesAcceptedPreview: 'All changes accepted (Preview)', + textAllChangesRejectedPreview: 'All changes rejected (Preview)', + textAccept: 'Accept', + textReject: 'Reject' } })(), Common.Views.Collaboration || {})) }); \ No newline at end of file diff --git a/apps/common/mobile/resources/less/ios/_collaboration.less b/apps/common/mobile/resources/less/ios/_collaboration.less index 7a6cf1ebc..919c94f6a 100644 --- a/apps/common/mobile/resources/less/ios/_collaboration.less +++ b/apps/common/mobile/resources/less/ios/_collaboration.less @@ -1,4 +1,5 @@ .page-change { + background-color: #FFFFFF; .block-description { background-color: #fff; padding-top: 15px; @@ -28,23 +29,44 @@ margin-top: 10px; } .block-btn, .content-block.block-btn:first-child { + position: absolute; + bottom: 0; display: flex; flex-direction: row; - justify-content: space-around; - margin: 26px 0; + justify-content: space-between; + margin: 0; + width: 100%; + height: 44px; + align-items: center; + box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2); - #btn-next-change, #btn-reject-change { + #btn-reject-change { margin-left: 20px; } #btn-goto-change { - margin-right: 20px; + margin-left: 10px; } - .right-buttons { + .change-buttons, .accept-reject { display: flex; } - .link { - display: inline-block; + .next-prev { + display: flex; + .link { + width: 44px; + } } + .link { + position: relative; + display: flex; + justify-content: center; + align-items: center; + font-size: 17px; + height: 44px; + min-width: 44px; + } + } + #no-changes { + padding: 16px; } } .navbar .center-collaboration { @@ -61,6 +83,21 @@ } } +//Display mode +.page-display-mode[data-page="display-mode-view"] { + .list-block { + li.media-item { + .item-title { + font-weight: normal; + } + .item-subtitle { + font-size: 14px; + color: @gray; + } + } + } +} + //Edit users @initialEditUser: #373737; diff --git a/apps/common/mobile/resources/less/material/_collaboration.less b/apps/common/mobile/resources/less/material/_collaboration.less index 38a9ef3b9..a7439c97f 100644 --- a/apps/common/mobile/resources/less/material/_collaboration.less +++ b/apps/common/mobile/resources/less/material/_collaboration.less @@ -8,7 +8,7 @@ word-wrap: break-word; } #user-name { - font-size: 17px; + font-size: 16px; line-height: 22px; color: #000000; margin: 0; @@ -28,26 +28,54 @@ margin-top: 10px; } .block-btn { + position: absolute; + bottom: 0; display: flex; flex-direction: row; - justify-content: space-around; + justify-content: space-between; margin: 0; - padding: 26px 0; - background-color: #EFEFF4; + width: 100%; + height: 56px; + align-items: center; + box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2); - #btn-next-change, #btn-reject-change { - margin-left: 20px; + #btn-reject-change { + margin-left: 15px; } - #btn-goto-change { - margin-right: 20px; - } - .right-buttons { + .change-buttons, .accept-reject, .next-prev { display: flex; } .link { - display: inline-block; + position: relative; + display: flex; + justify-content: center; + align-items: center; + font-size: 14px; + text-transform: uppercase; + font-weight: 500; + height: 56px; + min-width: 48px; } } + .header-change { + display: flex; + justify-content: flex-start; + padding-right: 16px; + .initials-change { + height: 40px; + width: 40px; + border-radius: 50px; + color: #FFFFFF; + display: flex; + justify-content: center; + align-items: center; + margin-right: 16px; + font-size: 18px; + } + } + #no-changes { + padding: 16px; + } } .container-collaboration { .navbar .right.close-collaboration { @@ -59,6 +87,15 @@ } } +//Display mode +.page-display-mode { + .list-block { + .item-subtitle { + font-size: 14px; + color: @gray; + } + } +} //Edit users @initialEditUser: #373737; diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index b203cd347..91156dc42 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -69,6 +69,8 @@ "Common.Controllers.Collaboration.textTabs": "Change tabs", "Common.Controllers.Collaboration.textUnderline": "Underline", "Common.Controllers.Collaboration.textWidow": "Widow control", + "Common.Controllers.Collaboration.textDelete": "Delete", + "Common.Controllers.Collaboration.textNoChanges": "There are no changes.", "Common.UI.ThemeColorPalette.textCustomColors": "Custom Colors", "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors", "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors", @@ -93,6 +95,11 @@ "Common.Views.Collaboration.textAddReply": "Add Reply", "Common.Views.Collaboration.textEditReply": "Edit Reply", "Common.Views.Collaboration.textCancel": "Cancel", + "Common.Views.Collaboration.textAllChangesEditing": "All changes (Editing)", + "Common.Views.Collaboration.textAllChangesAcceptedPreview": "All changes accepted (Preview)", + "Common.Views.Collaboration.textAllChangesRejectedPreview": "All changes rejected (Preview)", + "Common.Views.Collaboration.textAccept": "Accept", + "Common.Views.Collaboration.textReject": "Reject", "DE.Controllers.AddContainer.textImage": "Image", "DE.Controllers.AddContainer.textOther": "Other", "DE.Controllers.AddContainer.textShape": "Shape", diff --git a/apps/documenteditor/mobile/resources/css/app-ios.css b/apps/documenteditor/mobile/resources/css/app-ios.css index b63c03cf7..fbc571974 100644 --- a/apps/documenteditor/mobile/resources/css/app-ios.css +++ b/apps/documenteditor/mobile/resources/css/app-ios.css @@ -6403,6 +6403,9 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after margin-left: 20px; color: #212121; } +.page-change { + background-color: #FFFFFF; +} .page-change .block-description { background-color: #fff; padding-top: 15px; @@ -6433,28 +6436,51 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after } .page-change .block-btn, .page-change .content-block.block-btn:first-child { + position: absolute; + bottom: 0; display: flex; flex-direction: row; - justify-content: space-around; - margin: 26px 0; + justify-content: space-between; + margin: 0; + width: 100%; + height: 44px; + align-items: center; + box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2); } -.page-change .block-btn #btn-next-change, -.page-change .content-block.block-btn:first-child #btn-next-change, .page-change .block-btn #btn-reject-change, .page-change .content-block.block-btn:first-child #btn-reject-change { margin-left: 20px; } .page-change .block-btn #btn-goto-change, .page-change .content-block.block-btn:first-child #btn-goto-change { - margin-right: 20px; + margin-left: 10px; } -.page-change .block-btn .right-buttons, -.page-change .content-block.block-btn:first-child .right-buttons { +.page-change .block-btn .change-buttons, +.page-change .content-block.block-btn:first-child .change-buttons, +.page-change .block-btn .accept-reject, +.page-change .content-block.block-btn:first-child .accept-reject { display: flex; } +.page-change .block-btn .next-prev, +.page-change .content-block.block-btn:first-child .next-prev { + display: flex; +} +.page-change .block-btn .next-prev .link, +.page-change .content-block.block-btn:first-child .next-prev .link { + width: 44px; +} .page-change .block-btn .link, .page-change .content-block.block-btn:first-child .link { - display: inline-block; + position: relative; + display: flex; + justify-content: center; + align-items: center; + font-size: 17px; + height: 44px; + min-width: 44px; +} +.page-change #no-changes { + padding: 16px; } .navbar .center-collaboration { display: flex; @@ -6467,6 +6493,13 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after .container-collaboration .page-content .list-block:first-child { margin-top: -1px; } +.page-display-mode[data-page="display-mode-view"] .list-block li.media-item .item-title { + font-weight: normal; +} +.page-display-mode[data-page="display-mode-view"] .list-block li.media-item .item-subtitle { + font-size: 14px; + color: #8e8e93; +} #user-list .item-content { padding-left: 0; } @@ -7472,6 +7505,31 @@ i.icon.icon-collaboration { 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%3Cg%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M15.9912%206C15.9912%208.34102%2015.4074%2010.1346%2014.6055%2011.3121C13.7983%2012.4974%2012.8249%2013%2011.9912%2013C11.1575%2013%2010.1841%2012.4974%209.37695%2011.3121C8.57501%2010.1346%207.99121%208.34102%207.99121%206C7.99121%203.61508%209.96974%202%2011.9912%202C14.0127%202%2015.9912%203.61508%2015.9912%206ZM14.5015%2012.9506C13.7365%2013.6361%2012.8649%2014%2011.9912%2014C11.1195%2014%2010.2499%2013.6378%209.48619%2012.9554C7.78363%2013.6081%206.36015%2014.2591%205.26963%2014.9224C3.55256%2015.9667%203%2016.8326%203%2017.5C3%2018.2545%203.4257%2019.0877%204.82302%2019.7879C6.25015%2020.5031%208.57272%2020.9999%2012%2021C15.4273%2021%2017.7499%2020.5031%2019.177%2019.7879C20.5743%2019.0877%2021%2018.2545%2021%2017.5C21%2016.8326%2020.4474%2015.9667%2018.7304%2014.9224C17.6372%2014.2575%2016.2095%2013.605%2014.5015%2012.9506ZM15.2272%2012.1594C16.2765%2010.7825%2016.9912%208.67814%2016.9912%206C16.9912%203%2014.5%201%2011.9912%201C9.48242%201%206.99121%203%206.99121%206C6.99121%208.68159%207.70777%2010.7879%208.75931%2012.1647C4.60309%2013.7964%202%2015.4951%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.4929%2019.3913%2013.7927%2015.2272%2012.1594Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E"); } +i.icon.icon-users { + 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%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M16%207C16%209.34102%2015.4162%2011.1346%2014.6143%2012.3121C13.8071%2013.4974%2012.8337%2014%2012%2014C11.1663%2014%2010.1929%2013.4974%209.38574%2012.3121C8.5838%2011.1346%208%209.34102%208%207C8%204.61508%209.97853%203%2012%203C14.0215%203%2016%204.61508%2016%207ZM15.1891%2013.2201C14.2865%2014.375%2013.1451%2015%2012%2015C10.8549%2015%209.71347%2014.375%208.81092%2013.2201C7.40473%2013.7844%206.21268%2014.3488%205.26963%2014.9224C3.55256%2015.9667%203%2016.8326%203%2017.5C3%2018.2545%203.4257%2019.0877%204.82302%2019.7879C6.25015%2020.5031%208.57272%2020.9999%2012%2021C15.4273%2021%2017.7499%2020.5031%2019.177%2019.7879C20.5743%2019.0877%2021%2018.2545%2021%2017.5C21%2016.8326%2020.4474%2015.9667%2018.7304%2014.9224C17.7873%2014.3488%2016.5953%2013.7844%2015.1891%2013.2201ZM15.7544%2012.37C16.5137%2011.0279%2017%209.20917%2017%207C17%204%2014.5088%202%2012%202C9.49121%202%207%204%207%207C7%209.20917%207.48633%2011.0279%208.24563%2012.37C4.38973%2013.9392%202%2015.579%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.579%2019.6103%2013.9392%2015.7544%2012.37Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); +} +i.icon.icon-review { + 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%22M3%203H20V7H19V4H4V20H19V14H20V21H3V3Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M16%208H7V7H16V8Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M7%2010H16V9H7V10Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M14%2012H7V11H14V12Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M7%2014H12V13H7V14Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M11%2016H7V15H11V16Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M13%2015.5V17H14.5L22.5%209L21%207.5L13%2015.5Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); +} +i.icon.icon-review-changes { + 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%22M19%2010H5V9H19V10Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M19%2013H5V12H19V13Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M19%2016H5V15H19V16Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%206H3V19H21V6ZM3%205H2V6V19V20H3H21H22V19V6V5H21H3Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); +} +i.icon.icon-accept-changes { + 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%22M12%2020L9%2017L8%2018L12%2022L22%2012L21%2011L12%2020Z%22%20fill%3D%22%2340865C%22%2F%3E%3Cpath%20d%3D%22M19%209H5V8H19V9Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M16%2012H5V11H16V12Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M14%2015H5V14H14V15Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3%205H21V9H22V5V4H21H3H2V5V19V20H3H6V19H3V5Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); +} +i.icon.icon-reject-changes { + 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%22M13%2011L12%2012L16%2016L12%2020L13%2021L17%2017L21%2021L22%2020L18%2016L22%2012L21%2011L17%2015L13%2011Z%22%20fill%3D%22%23AA5252%22%2F%3E%3Cpath%20d%3D%22M19%209H5V8H19V9Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M10%2012H5V11H10V12Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M10%2015H5V14H10V15Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3%205H21V9H22V5V4H21H3H2V5V19V20H3H10V19H3V5Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); +} i.icon.icon-accept { width: 24px; height: 24px; @@ -7497,11 +7555,6 @@ i.icon.icon-goto { 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%22M21%203H3V21H21V3ZM3%202H2V3V21V22H3H21H22V21V3V2H21H3ZM15.2929%208H9V7H16.5H17V7.5V15H16V8.70711L7.35355%2017.3536L6.64645%2016.6464L15.2929%208Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); } -i.icon.icon-delete-change { - 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%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M9.5%201H9V1.5V3H5H4H2V4H4V21V22H5H19H20V21V4H22V3H20H19H15V1.5V1H14.5H9.5ZM14%203V2H10V3H14ZM5%204H19V21H5V4ZM7%206H8V19H7V6ZM11%206H10V19H11V6ZM13%206H14V19H13V6ZM17%206H16V19H17V6Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); -} i.icon.icon-app-settings { width: 24px; height: 24px; diff --git a/apps/documenteditor/mobile/resources/css/app-material.css b/apps/documenteditor/mobile/resources/css/app-material.css index 7d6f7b7b2..65118842b 100644 --- a/apps/documenteditor/mobile/resources/css/app-material.css +++ b/apps/documenteditor/mobile/resources/css/app-material.css @@ -5986,7 +5986,7 @@ html.phone .document-menu .list-block .item-link { word-wrap: break-word; } .page-change #user-name { - font-size: 17px; + font-size: 16px; line-height: 22px; color: #000000; margin: 0; @@ -6006,25 +6006,54 @@ html.phone .document-menu .list-block .item-link { margin-top: 10px; } .page-change .block-btn { + position: absolute; + bottom: 0; display: flex; flex-direction: row; - justify-content: space-around; + justify-content: space-between; margin: 0; - padding: 26px 0; - background-color: #EFEFF4; + width: 100%; + height: 56px; + align-items: center; + box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2); } -.page-change .block-btn #btn-next-change, .page-change .block-btn #btn-reject-change { - margin-left: 20px; + margin-left: 15px; } -.page-change .block-btn #btn-goto-change { - margin-right: 20px; -} -.page-change .block-btn .right-buttons { +.page-change .block-btn .change-buttons, +.page-change .block-btn .accept-reject, +.page-change .block-btn .next-prev { display: flex; } .page-change .block-btn .link { - display: inline-block; + position: relative; + display: flex; + justify-content: center; + align-items: center; + font-size: 14px; + text-transform: uppercase; + font-weight: 500; + height: 56px; + min-width: 48px; +} +.page-change .header-change { + display: flex; + justify-content: flex-start; + padding-right: 16px; +} +.page-change .header-change .initials-change { + height: 40px; + width: 40px; + border-radius: 50px; + color: #FFFFFF; + display: flex; + justify-content: center; + align-items: center; + margin-right: 16px; + font-size: 18px; +} +.page-change #no-changes { + padding: 16px; } .container-collaboration .navbar .right.close-collaboration { position: absolute; @@ -6033,6 +6062,10 @@ html.phone .document-menu .list-block .item-link { .container-collaboration .page-content .list-block:first-child { margin-top: -1px; } +.page-display-mode .list-block .item-subtitle { + font-size: 14px; + color: #9e9e9e; +} #user-list .item-content { padding-left: 0; } @@ -7019,6 +7052,31 @@ i.icon.icon-collaboration { 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%3Cg%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M15.9912%206C15.9912%208.34102%2015.4074%2010.1346%2014.6055%2011.3121C13.7983%2012.4974%2012.8249%2013%2011.9912%2013C11.1575%2013%2010.1841%2012.4974%209.37695%2011.3121C8.57501%2010.1346%207.99121%208.34102%207.99121%206C7.99121%203.61508%209.96974%202%2011.9912%202C14.0127%202%2015.9912%203.61508%2015.9912%206ZM14.5015%2012.9506C13.7365%2013.6361%2012.8649%2014%2011.9912%2014C11.1195%2014%2010.2499%2013.6378%209.48619%2012.9554C7.78363%2013.6081%206.36015%2014.2591%205.26963%2014.9224C3.55256%2015.9667%203%2016.8326%203%2017.5C3%2018.2545%203.4257%2019.0877%204.82302%2019.7879C6.25015%2020.5031%208.57272%2020.9999%2012%2021C15.4273%2021%2017.7499%2020.5031%2019.177%2019.7879C20.5743%2019.0877%2021%2018.2545%2021%2017.5C21%2016.8326%2020.4474%2015.9667%2018.7304%2014.9224C17.6372%2014.2575%2016.2095%2013.605%2014.5015%2012.9506ZM15.2272%2012.1594C16.2765%2010.7825%2016.9912%208.67814%2016.9912%206C16.9912%203%2014.5%201%2011.9912%201C9.48242%201%206.99121%203%206.99121%206C6.99121%208.68159%207.70777%2010.7879%208.75931%2012.1647C4.60309%2013.7964%202%2015.4951%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.4929%2019.3913%2013.7927%2015.2272%2012.1594Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E"); } +i.icon.icon-users { + 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%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M15.5%207C15.5%209.26153%2014.9357%2010.9518%2014.201%2012.0307C13.4584%2013.121%2012.6234%2013.5%2012%2013.5C11.3766%2013.5%2010.5416%2013.121%209.79901%2012.0307C9.0643%2010.9518%208.5%209.26153%208.5%207C8.5%204.92262%2010.2222%203.5%2012%203.5C13.7778%203.5%2015.5%204.92262%2015.5%207ZM14.8461%2013.6216C14.006%2014.5191%2013.0044%2015%2012%2015C10.9956%2015%209.99399%2014.5191%209.15395%2013.6216C7.69714%2014.1996%206.4782%2014.7725%205.52945%2015.3496C3.82884%2016.3839%203.5%2017.1203%203.5%2017.5C3.5%2018.0104%203.76355%2018.6977%205.04703%2019.3409C6.37522%2020.0065%208.60909%2020.4999%2012%2020.5C15.3909%2020.5%2017.6248%2020.0065%2018.953%2019.3409C20.2364%2018.6977%2020.5%2018.0104%2020.5%2017.5C20.5%2017.1203%2020.1712%2016.3839%2018.4705%2015.3496C17.5218%2014.7725%2016.3029%2014.1996%2014.8461%2013.6216ZM15.7544%2012.37C16.5137%2011.0279%2017%209.20917%2017%207C17%204%2014.5088%202%2012%202C9.49121%202%207%204%207%207C7%209.20917%207.48633%2011.0279%208.24563%2012.37C4.38973%2013.9392%202%2015.579%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.579%2019.6103%2013.9392%2015.7544%2012.37Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); +} +i.icon.icon-review { + 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%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M17.5%203.5H4.5V20.5H17.5V18H19V20C19%2020.5321%2018.7973%2021.0297%2018.3918%2021.4366C17.9864%2021.8122%2017.5302%2022%2017%2022H5C4.46979%2022%204.01364%2021.8122%203.60819%2021.4366C3.20273%2021.0297%203%2020.5266%203%2019.9945V4C3%202.89543%203.89543%202%205%202H17C17.5302%202%2017.9864%202.20344%2018.3918%202.61033C18.7661%202.98592%2019%203.46792%2019%204V7H17.5V3.5Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22.8438%2010.2396L21.8281%2011.2552L19.7448%209.17188L20.7604%208.15625C20.8646%208.05208%2020.9948%208%2021.151%208C21.3073%208%2021.4375%208.05208%2021.5417%208.15625L22.8438%209.45833C22.9479%209.5625%2023%209.69271%2023%209.84896C23%2010.0052%2022.9479%2010.1354%2022.8438%2010.2396ZM13%2015.9167L19.1458%209.77083L21.2292%2011.8542L15.0833%2018H13V15.9167Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M7%2015.5H11V17H7V15.5Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M7%2011H13V12.5H7V11Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M7%207H15V8.5H7V7Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); +} +i.icon.icon-review-changes { + 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%22M20.5%204.5L20.5%2019.5L3.5%2019.5L3.5%204.5L20.5%204.5ZM22%2019L22%205C22%203.89543%2021.1046%203%2020%203L4.00549%203C3.47341%203%202.97026%203.20273%202.56338%203.60819C2.18779%204.01364%202%204.46978%202%205L2%2019C2%2019.5302%202.18779%2019.9864%202.56338%2020.3918C2.97026%2020.7973%203.46792%2021%204%2021L20%2021C20.5321%2021%2021.0141%2020.7661%2021.3897%2020.3918C21.7966%2019.9864%2022%2019.5302%2022%2019Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M6%2015H18V16.5H6V15Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M6%2011H18V12.5H6V11Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M6%207H18V8.5H6V7Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); +} +i.icon.icon-accept-changes { + 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%22M13.3966%2019.2877L21.6495%2011L23%2012.3562L13.3966%2022L9%2017.5849L10.3505%2016.2288L13.3966%2019.2877Z%22%20fill%3D%22%2340865C%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M20.5%208L20.5%204.5L3.5%204.5L3.5%2017.5L7%2017.5L7%2019L4%2019C3.46792%2019%202.97026%2018.7973%202.56338%2018.3918C2.18779%2017.9864%202%2017.5302%202%2017L2%205C2%204.46978%202.18779%204.01364%202.56338%203.60819C2.97026%203.20273%203.4734%203%204.00549%203L20%203C21.1046%203%2022%203.89543%2022%205L22%208L20.5%208Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M6%208H18V9.5H6V8Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M6%2012H16V13.5H6V12Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); +} +i.icon.icon-reject-changes { + 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%22M23%2013.4099L19.4099%2017L23%2020.5901L21.5901%2022L18%2018.4099L14.4099%2022L13%2020.5901L16.5901%2017L13%2013.4099L14.4099%2012L18%2015.5901L21.5901%2012L23%2013.4099Z%22%20fill%3D%22%23C60915%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M20.5%2010L20.5%204.5L3.5%204.5L3.5%2017.5L11%2017.5L11%2019L4%2019C3.46792%2019%202.97026%2018.7973%202.56338%2018.3918C2.18779%2017.9864%202%2017.5302%202%2017L2%205C2%204.46978%202.18779%204.01364%202.56338%203.60819C2.97026%203.20273%203.4734%203%204.00549%203L20%203C21.1046%203%2022%203.89543%2022%205L22%2010L20.5%2010Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M6%208H18V9.5H6L6%208Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M6%2012H11V13.5H6V12Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); +} i.icon.icon-accept { width: 24px; height: 24px; @@ -7032,22 +7090,17 @@ i.icon.icon-reject { i.icon.icon-next-change { 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%3Cg%20clip-path%3D%22url(%23clipnext)%22%3E%3Cpath%20d%3D%22M16%2012L6.5%2022L7.5%2023L18%2012L7.5%201L6.5%202L16%2012Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22clipnext%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E"); + 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-prev-change { 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%3Cg%20clip-path%3D%22url(%23clipprev)%22%3E%3Cpath%20d%3D%22M8%2012L17.5%202L16.5%201L6%2012L16.5%2023L17.5%2022L8%2012Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22clipprev%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E"); + 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%22M15.4219%207.40625L10.8281%2012L15.4219%2016.5938L14.0156%2018L8.01562%2012L14.0156%206L15.4219%207.40625Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); } i.icon.icon-goto { 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%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%203H3V21H21V3ZM3%202H2V3V21V22H3H21H22V21V3V2H21H3ZM15.2929%208H9V7H16.5H17V7.5V15H16V8.70711L7.35355%2017.3536L6.64645%2016.6464L15.2929%208Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); -} -i.icon.icon-delete-change { - 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%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M9.5%201H9V1.5V3H5H4H2V4H4V21V22H5H19H20V21V4H22V3H20H19H15V1.5V1H14.5H9.5ZM14%203V2H10V3H14ZM5%204H19V21H5V4ZM7%206H8V19H7V6ZM11%206H10V19H11V6ZM13%206H14V19H13V6ZM17%206H16V19H17V6Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); + 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%22M20.5%203.5H3.5V20.5H20.5V3.5ZM3.5%202H2V3.5V20.5V22H3.5H20.5H22V20.5V3.5V2H20.5H3.5ZM14.6893%208.25H9V6.75H16.5H17.25V7.5V15H15.75V9.31066L7.53033%2017.5303L6.46967%2016.4697L14.6893%208.25Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); } i.icon.icon-app-settings { width: 24px; diff --git a/apps/documenteditor/mobile/resources/less/ios/_icons.less b/apps/documenteditor/mobile/resources/less/ios/_icons.less index 9e331152b..97d17bcf8 100644 --- a/apps/documenteditor/mobile/resources/less/ios/_icons.less +++ b/apps/documenteditor/mobile/resources/less/ios/_icons.less @@ -426,6 +426,31 @@ i.icon { height: 24px; .encoded-svg-background(''); } + &.icon-users { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } + &.icon-review { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } + &.icon-review-changes { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } + &.icon-accept-changes { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } + &.icon-reject-changes { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } &.icon-accept { width: 24px; height: 24px; @@ -451,11 +476,6 @@ i.icon { height: 24px; .encoded-svg-background(''); } - &.icon-delete-change { - width: 24px; - height: 24px; - .encoded-svg-background(''); - } &.icon-app-settings { width: 24px; height: 24px; diff --git a/apps/documenteditor/mobile/resources/less/material/_icons.less b/apps/documenteditor/mobile/resources/less/material/_icons.less index 8e6ee9569..76fddb55c 100644 --- a/apps/documenteditor/mobile/resources/less/material/_icons.less +++ b/apps/documenteditor/mobile/resources/less/material/_icons.less @@ -349,6 +349,31 @@ i.icon { height: 24px; .encoded-svg-background(''); } + &.icon-users { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } + &.icon-review { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } + &.icon-review-changes { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } + &.icon-accept-changes { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } + &.icon-reject-changes { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } &.icon-accept { width: 24px; height: 24px; @@ -362,22 +387,17 @@ i.icon { &.icon-next-change { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } &.icon-prev-change { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } &.icon-goto { width: 24px; height: 24px; - .encoded-svg-background(''); - } - &.icon-delete-change { - width: 24px; - height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } &.icon-app-settings { width: 24px; diff --git a/apps/presentationeditor/mobile/resources/css/app-ios.css b/apps/presentationeditor/mobile/resources/css/app-ios.css index c7c2a84e9..dc6164810 100644 --- a/apps/presentationeditor/mobile/resources/css/app-ios.css +++ b/apps/presentationeditor/mobile/resources/css/app-ios.css @@ -6403,6 +6403,9 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after margin-left: 20px; color: #212121; } +.page-change { + background-color: #FFFFFF; +} .page-change .block-description { background-color: #fff; padding-top: 15px; @@ -6433,28 +6436,51 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after } .page-change .block-btn, .page-change .content-block.block-btn:first-child { + position: absolute; + bottom: 0; display: flex; flex-direction: row; - justify-content: space-around; - margin: 26px 0; + justify-content: space-between; + margin: 0; + width: 100%; + height: 44px; + align-items: center; + box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2); } -.page-change .block-btn #btn-next-change, -.page-change .content-block.block-btn:first-child #btn-next-change, .page-change .block-btn #btn-reject-change, .page-change .content-block.block-btn:first-child #btn-reject-change { margin-left: 20px; } .page-change .block-btn #btn-goto-change, .page-change .content-block.block-btn:first-child #btn-goto-change { - margin-right: 20px; + margin-left: 10px; } -.page-change .block-btn .right-buttons, -.page-change .content-block.block-btn:first-child .right-buttons { +.page-change .block-btn .change-buttons, +.page-change .content-block.block-btn:first-child .change-buttons, +.page-change .block-btn .accept-reject, +.page-change .content-block.block-btn:first-child .accept-reject { display: flex; } +.page-change .block-btn .next-prev, +.page-change .content-block.block-btn:first-child .next-prev { + display: flex; +} +.page-change .block-btn .next-prev .link, +.page-change .content-block.block-btn:first-child .next-prev .link { + width: 44px; +} .page-change .block-btn .link, .page-change .content-block.block-btn:first-child .link { - display: inline-block; + position: relative; + display: flex; + justify-content: center; + align-items: center; + font-size: 17px; + height: 44px; + min-width: 44px; +} +.page-change #no-changes { + padding: 16px; } .navbar .center-collaboration { display: flex; @@ -6467,6 +6493,13 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after .container-collaboration .page-content .list-block:first-child { margin-top: -1px; } +.page-display-mode[data-page="display-mode-view"] .list-block li.media-item .item-title { + font-weight: normal; +} +.page-display-mode[data-page="display-mode-view"] .list-block li.media-item .item-subtitle { + font-size: 14px; + color: #8e8e93; +} #user-list .item-content { padding-left: 0; } @@ -7448,6 +7481,11 @@ i.icon.icon-collaboration { 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%3Cg%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M15.9912%206C15.9912%208.34102%2015.4074%2010.1346%2014.6055%2011.3121C13.7983%2012.4974%2012.8249%2013%2011.9912%2013C11.1575%2013%2010.1841%2012.4974%209.37695%2011.3121C8.57501%2010.1346%207.99121%208.34102%207.99121%206C7.99121%203.61508%209.96974%202%2011.9912%202C14.0127%202%2015.9912%203.61508%2015.9912%206ZM14.5015%2012.9506C13.7365%2013.6361%2012.8649%2014%2011.9912%2014C11.1195%2014%2010.2499%2013.6378%209.48619%2012.9554C7.78363%2013.6081%206.36015%2014.2591%205.26963%2014.9224C3.55256%2015.9667%203%2016.8326%203%2017.5C3%2018.2545%203.4257%2019.0877%204.82302%2019.7879C6.25015%2020.5031%208.57272%2020.9999%2012%2021C15.4273%2021%2017.7499%2020.5031%2019.177%2019.7879C20.5743%2019.0877%2021%2018.2545%2021%2017.5C21%2016.8326%2020.4474%2015.9667%2018.7304%2014.9224C17.6372%2014.2575%2016.2095%2013.605%2014.5015%2012.9506ZM15.2272%2012.1594C16.2765%2010.7825%2016.9912%208.67814%2016.9912%206C16.9912%203%2014.5%201%2011.9912%201C9.48242%201%206.99121%203%206.99121%206C6.99121%208.68159%207.70777%2010.7879%208.75931%2012.1647C4.60309%2013.7964%202%2015.4951%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.4929%2019.3913%2013.7927%2015.2272%2012.1594Z%22%20fill%3D%22%23aa5252%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E"); } +i.icon.icon-users { + 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%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M16%207C16%209.34102%2015.4162%2011.1346%2014.6143%2012.3121C13.8071%2013.4974%2012.8337%2014%2012%2014C11.1663%2014%2010.1929%2013.4974%209.38574%2012.3121C8.5838%2011.1346%208%209.34102%208%207C8%204.61508%209.97853%203%2012%203C14.0215%203%2016%204.61508%2016%207ZM15.1891%2013.2201C14.2865%2014.375%2013.1451%2015%2012%2015C10.8549%2015%209.71347%2014.375%208.81092%2013.2201C7.40473%2013.7844%206.21268%2014.3488%205.26963%2014.9224C3.55256%2015.9667%203%2016.8326%203%2017.5C3%2018.2545%203.4257%2019.0877%204.82302%2019.7879C6.25015%2020.5031%208.57272%2020.9999%2012%2021C15.4273%2021%2017.7499%2020.5031%2019.177%2019.7879C20.5743%2019.0877%2021%2018.2545%2021%2017.5C21%2016.8326%2020.4474%2015.9667%2018.7304%2014.9224C17.7873%2014.3488%2016.5953%2013.7844%2015.1891%2013.2201ZM15.7544%2012.37C16.5137%2011.0279%2017%209.20917%2017%207C17%204%2014.5088%202%2012%202C9.49121%202%207%204%207%207C7%209.20917%207.48633%2011.0279%208.24563%2012.37C4.38973%2013.9392%202%2015.579%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.579%2019.6103%2013.9392%2015.7544%2012.37Z%22%20fill%3D%22%23aa5252%22%2F%3E%3C%2Fsvg%3E"); +} i.icon.icon-app-settings { width: 24px; height: 24px; diff --git a/apps/presentationeditor/mobile/resources/css/app-material.css b/apps/presentationeditor/mobile/resources/css/app-material.css index 351416bdf..74a21da49 100644 --- a/apps/presentationeditor/mobile/resources/css/app-material.css +++ b/apps/presentationeditor/mobile/resources/css/app-material.css @@ -5986,7 +5986,7 @@ html.phone .document-menu .list-block .item-link { word-wrap: break-word; } .page-change #user-name { - font-size: 17px; + font-size: 16px; line-height: 22px; color: #000000; margin: 0; @@ -6006,25 +6006,54 @@ html.phone .document-menu .list-block .item-link { margin-top: 10px; } .page-change .block-btn { + position: absolute; + bottom: 0; display: flex; flex-direction: row; - justify-content: space-around; + justify-content: space-between; margin: 0; - padding: 26px 0; - background-color: #EFEFF4; + width: 100%; + height: 56px; + align-items: center; + box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2); } -.page-change .block-btn #btn-next-change, .page-change .block-btn #btn-reject-change { - margin-left: 20px; + margin-left: 15px; } -.page-change .block-btn #btn-goto-change { - margin-right: 20px; -} -.page-change .block-btn .right-buttons { +.page-change .block-btn .change-buttons, +.page-change .block-btn .accept-reject, +.page-change .block-btn .next-prev { display: flex; } .page-change .block-btn .link { - display: inline-block; + position: relative; + display: flex; + justify-content: center; + align-items: center; + font-size: 14px; + text-transform: uppercase; + font-weight: 500; + height: 56px; + min-width: 48px; +} +.page-change .header-change { + display: flex; + justify-content: flex-start; + padding-right: 16px; +} +.page-change .header-change .initials-change { + height: 40px; + width: 40px; + border-radius: 50px; + color: #FFFFFF; + display: flex; + justify-content: center; + align-items: center; + margin-right: 16px; + font-size: 18px; +} +.page-change #no-changes { + padding: 16px; } .container-collaboration .navbar .right.close-collaboration { position: absolute; @@ -6033,6 +6062,10 @@ html.phone .document-menu .list-block .item-link { .container-collaboration .page-content .list-block:first-child { margin-top: -1px; } +.page-display-mode .list-block .item-subtitle { + font-size: 14px; + color: #9e9e9e; +} #user-list .item-content { padding-left: 0; } @@ -7034,6 +7067,11 @@ i.icon.icon-collaboration { 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%3Cg%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M15.9912%206C15.9912%208.34102%2015.4074%2010.1346%2014.6055%2011.3121C13.7983%2012.4974%2012.8249%2013%2011.9912%2013C11.1575%2013%2010.1841%2012.4974%209.37695%2011.3121C8.57501%2010.1346%207.99121%208.34102%207.99121%206C7.99121%203.61508%209.96974%202%2011.9912%202C14.0127%202%2015.9912%203.61508%2015.9912%206ZM14.5015%2012.9506C13.7365%2013.6361%2012.8649%2014%2011.9912%2014C11.1195%2014%2010.2499%2013.6378%209.48619%2012.9554C7.78363%2013.6081%206.36015%2014.2591%205.26963%2014.9224C3.55256%2015.9667%203%2016.8326%203%2017.5C3%2018.2545%203.4257%2019.0877%204.82302%2019.7879C6.25015%2020.5031%208.57272%2020.9999%2012%2021C15.4273%2021%2017.7499%2020.5031%2019.177%2019.7879C20.5743%2019.0877%2021%2018.2545%2021%2017.5C21%2016.8326%2020.4474%2015.9667%2018.7304%2014.9224C17.6372%2014.2575%2016.2095%2013.605%2014.5015%2012.9506ZM15.2272%2012.1594C16.2765%2010.7825%2016.9912%208.67814%2016.9912%206C16.9912%203%2014.5%201%2011.9912%201C9.48242%201%206.99121%203%206.99121%206C6.99121%208.68159%207.70777%2010.7879%208.75931%2012.1647C4.60309%2013.7964%202%2015.4951%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.4929%2019.3913%2013.7927%2015.2272%2012.1594Z%22%20fill%3D%22%23aa5252%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E"); } +i.icon.icon-users { + 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%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M15.5%207C15.5%209.26153%2014.9357%2010.9518%2014.201%2012.0307C13.4584%2013.121%2012.6234%2013.5%2012%2013.5C11.3766%2013.5%2010.5416%2013.121%209.79901%2012.0307C9.0643%2010.9518%208.5%209.26153%208.5%207C8.5%204.92262%2010.2222%203.5%2012%203.5C13.7778%203.5%2015.5%204.92262%2015.5%207ZM14.8461%2013.6216C14.006%2014.5191%2013.0044%2015%2012%2015C10.9956%2015%209.99399%2014.5191%209.15395%2013.6216C7.69714%2014.1996%206.4782%2014.7725%205.52945%2015.3496C3.82884%2016.3839%203.5%2017.1203%203.5%2017.5C3.5%2018.0104%203.76355%2018.6977%205.04703%2019.3409C6.37522%2020.0065%208.60909%2020.4999%2012%2020.5C15.3909%2020.5%2017.6248%2020.0065%2018.953%2019.3409C20.2364%2018.6977%2020.5%2018.0104%2020.5%2017.5C20.5%2017.1203%2020.1712%2016.3839%2018.4705%2015.3496C17.5218%2014.7725%2016.3029%2014.1996%2014.8461%2013.6216ZM15.7544%2012.37C16.5137%2011.0279%2017%209.20917%2017%207C17%204%2014.5088%202%2012%202C9.49121%202%207%204%207%207C7%209.20917%207.48633%2011.0279%208.24563%2012.37C4.38973%2013.9392%202%2015.579%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.579%2019.6103%2013.9392%2015.7544%2012.37Z%22%20fill%3D%22%23aa5252%22%2F%3E%3C%2Fsvg%3E"); +} i.icon.icon-app-settings { width: 24px; height: 24px; diff --git a/apps/presentationeditor/mobile/resources/less/ios/_icons.less b/apps/presentationeditor/mobile/resources/less/ios/_icons.less index 20146fcda..d894e0ecf 100644 --- a/apps/presentationeditor/mobile/resources/less/ios/_icons.less +++ b/apps/presentationeditor/mobile/resources/less/ios/_icons.less @@ -410,6 +410,11 @@ i.icon { height: 24px; .encoded-svg-background(''); } + &.icon-users { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } &.icon-app-settings { width: 24px; height: 24px; diff --git a/apps/presentationeditor/mobile/resources/less/material/_icons.less b/apps/presentationeditor/mobile/resources/less/material/_icons.less index ef2e2e839..37a7a33bc 100644 --- a/apps/presentationeditor/mobile/resources/less/material/_icons.less +++ b/apps/presentationeditor/mobile/resources/less/material/_icons.less @@ -370,6 +370,11 @@ i.icon { height: 24px; .encoded-svg-background(''); } + &.icon-users { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } &.icon-app-settings { width: 24px; height: 24px; diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css index d27b028a1..bdf003a6f 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css @@ -6396,6 +6396,9 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after margin-left: 20px; color: #212121; } +.page-change { + background-color: #FFFFFF; +} .page-change .block-description { background-color: #fff; padding-top: 15px; @@ -6426,28 +6429,51 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after } .page-change .block-btn, .page-change .content-block.block-btn:first-child { + position: absolute; + bottom: 0; display: flex; flex-direction: row; - justify-content: space-around; - margin: 26px 0; + justify-content: space-between; + margin: 0; + width: 100%; + height: 44px; + align-items: center; + box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2); } -.page-change .block-btn #btn-next-change, -.page-change .content-block.block-btn:first-child #btn-next-change, .page-change .block-btn #btn-reject-change, .page-change .content-block.block-btn:first-child #btn-reject-change { margin-left: 20px; } .page-change .block-btn #btn-goto-change, .page-change .content-block.block-btn:first-child #btn-goto-change { - margin-right: 20px; + margin-left: 10px; } -.page-change .block-btn .right-buttons, -.page-change .content-block.block-btn:first-child .right-buttons { +.page-change .block-btn .change-buttons, +.page-change .content-block.block-btn:first-child .change-buttons, +.page-change .block-btn .accept-reject, +.page-change .content-block.block-btn:first-child .accept-reject { display: flex; } +.page-change .block-btn .next-prev, +.page-change .content-block.block-btn:first-child .next-prev { + display: flex; +} +.page-change .block-btn .next-prev .link, +.page-change .content-block.block-btn:first-child .next-prev .link { + width: 44px; +} .page-change .block-btn .link, .page-change .content-block.block-btn:first-child .link { - display: inline-block; + position: relative; + display: flex; + justify-content: center; + align-items: center; + font-size: 17px; + height: 44px; + min-width: 44px; +} +.page-change #no-changes { + padding: 16px; } .navbar .center-collaboration { display: flex; @@ -6460,6 +6486,13 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after .container-collaboration .page-content .list-block:first-child { margin-top: -1px; } +.page-display-mode[data-page="display-mode-view"] .list-block li.media-item .item-title { + font-weight: normal; +} +.page-display-mode[data-page="display-mode-view"] .list-block li.media-item .item-subtitle { + font-size: 14px; + color: #8e8e93; +} #user-list .item-content { padding-left: 0; } @@ -7327,6 +7360,11 @@ i.icon.icon-collaboration { 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%3Cg%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M15.9912%206C15.9912%208.34102%2015.4074%2010.1346%2014.6055%2011.3121C13.7983%2012.4974%2012.8249%2013%2011.9912%2013C11.1575%2013%2010.1841%2012.4974%209.37695%2011.3121C8.57501%2010.1346%207.99121%208.34102%207.99121%206C7.99121%203.61508%209.96974%202%2011.9912%202C14.0127%202%2015.9912%203.61508%2015.9912%206ZM14.5015%2012.9506C13.7365%2013.6361%2012.8649%2014%2011.9912%2014C11.1195%2014%2010.2499%2013.6378%209.48619%2012.9554C7.78363%2013.6081%206.36015%2014.2591%205.26963%2014.9224C3.55256%2015.9667%203%2016.8326%203%2017.5C3%2018.2545%203.4257%2019.0877%204.82302%2019.7879C6.25015%2020.5031%208.57272%2020.9999%2012%2021C15.4273%2021%2017.7499%2020.5031%2019.177%2019.7879C20.5743%2019.0877%2021%2018.2545%2021%2017.5C21%2016.8326%2020.4474%2015.9667%2018.7304%2014.9224C17.6372%2014.2575%2016.2095%2013.605%2014.5015%2012.9506ZM15.2272%2012.1594C16.2765%2010.7825%2016.9912%208.67814%2016.9912%206C16.9912%203%2014.5%201%2011.9912%201C9.48242%201%206.99121%203%206.99121%206C6.99121%208.68159%207.70777%2010.7879%208.75931%2012.1647C4.60309%2013.7964%202%2015.4951%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.4929%2019.3913%2013.7927%2015.2272%2012.1594Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E"); } +i.icon.icon-users { + 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%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M16%207C16%209.34102%2015.4162%2011.1346%2014.6143%2012.3121C13.8071%2013.4974%2012.8337%2014%2012%2014C11.1663%2014%2010.1929%2013.4974%209.38574%2012.3121C8.5838%2011.1346%208%209.34102%208%207C8%204.61508%209.97853%203%2012%203C14.0215%203%2016%204.61508%2016%207ZM15.1891%2013.2201C14.2865%2014.375%2013.1451%2015%2012%2015C10.8549%2015%209.71347%2014.375%208.81092%2013.2201C7.40473%2013.7844%206.21268%2014.3488%205.26963%2014.9224C3.55256%2015.9667%203%2016.8326%203%2017.5C3%2018.2545%203.4257%2019.0877%204.82302%2019.7879C6.25015%2020.5031%208.57272%2020.9999%2012%2021C15.4273%2021%2017.7499%2020.5031%2019.177%2019.7879C20.5743%2019.0877%2021%2018.2545%2021%2017.5C21%2016.8326%2020.4474%2015.9667%2018.7304%2014.9224C17.7873%2014.3488%2016.5953%2013.7844%2015.1891%2013.2201ZM15.7544%2012.37C16.5137%2011.0279%2017%209.20917%2017%207C17%204%2014.5088%202%2012%202C9.49121%202%207%204%207%207C7%209.20917%207.48633%2011.0279%208.24563%2012.37C4.38973%2013.9392%202%2015.579%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.579%2019.6103%2013.9392%2015.7544%2012.37Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fsvg%3E"); +} i.icon.icon-app-settings { width: 24px; height: 24px; diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-material.css b/apps/spreadsheeteditor/mobile/resources/css/app-material.css index 441eb853b..47dd60a12 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-material.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-material.css @@ -5996,7 +5996,7 @@ html.phone .document-menu .list-block .item-link { word-wrap: break-word; } .page-change #user-name { - font-size: 17px; + font-size: 16px; line-height: 22px; color: #000000; margin: 0; @@ -6016,25 +6016,54 @@ html.phone .document-menu .list-block .item-link { margin-top: 10px; } .page-change .block-btn { + position: absolute; + bottom: 0; display: flex; flex-direction: row; - justify-content: space-around; + justify-content: space-between; margin: 0; - padding: 26px 0; - background-color: #EFEFF4; + width: 100%; + height: 56px; + align-items: center; + box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2); } -.page-change .block-btn #btn-next-change, .page-change .block-btn #btn-reject-change { - margin-left: 20px; + margin-left: 15px; } -.page-change .block-btn #btn-goto-change { - margin-right: 20px; -} -.page-change .block-btn .right-buttons { +.page-change .block-btn .change-buttons, +.page-change .block-btn .accept-reject, +.page-change .block-btn .next-prev { display: flex; } .page-change .block-btn .link { - display: inline-block; + position: relative; + display: flex; + justify-content: center; + align-items: center; + font-size: 14px; + text-transform: uppercase; + font-weight: 500; + height: 56px; + min-width: 48px; +} +.page-change .header-change { + display: flex; + justify-content: flex-start; + padding-right: 16px; +} +.page-change .header-change .initials-change { + height: 40px; + width: 40px; + border-radius: 50px; + color: #FFFFFF; + display: flex; + justify-content: center; + align-items: center; + margin-right: 16px; + font-size: 18px; +} +.page-change #no-changes { + padding: 16px; } .container-collaboration .navbar .right.close-collaboration { position: absolute; @@ -6043,6 +6072,10 @@ html.phone .document-menu .list-block .item-link { .container-collaboration .page-content .list-block:first-child { margin-top: -1px; } +.page-display-mode .list-block .item-subtitle { + font-size: 14px; + color: #9e9e9e; +} #user-list .item-content { padding-left: 0; } @@ -7033,6 +7066,11 @@ i.icon.icon-collaboration { 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%3Cg%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M15.9912%206C15.9912%208.34102%2015.4074%2010.1346%2014.6055%2011.3121C13.7983%2012.4974%2012.8249%2013%2011.9912%2013C11.1575%2013%2010.1841%2012.4974%209.37695%2011.3121C8.57501%2010.1346%207.99121%208.34102%207.99121%206C7.99121%203.61508%209.96974%202%2011.9912%202C14.0127%202%2015.9912%203.61508%2015.9912%206ZM14.5015%2012.9506C13.7365%2013.6361%2012.8649%2014%2011.9912%2014C11.1195%2014%2010.2499%2013.6378%209.48619%2012.9554C7.78363%2013.6081%206.36015%2014.2591%205.26963%2014.9224C3.55256%2015.9667%203%2016.8326%203%2017.5C3%2018.2545%203.4257%2019.0877%204.82302%2019.7879C6.25015%2020.5031%208.57272%2020.9999%2012%2021C15.4273%2021%2017.7499%2020.5031%2019.177%2019.7879C20.5743%2019.0877%2021%2018.2545%2021%2017.5C21%2016.8326%2020.4474%2015.9667%2018.7304%2014.9224C17.6372%2014.2575%2016.2095%2013.605%2014.5015%2012.9506ZM15.2272%2012.1594C16.2765%2010.7825%2016.9912%208.67814%2016.9912%206C16.9912%203%2014.5%201%2011.9912%201C9.48242%201%206.99121%203%206.99121%206C6.99121%208.68159%207.70777%2010.7879%208.75931%2012.1647C4.60309%2013.7964%202%2015.4951%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.4929%2019.3913%2013.7927%2015.2272%2012.1594Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E"); } +i.icon.icon-users { + 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%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M15.5%207C15.5%209.26153%2014.9357%2010.9518%2014.201%2012.0307C13.4584%2013.121%2012.6234%2013.5%2012%2013.5C11.3766%2013.5%2010.5416%2013.121%209.79901%2012.0307C9.0643%2010.9518%208.5%209.26153%208.5%207C8.5%204.92262%2010.2222%203.5%2012%203.5C13.7778%203.5%2015.5%204.92262%2015.5%207ZM14.8461%2013.6216C14.006%2014.5191%2013.0044%2015%2012%2015C10.9956%2015%209.99399%2014.5191%209.15395%2013.6216C7.69714%2014.1996%206.4782%2014.7725%205.52945%2015.3496C3.82884%2016.3839%203.5%2017.1203%203.5%2017.5C3.5%2018.0104%203.76355%2018.6977%205.04703%2019.3409C6.37522%2020.0065%208.60909%2020.4999%2012%2020.5C15.3909%2020.5%2017.6248%2020.0065%2018.953%2019.3409C20.2364%2018.6977%2020.5%2018.0104%2020.5%2017.5C20.5%2017.1203%2020.1712%2016.3839%2018.4705%2015.3496C17.5218%2014.7725%2016.3029%2014.1996%2014.8461%2013.6216ZM15.7544%2012.37C16.5137%2011.0279%2017%209.20917%2017%207C17%204%2014.5088%202%2012%202C9.49121%202%207%204%207%207C7%209.20917%207.48633%2011.0279%208.24563%2012.37C4.38973%2013.9392%202%2015.579%202%2017.5C2%2019.9852%205%2021.9999%2012%2022C19%2022%2022%2019.9852%2022%2017.5C22%2015.579%2019.6103%2013.9392%2015.7544%2012.37Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fsvg%3E"); +} i.icon.icon-cut { width: 24px; height: 24px; diff --git a/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less b/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less index 2d8dab753..4db7458e3 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less +++ b/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less @@ -363,6 +363,11 @@ i.icon { height: 24px; .encoded-svg-background(''); } + &.icon-users { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } &.icon-app-settings { width: 24px; height: 24px; diff --git a/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less b/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less index 2cc96f141..cd0e20035 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less +++ b/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less @@ -327,6 +327,11 @@ i.icon { height: 24px; .encoded-svg-background(''); } + &.icon-users { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } &.icon-cut { width: 24px; height: 24px;