diff --git a/apps/common/main/lib/component/InputField.js b/apps/common/main/lib/component/InputField.js index 61c91114e..2c4ab717e 100644 --- a/apps/common/main/lib/component/InputField.js +++ b/apps/common/main/lib/component/InputField.js @@ -606,8 +606,12 @@ define([ this.hidePwd = true; } var me = this; + var prevstart = me._input[0].selectionStart, + prevend = me._input[0].selectionEnd; setTimeout(function () { me.focus(); + me._input[0].selectionStart = prevstart; + me._input[0].selectionEnd = prevend; }, 1); }, @@ -648,8 +652,12 @@ define([ this._btnElm.off('mouseup', this.passwordHide); this._btnElm.off('mouseout', this.passwordHide); var me = this; + var prevstart = me._input[0].selectionStart, + prevend = me._input[0].selectionEnd; setTimeout(function () { me.focus(); + me._input[0].selectionStart = prevstart; + me._input[0].selectionEnd = prevend; }, 1); } }, diff --git a/apps/common/main/lib/util/define.js b/apps/common/main/lib/util/define.js index df54c82e2..6d0bdc0b8 100644 --- a/apps/common/main/lib/util/define.js +++ b/apps/common/main/lib/util/define.js @@ -800,7 +800,7 @@ define(function(){ 'use strict'; {id: 'menu-effect-group-entrance', value: AscFormat.PRESET_CLASS_ENTR, caption: this.textEntrance, iconClsCustom: 'animation-entrance-custom'}, {id: 'menu-effect-group-emphasis', value: AscFormat.PRESET_CLASS_EMPH, caption: this.textEmphasis, iconClsCustom: 'animation-emphasis-custom'}, {id: 'menu-effect-group-exit', value: AscFormat.PRESET_CLASS_EXIT, caption: this.textExit, iconClsCustom: 'animation-exit-custom'}, - {id: 'menu-effect-group-path', value: AscFormat.PRESET_CLASS_PATH, caption: this.textPath, iconClsCustom: 'animation-motion_paths-custom'} + {id: 'menu-effect-group-path', value: AscFormat.PRESET_CLASS_PATH, caption: this.textPath, iconClsCustom: 'animation-motion-paths-custom'} ]; }, @@ -808,49 +808,49 @@ define(function(){ 'use strict'; return [ {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_APPEAR, iconCls: 'animation-entrance-appear', displayValue: this.textAppear}, {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_FADE, iconCls: 'animation-entrance-fade', displayValue: this.textFade}, - {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_FLY_IN_FROM, iconCls: 'animation-entrance-fly_in', displayValue: this.textFlyIn}, - {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_FLOAT_UP, iconCls: 'animation-entrance-float_in', displayValue: this.textFloatIn, familyEffect: 'entrfloat'}, + {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_FLY_IN_FROM, iconCls: 'animation-entrance-fly-in', displayValue: this.textFlyIn}, + {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_FLOAT_UP, iconCls: 'animation-entrance-float-in', displayValue: this.textFloatIn, familyEffect: 'entrfloat'}, {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_SPLIT, iconCls: 'animation-entrance-split', displayValue: this.textSplit}, {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_WIPE_FROM, iconCls: 'animation-entrance-wipe', displayValue: this.textWipe}, {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_CIRCLE, iconCls: 'animation-entrance-shape', displayValue: this.textShape, familyEffect: 'entrshape'}, {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_WHEEL, iconCls: 'animation-entrance-wheel', displayValue: this.textWheel}, - {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_RANDOM_BARS, iconCls: 'animation-entrance-random_bars', displayValue: this.textRandomBars}, - {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_GROW_AND_TURN, iconCls: 'animation-entrance-grow_turn', displayValue: this.textGrowTurn}, + {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_RANDOM_BARS, iconCls: 'animation-entrance-random-bars', displayValue: this.textRandomBars}, + {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_GROW_AND_TURN, iconCls: 'animation-entrance-grow-turn', displayValue: this.textGrowTurn}, {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_ZOOM, iconCls: 'animation-entrance-zoom', displayValue: this.textZoom}, {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_SWIVEL, iconCls: 'animation-entrance-swivel', displayValue: this.textSwivel}, {group: 'menu-effect-group-entrance', value: AscFormat.ENTRANCE_BOUNCE, iconCls: 'animation-entrance-bounce', displayValue: this.textBounce}, {group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_PULSE, iconCls: 'animation-emphasis-pulse', displayValue: this.textPulse}, - {group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_COLOR_PULSE, iconCls: 'animation-emphasis-color_pulse', displayValue: this.textColorPulse}, + {group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_COLOR_PULSE, iconCls: 'animation-emphasis-color-pulse', displayValue: this.textColorPulse}, {group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_TEETER, iconCls: 'animation-emphasis-teeter', displayValue: this.textTeeter}, {group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_SPIN, iconCls: 'animation-emphasis-spin', displayValue: this.textSpin}, - {group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_GROW_SHRINK, iconCls: 'animation-emphasis-grow_or_Shrink', displayValue: this.textGrowShrink}, + {group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_GROW_SHRINK, iconCls: 'animation-emphasis-grow-or-shrink', displayValue: this.textGrowShrink}, {group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_DESATURATE, iconCls: 'animation-emphasis-desaturate', displayValue: this.textDesaturate}, {group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_CONTRASTING_DARKEN, iconCls: 'animation-emphasis-darken', displayValue: this.textDarken}, {group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_LIGHTEN, iconCls: 'animation-emphasis-lighten', displayValue: this.textLighten}, {group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_TRANSPARENCY, iconCls: 'animation-emphasis-transparency', displayValue: this.textTransparency}, - {group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_OBJECT_COLOR, iconCls: 'animation-emphasis-object_color', displayValue: this.textObjectColor}, - {group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_COMPLEMENTARY_COLOR, iconCls: 'animation-emphasis-complementary_color', displayValue: this.textComplementaryColor}, - {group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_LINE_COLOR, iconCls: 'animation-emphasis-line_color', displayValue: this.textLineColor}, - {group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_FILL_COLOR, iconCls: 'animation-emphasis-fill_color', displayValue: this.textFillColor}, + {group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_OBJECT_COLOR, iconCls: 'animation-emphasis-object-color', displayValue: this.textObjectColor}, + {group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_COMPLEMENTARY_COLOR, iconCls: 'animation-emphasis-complementary-color', displayValue: this.textComplementaryColor}, + {group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_LINE_COLOR, iconCls: 'animation-emphasis-line-color', displayValue: this.textLineColor}, + {group: 'menu-effect-group-emphasis', value: AscFormat.EMPHASIS_FILL_COLOR, iconCls: 'animation-emphasis-fill-color', displayValue: this.textFillColor}, {group: 'menu-effect-group-exit', value: AscFormat.EXIT_DISAPPEAR, iconCls: 'animation-exit-disappear', displayValue: this.textDisappear}, {group: 'menu-effect-group-exit', value: AscFormat.EXIT_FADE, iconCls: 'animation-exit-fade', displayValue: this.textFade}, - {group: 'menu-effect-group-exit', value: AscFormat.EXIT_FLY_OUT_TO, iconCls: 'animation-exit-fly_out', displayValue: this.textFlyOut}, - {group: 'menu-effect-group-exit', value: AscFormat.EXIT_FLOAT_DOWN, iconCls: 'animation-exit-float_out', displayValue: this.textFloatOut, familyEffect: 'exitfloat'}, + {group: 'menu-effect-group-exit', value: AscFormat.EXIT_FLY_OUT_TO, iconCls: 'animation-exit-fly-out', displayValue: this.textFlyOut}, + {group: 'menu-effect-group-exit', value: AscFormat.EXIT_FLOAT_DOWN, iconCls: 'animation-exit-float-out', displayValue: this.textFloatOut, familyEffect: 'exitfloat'}, {group: 'menu-effect-group-exit', value: AscFormat.EXIT_SPLIT, iconCls: 'animation-exit-split', displayValue: this.textSplit}, {group: 'menu-effect-group-exit', value: AscFormat.EXIT_WIPE_FROM, iconCls: 'animation-exit-wipe', displayValue: this.textWipe}, {group: 'menu-effect-group-exit', value: AscFormat.EXIT_CIRCLE, iconCls: 'animation-exit-shape', displayValue: this.textShape, familyEffect: 'shape'}, {group: 'menu-effect-group-exit', value: AscFormat.EXIT_WHEEL, iconCls: 'animation-exit-wheel', displayValue: this.textWheel}, - {group: 'menu-effect-group-exit', value: AscFormat.EXIT_RANDOM_BARS, iconCls: 'animation-exit-random_bars', displayValue: this.textRandomBars}, - {group: 'menu-effect-group-exit', value: AscFormat.EXIT_SHRINK_AND_TURN, iconCls: 'animation-exit-shrink_turn', displayValue: this.textShrinkTurn}, + {group: 'menu-effect-group-exit', value: AscFormat.EXIT_RANDOM_BARS, iconCls: 'animation-exit-random-bars', displayValue: this.textRandomBars}, + {group: 'menu-effect-group-exit', value: AscFormat.EXIT_SHRINK_AND_TURN, iconCls: 'animation-exit-shrink-turn', displayValue: this.textShrinkTurn}, {group: 'menu-effect-group-exit', value: AscFormat.EXIT_ZOOM, iconCls: 'animation-exit-zoom', displayValue: this.textZoom}, {group: 'menu-effect-group-exit', value: AscFormat.EXIT_SWIVEL, iconCls: 'animation-exit-swivel', displayValue: this.textSwivel}, {group: 'menu-effect-group-exit', value: AscFormat.EXIT_BOUNCE, iconCls: 'animation-exit-bounce', displayValue: this.textBounce}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_DOWN, iconCls: 'animation-motion_paths-lines', displayValue: this.textLines, familyEffect: 'pathlines'}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_ARC_DOWN, iconCls: 'animation-motion_paths-arcs', displayValue: this.textArcs, familyEffect: 'patharcs'}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_TURN_DOWN, iconCls: 'animation-motion_paths-turns', displayValue: this.textTurns, familyEffect: 'pathturns'}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_CIRCLE, iconCls: 'animation-motion_paths-shapes', displayValue: this.textShapes, familyEffect: 'pathshapes'}, - {group: 'menu-effect-group-path', value: AscFormat.MOTION_HORIZONTAL_FIGURE_8_FOUR, iconCls: 'animation-motion_paths-loops', displayValue: this.textLoops, familyEffect: 'pathloops'}//, - //{group: 'menu-effect-group-path', value: AscFormat.MOTION_CUSTOM_PATH, iconCls: 'animation-motion_paths-custom_path', displayValue: this.textCustomPath} + {group: 'menu-effect-group-path', value: AscFormat.MOTION_DOWN, iconCls: 'animation-motion-paths-lines', displayValue: this.textLines, familyEffect: 'pathlines'}, + {group: 'menu-effect-group-path', value: AscFormat.MOTION_ARC_DOWN, iconCls: 'animation-motion-paths-arcs', displayValue: this.textArcs, familyEffect: 'patharcs'}, + {group: 'menu-effect-group-path', value: AscFormat.MOTION_TURN_DOWN, iconCls: 'animation-motion-paths-turns', displayValue: this.textTurns, familyEffect: 'pathturns'}, + {group: 'menu-effect-group-path', value: AscFormat.MOTION_CIRCLE, iconCls: 'animation-motion-paths-shapes', displayValue: this.textShapes, familyEffect: 'pathshapes'}, + {group: 'menu-effect-group-path', value: AscFormat.MOTION_HORIZONTAL_FIGURE_8_FOUR, iconCls: 'animation-motion-paths-loops', displayValue: this.textLoops, familyEffect: 'pathloops'}//, + //{group: 'menu-effect-group-path', value: AscFormat.MOTION_CUSTOM_PATH, iconCls: 'animation-motion-paths-custom-path', displayValue: this.textCustomPath} ]; }, diff --git a/apps/common/main/resources/less/input.less b/apps/common/main/resources/less/input.less index 89d49c239..a10827e2e 100644 --- a/apps/common/main/resources/less/input.less +++ b/apps/common/main/resources/less/input.less @@ -126,11 +126,13 @@ textarea.form-control:focus { position: absolute; right: @scaled-one-px-value-ie; right: @scaled-one-px-value; + top: @scaled-one-px-value-ie; + top: @scaled-one-px-value; .btn-group > .btn-toolbar, & > .btn-toolbar { - height: 22px; - padding-top: 1px; + height: 20px; + height: calc(22px - @scaled-one-px-value * 2); } } diff --git a/apps/common/mobile/resources/less/comments.less b/apps/common/mobile/resources/less/comments.less index fb2945ff8..804867be3 100644 --- a/apps/common/mobile/resources/less/comments.less +++ b/apps/common/mobile/resources/less/comments.less @@ -6,6 +6,10 @@ .wrap-comment { padding: 16px 24px 0 16px; + background-color: @background-tertiary; + .comment-date { + color: @text-secondary; + } .name { font-weight: 600; font-size: 16px; diff --git a/apps/common/mobile/resources/less/common-ios.less b/apps/common/mobile/resources/less/common-ios.less index 075362774..a6c00d4b4 100644 --- a/apps/common/mobile/resources/less/common-ios.less +++ b/apps/common/mobile/resources/less/common-ios.less @@ -89,15 +89,6 @@ .popover__titled { .list { - ul { - background-color: var(--f7-list-bg-color); - li:first-child, li:last-child { - border-radius: 0; - a { - border-radius: 0; - } - } - } &:first-child, &:last-child { ul { border-radius: 0; @@ -137,10 +128,6 @@ .list:last-child { li:last-child { - a { - //border-radius: 0; - } - &:after { content: ''; position: absolute; @@ -163,70 +150,6 @@ } } - // Bullets, numbers and multilevels - .bullets, - .numbers, - .multilevels { - .list{ - margin: 5px; - ul { - &:before, &:after { - display: none; - } - display: flex; - justify-content: space-around; - width: 100%; - margin-top: 10px; - padding: 0 5px; - background: none; - } - &:first-child li:first-child, &:last-child li:last-child { - border-radius: 0; - } - &:last-child li:last-child:after { - display: none; - } - } - - .list .item-content { - padding-left: 0; - min-height: 68px; - .item-inner{ - padding: 0; - &:after { - display: none; - } - } - } - - li { - width: 70px; - height: 70px; - border: 1px solid #c4c4c4; - html.pixel-ratio-2 & { - border: 0.5px solid #c4c4c4; - } - html.pixel-ratio-3 & { - border: 0.33px solid #c4c4c4; - } - - .thumb { - width: 100%; - height: 100%; - background-color: @fill-white; - background-size: cover; - - label { - width: 100%; - text-align: center; - position: absolute; - top: 34%; - color: @fill-black; - } - } - } - } - .popover { li:last-child { .segmented a { @@ -250,9 +173,6 @@ } .list { - li { - color: @text-normal; - } .item-content { .color-preview { width: 22px; @@ -261,9 +181,6 @@ margin-top: 21px; box-sizing: border-box; box-shadow: 0 0 0 1px rgba(0, 0, 0, .15) inset; - &.auto { - background-color: @autoColor; - } } .item-after { .color-preview { @@ -273,22 +190,9 @@ } } } - li.no-indicator { - .item-link { - .item-inner { - padding-right: 15px; - &:before { - content: none; - } - } - } - } .item-inner { - color: @text-normal; padding-top: 7px; - color: @text-normal; .item-after { - color: @text-normal; .after-start { margin: 0 5px; } @@ -315,11 +219,6 @@ display: flex; align-items: center; justify-content: center; - &.active { - color: @brandColor; - // background-color: var(--button-active-opacity); - background-color: @button-active-opacity; - } } } } @@ -396,13 +295,6 @@ font-family: inherit; cursor: pointer; outline: 0; - &.active { - background: @brandColor; - color: @fill-white; - i.icon { - background-color: @fill-white; - } - } } .button-fill { diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less index f7496c052..d694fac4a 100644 --- a/apps/common/mobile/resources/less/common-material.less +++ b/apps/common/mobile/resources/less/common-material.less @@ -263,29 +263,6 @@ } // List .list { - li { - color: @text-normal; - } - .item-inner { - color: @text-normal; - } - li.no-indicator { - .item-link { - .item-inner{ - padding-right: 15px; - &:before { - content: none; - } - } - } - } - .item-link { - .item-inner { - .item-after { - color: @text-normal; - } - } - } &.inputs-list { .item-input, .item-link { .item-inner { @@ -324,14 +301,6 @@ &:first-child { margin-left: 0; } - &.active { - color: @brandColor; - // background-color: var(--button-active-opacity); - background-color: @button-active-opacity; - // i.icon { - // background-color: @white; - // } - } } } } @@ -345,82 +314,6 @@ margin-top: -3px; box-shadow: 0 0 0 1px rgba(0, 0, 0, .15) inset; background: @fill-white; - &.auto { - background-color: @autoColor; - } - } - } - } - // Bullets, numbers and multilevels - .bullets, - .numbers, - .multilevels { - .list{ - margin: 5px; - ul { - background: none; - &:before, &:after { - display: none; - } - display: flex; - justify-content: space-around; - width: 100%; - margin-top: 10px; - padding: 0 5px; - } - &:first-child li:first-child, &:last-child li:last-child { - border-radius: 0; - } - } - - .list .item-content { - padding-left: 0; - min-height: 68px; - .item-inner{ - padding: 0; - &:after { - display: none; - } - } - } - - li { - width: 70px; - height: 70px; - border: 1px solid @gray; - html.pixel-ratio-2 & { - border: 0.5px solid @gray; - } - html.pixel-ratio-3 & { - border: 0.33px solid @gray; - } - - .thumb { - width: 100%; - height: 100%; - background-color: @fill-white; - background-size: cover; - - label { - width: 100%; - text-align: center; - position: absolute; - top: 34%; - color: @fill-black; - } - } - } - } - .popover__titled { - .list { - ul { - background-color: var(--f7-list-bg-color); - li:first-child, li:last-child { - border-radius: 0; - a { - border-radius: 0; - } - } } } } @@ -517,12 +410,11 @@ background-size: 24px 24px; transition-duration: .3s; .encoded-svg-background(''); + &::placeholder { + color: @fill-white; + } } - - .searchbar input::placeholder { - color: @fill-white; - } - + .navbar { .searchbar-expandable.searchbar-enabled { top: 0; diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index aa3413c2e..9295bf3dc 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -68,8 +68,13 @@ margin-top: 0; } .inner-range-title { + color: @text-normal; padding: 15px 0 0 15px; } + + .range-number { + color: @text-normal; + } } .page-content { &.no-padding-top { @@ -88,6 +93,16 @@ } .list { + li.no-indicator { + .item-link { + .item-inner{ + padding-right: 15px; + &:before { + content: none; + } + } + } + } .item-text { text-overflow: initial; white-space: normal; @@ -98,6 +113,86 @@ .font-item img { filter: var(--image-border-types-filter, none) } + .buttons { + .button.active { + background-color: @button-active-opacity; + } + } + .item-content { + .color-preview.auto { + background-color: @autoColor; + } + } +} +// Bullets, numbers and multilevels + .bullets, + .numbers, + .multilevels { + .list{ + margin: 5px; + ul { + background: none; + &:before, &:after { + display: none; + } + display: flex; + justify-content: space-around; + width: 100%; + margin-top: 10px; + padding: 0 5px; + + li { + width: 70px; + height: 70px; + border: 1px solid @gray; + html.pixel-ratio-2 & { + border: 0.5px solid @gray; + } + html.pixel-ratio-3 & { + border: 0.33px solid @gray; + } + + .thumb { + width: 100%; + height: 100%; + background-color: @fill-white; + background-size: cover; + + label { + width: 100%; + text-align: center; + position: absolute; + top: 34%; + color: @fill-black; + } + } + } + } + } + + .row.list .item-content { + padding-left: 0; + min-height: 68px; + .item-inner{ + padding: 0; + &:after { + display: none; + } + } + } +} + +.popover__titled .popover-inner{ + .list { + ul { + background-color: var(--f7-list-bg-color); + li:first-child, li:last-child { + a { + border-radius: 0; + } + } + } + } } .shapes { diff --git a/apps/common/mobile/resources/less/ios/_about.less b/apps/common/mobile/resources/less/ios/_about.less deleted file mode 100644 index 28d7460f2..000000000 --- a/apps/common/mobile/resources/less/ios/_about.less +++ /dev/null @@ -1,38 +0,0 @@ -// About -.about { - .page-content { - text-align: center; - } - - .content-block:first-child { - margin: 15px 0; - } - - .content-block { - margin: 0 auto 15px; - - a { - color: #000; - } - } - - h3 { - font-weight: normal; - margin: 0; - - &.vendor { - color: #000; - font-weight: bold; - margin-top: 15px; - } - } - - p > label { - margin-right: 5px; - } - - .logo { - background: url('../../../../common/mobile/resources/img/about/logo.svg') no-repeat center; - margin-top: 20px; - } -} \ No newline at end of file diff --git a/apps/common/mobile/resources/less/ios/_button.less b/apps/common/mobile/resources/less/ios/_button.less deleted file mode 100644 index da6c4d105..000000000 --- a/apps/common/mobile/resources/less/ios/_button.less +++ /dev/null @@ -1,8 +0,0 @@ -// Active button icon color -.button { - &.active { - i.icon { - background-color: #fff; - } - } -} \ 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 deleted file mode 100644 index e55a265a7..000000000 --- a/apps/common/mobile/resources/less/ios/_collaboration.less +++ /dev/null @@ -1,460 +0,0 @@ -.page-change { - background-color: @fill-white; - .block-description { - background-color: @fill-white; - padding-top: 15px; - padding-bottom: 15px; - margin: 0; - max-width: 100%; - word-wrap: break-word; - } - #user-name { - font-size: 17px; - line-height: 22px; - color: @fill-black; - margin: 0; - } - #date-change { - font-size: 14px; - line-height: 18px; - color: @text-tertiary; - margin: 0; - margin-top: 3px; - } - #text-change { - color: @fill-black; - font-size: 15px; - line-height: 20px; - margin: 0; - margin-top: 10px; - } - .block-btn, .content-block.block-btn:first-child { - position: absolute; - bottom: 0; - display: flex; - flex-direction: row; - 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-reject-change { - margin-left: 20px; - } - #btn-goto-change { - margin-left: 10px; - } - .change-buttons, .accept-reject { - display: flex; - } - .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 { - display: flex; - justify-content: space-around; -} -.container-collaboration { - .navbar .right.close-collaboration { - position: absolute; - right: 10px; - } - .page-content .list-block:first-child { - margin-top: -1px; - } -} - -//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; - -#user-list { - .item-content { - padding-left: 0; - } - .item-inner { - justify-content: flex-start; - padding-left: 15px; - } - .length { - margin-left: 4px; - } - .color { - min-width: 40px; - min-height: 40px; - margin-right: 20px; - text-align: center; - border-radius: 50px; - line-height: 40px; - color: @initialEditUser; - font-weight: 500; - - } - ul:before { - content: none; - } -} - -//Comments -.page-comments, .add-comment, .page-view-comments, .container-edit-comment, .container-add-reply, .page-edit-comment, .page-add-reply, .page-edit-reply { - .header-comment { - display: flex; - justify-content: space-between; - padding-right: 16px; - .comment-right { - display: flex; - justify-content: space-between; - width: 70px; - } - } - .list-block .item-inner { - display: block; - padding: 16px 0; - word-wrap: break-word; - } - - .list-reply { - padding-left: 26px; - } - .reply-textarea, .comment-textarea, .edit-reply-textarea { - resize: vertical; - } - .user-name { - font-size: 17px; - line-height: 22px; - color: @fill-black; - margin: 0; - font-weight: bold; - } - .comment-date, .reply-date { - font-size: 13px; - line-height: 18px; - color: @text-secondary; - margin: 0; - margin-top: 0px; - } - .comment-text, .reply-text { - color: @fill-black; - font-size: 15px; - line-height: 25px; - margin: 0; - max-width: 100%; - padding-right: 15px; - pre { - white-space: pre-wrap; - } - } - .reply-item { - margin-top: 15px; - padding-right: 16px; - padding-top: 13px; - .header-reply { - display: flex; - justify-content: space-between; - } - .user-name { - padding-top: 3px; - } - &:before { - content: ''; - position: absolute; - left: auto; - bottom: 0; - right: auto; - top: 0; - height: 1px; - width: 100%; - background-color: @listBlockBorderColor; - display: block; - z-index: 15; - -webkit-transform-origin: 50% 100%; - transform-origin: 50% 100%; - } - } - .comment-quote { - color: @text-secondary; - border-left: 1px solid @text-secondary; - padding-left: 10px; - padding-right: 16px; - margin: 5px 0; - font-size: 15px; - } - - .wrap-comment, .wrap-reply { - padding: 16px 24px 0 16px; - } - .comment-textarea, .reply-textarea, .edit-reply-textarea { - margin-top: 10px; - background:transparent; - outline:none; - width: 100%; - font-size: 17px; - border: none; - border-radius: 3px; - min-height: 100px; - } -} -.settings.popup .list-block ul.list-reply:last-child:after, .settings.popover .list-block ul.list-reply:last-child:after { - display: none; -} - -.container-edit-comment { - .page { - background-color: @fill-white; - } -} - -//view comment -.container-view-comment { - position: fixed; - -webkit-transition: height 100ms; - transition: height 120ms; - background-color: #FFFFFF; - border-top-left-radius: 4px; - border-top-right-radius: 4px; - height: 50%; - box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2), 0px 4px 5px rgba(0, 0, 0, 0.12); - .pages { - background-color: #FFFFFF; - } - .page-view-comments { - background-color: #FFFFFF; - .list-block { - margin-bottom: 100px; - ul:before, ul:after { - content: none; - } - .item-inner { - padding: 0; - } - } - - } - .toolbar { - position: fixed; - background-color: #FFFFFF; - box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2), 0px 4px 5px rgba(0, 0, 0, 0.12), 0px 2px 4px rgba(0, 0, 0, 0.14); - &:before { - content: none; - } - .toolbar-inner { - display: flex; - justify-content: space-between; - padding: 0 16px; - .button-left { - min-width: 80px; - } - .button-right { - min-width: 62px; - display: flex; - justify-content: space-between; - a { - padding: 0 12px; - } - } - } - } - .swipe-container { - display: flex; - justify-content: center; - height: 40px; - .icon-swipe { - margin-top: 8px; - width: 40px; - height: 4px; - background: rgba(0, 0, 0, 0.12); - border-radius: 2px; - } - } - .list-block { - margin-top: 0; - } - &.popover { - position: absolute; - border-radius: 4px; - min-height: 170px; - height: 400px; - max-height: 600px; - - .toolbar { - position: absolute; - border-radius: 0 0 4px 4px; - .toolbar-inner { - padding-right: 0; - } - } - - .pages { - position: absolute; - - .page { - border-radius: 13px; - - .page-content { - padding: 16px; - padding-bottom: 80px; - - .list-block { - margin-bottom: 0px; - - .item-content { - padding-left: 0; - - .header-comment, .reply-item { - padding-right: 0; - } - } - } - - .block-reply { - margin-top: 10px; - - .reply-textarea { - min-height: 70px; - width: 278px; - border: 1px solid #c4c4c4; - border-radius: 6px; - padding: 5px; - } - } - - .edit-reply-textarea { - min-height: 60px; - width: 100%; - border: 1px solid #c4c4c4; - border-radius: 6px; - padding: 5px; - height: 60px; - margin-top: 10px; - } - - .comment-text { - padding-right: 0; - - .comment-textarea { - border: 1px solid #c4c4c4; - border-radius: 6px; - padding: 8px; - min-height: 80px; - height: 80px; - } - } - } - } - } - - } -} - -#done-comment { - color: @brandColor; -} -.page-add-comment { - background-color: @fill-white; - .wrap-comment, .wrap-reply { - padding: 16px 24px 0 16px; - .header-comment { - justify-content: flex-start; - } - .user-name { - font-weight: bold; - font-size: 17px; - padding-left: 5px; - } - .comment-date { - font-size: 13px; - color: @text-secondary; - padding-left: 5px; - } - .wrap-textarea { - margin-top: 16px; - padding-right: 6px; - .comment-textarea { - 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; - } - } - } - } -} -.container-add-reply { - height: 100%; - .navbar { - a.link i + span { - margin-left: 0; - } - } - .page { - background-color: #FFFFFF; - } -} - -.actions-modal-button.color-red { - color: @red; -} - -.page-edit-comment, .page-add-reply, .page-edit-reply { - background-color: #FFFFFF; - .header-comment { - justify-content: flex-start; - } - .navbar { - .right { - height: 100%; - #add-reply, #edit-comment, #edit-reply { - display: flex; - align-items: center; - padding-left: 16px; - padding-right: 16px; - height: 100%; - } - } - } -} - -.container-edit-comment { - position: fixed; - -} - diff --git a/apps/common/mobile/resources/less/ios/_color-palette.less b/apps/common/mobile/resources/less/ios/_color-palette.less deleted file mode 100644 index b9c504f21..000000000 --- a/apps/common/mobile/resources/less/ios/_color-palette.less +++ /dev/null @@ -1,171 +0,0 @@ -// Color palette - -.color-palette { - a { - flex-grow: 1; - position: relative; - min-width: 10px; - min-height: 26px; - margin: 1px 1px 0 0; - box-shadow: 0 0 0 1px rgba(0,0,0,0.15) inset; - - &.active { - &:after { - content:' '; - position: absolute; - width: 100%; - height: 100%; - box-shadow: 0 0 0 1px white, 0 0 0 4px @brandColor; - z-index: 1; - border-radius: 1px; - } - } - - &.transparent { - background-repeat: no-repeat; - background-size: 100% 100%; - .encoded-svg-background(""); - } - } - - .theme-colors { - .item-inner { - display: inline-block; - overflow: visible; - } - } - - .standart-colors, .dynamic-colors { - .item-inner { - overflow: visible; - } - } -} - -.custom-colors { - display: flex; - justify-content: space-around; - align-items: center; - margin: 15px; - &.phone { - max-width: 300px; - margin: 0 auto; - margin-top: 4px; - .button-round { - margin-top: 20px; - } - } - .right-block { - margin-left: 20px; - } - .button-round { - height: 72px; - width: 72px; - padding: 0; - display: flex; - justify-content: center; - align-items: center; - border-radius: 100px; - background-color: #ffffff; - box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); - border-color: transparent; - margin-top: 25px; - &.active-state { - background-color: rgba(0, 0, 0, 0.1); - } - } - .color-hsb-preview { - width: 72px; - height: 72px; - border-radius: 100px; - overflow: hidden; - border: 1px solid #c4c4c4; - } - .new-color-hsb-preview { - width: 100%; - height: 36px; - } - .current-color-hsb-preview { - width: 100%; - height: 36px; - } - .list-block ul:before, .list-block ul:after { - content: none; - } - .list-block ul li { - border: 1px solid rgba(0, 0, 0, 0.3); - } - .color-picker-wheel { - position: relative; - width: 290px; - max-width: 100%; - height: auto; - font-size: 0; - - svg { - width: 100%; - height: auto; - } - - .color-picker-wheel-handle { - width: calc(100% / 6); - height: calc(100% / 6); - position: absolute; - box-sizing: border-box; - border: 2px solid #fff; - box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); - background: red; - border-radius: 50%; - left: 0; - top: 0; - } - - .color-picker-sb-spectrum { - background-color: #000; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, #000 100%), linear-gradient(to left, rgba(255, 255, 255, 0) 0%, #fff 100%); - position: relative; - width: 45%; - height: 45%; - left: 50%; - top: 50%; - transform: translate3d(-50%, -50%, 0); - position: absolute; - } - - .color-picker-sb-spectrum-handle { - width: 4px; - height: 4px; - position: absolute; - left: -2px; - top: -2px; - z-index: 1; - - &:after { - background-color: inherit; - content: ''; - position: absolute; - width: 16px; - height: 16px; - border: 1px solid #fff; - border-radius: 50%; - box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.5); - box-sizing: border-box; - left: 50%; - top: 50%; - transform: translate(-50%, -50%); - transition: 150ms; - transition-property: transform; - transform-origin: center; - } - - &.color-picker-sb-spectrum-handle-pressed:after { - transform: scale(1.5) translate(-33.333%, -33.333%); - } - } - } -} - -#font-color-auto.active .color-auto { - box-shadow: 0 0 0 1px white, 0 0 0 4px @brandColor; - border-radius: 1px; -} diff --git a/apps/common/mobile/resources/less/ios/_color-schema.less b/apps/common/mobile/resources/less/ios/_color-schema.less deleted file mode 100644 index 2c4dc2449..000000000 --- a/apps/common/mobile/resources/less/ios/_color-schema.less +++ /dev/null @@ -1,21 +0,0 @@ -.color-schemes-menu { - cursor: pointer; - display: block; - background-color: #fff; - .item-inner { - justify-content: flex-start; - } - .color-schema-block { - display: flex; - } - .color { - min-width: 26px; - min-height: 26px; - margin: 0 2px 0 0; - box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15) inset; - } - .text { - margin-left: 20px; - color: #212121; - } -} diff --git a/apps/common/mobile/resources/less/ios/_container.less b/apps/common/mobile/resources/less/ios/_container.less deleted file mode 100644 index 3d1885edf..000000000 --- a/apps/common/mobile/resources/less/ios/_container.less +++ /dev/null @@ -1,117 +0,0 @@ -// Container -.phone.ios { - .container-edit, - .container-collaboration, - .container-filter { - .navbar { - .hairline(top, @toolbarBorderColor); - } - - .page-content { - .list-block:first-child { - margin-top: -1px; - } - } - } -} - -.container-edit, -.container-add, -.container-settings, -.container-collaboration, -.container-filter { - &.popover { - width: 360px; - } -} - -.settings { - &.popup, - &.popover { - .list-block { - - ul { - border-radius: 0 !important; - background: #fff; - - &:last-child { - .hairline(bottom, @listBlockBorderColor); - } - } - - &:first-child { - margin-top: 0; - } - - &:last-child { - margin-bottom: 30px; - } - - li:first-child a, - li:last-child a { - border-radius: 0 !important; - } - } - - &, - .popover-inner { - > .content-block { - width: 100%; - height: 100%; - margin: 0; - padding: 0; - color: #000; - } - } - - .popover-view { - border-radius: 13px; - - > .pages { - border-radius: 13px; - } - } - - .content-block:first-child { - margin-top: 0; - .content-block-inner { - &:before { - height: 0; - } - } - } - } - - .categories { - width: 100%; - - > .buttons-row { - width: 100%; - - .button { - padding: 0 1px; - } - } - } - - .popover-inner { - height: 400px; - } -} - -.container-add { - .categories { - > .buttons-row { - .button { - &.active { - i.icon { - background-color: transparent; - } - } - display: flex; - justify-content: center; - align-items: center; - } - } - } -} \ No newline at end of file diff --git a/apps/common/mobile/resources/less/ios/_contextmenu.less b/apps/common/mobile/resources/less/ios/_contextmenu.less deleted file mode 100644 index 9528ee37e..000000000 --- a/apps/common/mobile/resources/less/ios/_contextmenu.less +++ /dev/null @@ -1,95 +0,0 @@ -// Context menu - -.document-menu { - @contextMenuBg: rgba(0,0,0,0.9); - @modalHairlineColor: rgba(230,230,230,0.9); - @modalButtonColor : rgba(200,200,200,0.9); - - background-color: @contextMenuBg; - width: auto; - border-radius: 8px; - z-index: 12500; - - .popover-angle { - &:after { - background: @contextMenuBg; - } - } - - .list-block { - font-size: 14px; - white-space: pre; - - &:first-child { - ul { - .hairline-remove(left); - border-radius: 7px 0 0 7px; - } - li:first-child a{ - border-radius: 7px 0 0 7px; - } - } - &:last-child { - ul { - .hairline-remove(right); - border-radius: 0 7px 7px 0; - } - li:last-child a{ - border-radius: 0 7px 7px 0; - } - } - &:first-child:last-child { - li:first-child:last-child a, ul:first-child:last-child { - border-radius: 7px; - } - } - - .item-link { - display: inline-block; - - html:not(.watch-active-state) &:active, &.active-state { - //.transition(0ms); - background-color: #d9d9d9; - .item-inner { - .hairline-color(right, transparent); - } - } - - html.phone & { - padding: 0 10px; - } - - &.list-button { - color: @white; - .hairline(right, @modalHairlineColor); - line-height: 36px; - } - } - - // List items - li { - display: inline-block; - } - - // Last-childs - li { - &:last-child { - .list-button { - .hairline-remove(right); - } - } - &:last-child, &:last-child li:last-child { - .item-inner { - .hairline-remove(right); - } - } - li:last-child, &:last-child li { - .item-inner { - .hairline(right, @modalHairlineColor); - } - } - } - .no-hairlines(); - .no-hairlines-between() - } -} \ No newline at end of file diff --git a/apps/common/mobile/resources/less/ios/_dataview.less b/apps/common/mobile/resources/less/ios/_dataview.less deleted file mode 100644 index 6ddb04406..000000000 --- a/apps/common/mobile/resources/less/ios/_dataview.less +++ /dev/null @@ -1,35 +0,0 @@ -// Data view - -.dataview { - &.page-content { - background: @white; - } - - .row { - justify-content: space-around; - } - - ul { - padding: 0 10px; - list-style: none; - - li { - display: inline-block; - } - } - - .active { - position: relative; - z-index: 1; - - &::after { - content: ''; - position: absolute; - width: 22px; - height: 22px; - right: -5px; - bottom: -5px; - .encoded-svg-background(''); - } - } -} \ No newline at end of file diff --git a/apps/common/mobile/resources/less/ios/_listview.less b/apps/common/mobile/resources/less/ios/_listview.less deleted file mode 100644 index 9a5d40fe5..000000000 --- a/apps/common/mobile/resources/less/ios/_listview.less +++ /dev/null @@ -1,93 +0,0 @@ -// List extend - -.item-content { - .item-after { - &.splitter { - color: #000; - - label { - margin: 0 5px; - } - - .buttons-row { - min-width: 90px; - margin-left: 10px; - } - } - - &.value { - display: block; - min-width: 60px; - color: @black; - margin-left: 10px; - text-align: right; - } - - input.field { - color: @brandColor; - - &.placeholder-color::-webkit-input-placeholder { - color: @brandColor; - } - - &.right { - text-align: right; - } - } - } - - &.buttons { - .item-inner { - padding-top: 0; - padding-bottom: 0; - align-items: stretch; - - > .row { - width: 100%; - align-items: stretch; - - .button { - flex: 1; - border: none; - height: inherit; - border-radius: 0; - font-size: 17px; - display: flex; - align-items: center; - justify-content: center; - } - } - } - } - - .item-after .color-preview { - width: 75px; - height: 30px; - margin-top: -3px; - box-shadow: 0 0 0 1px rgba(0,0,0,0.15) inset; - } - - i .color-preview { - width: 22px; - height: 8px; - display: inline-block; - margin-top: 21px; - box-sizing: border-box; - box-shadow: 0 0 0 1px rgba(0,0,0,0.15) inset; - } -} - -.item-link { - &.no-indicator { - .item-inner { - background-image: none; - padding-right: 15px; - } - } -} - -.list-block { - .item-link.list-button { - color: @brandColor; - } -} \ No newline at end of file diff --git a/apps/common/mobile/resources/less/ios/comments.less b/apps/common/mobile/resources/less/ios/comments.less index cde7c1f88..a00df23c6 100644 --- a/apps/common/mobile/resources/less/ios/comments.less +++ b/apps/common/mobile/resources/less/ios/comments.less @@ -1,10 +1,6 @@ .device-ios { .wrap-comment { height: calc(100% - 60px); - background-color: @background-tertiary; - .comment-date { - color: @text-secondary; - } } .add-comment-popup, .add-reply-popup, .add-comment-dialog, .add-reply-dialog { .wrap-textarea { diff --git a/apps/common/mobile/resources/less/material/_about.less b/apps/common/mobile/resources/less/material/_about.less deleted file mode 100644 index ce52c8b3e..000000000 --- a/apps/common/mobile/resources/less/material/_about.less +++ /dev/null @@ -1,38 +0,0 @@ -// About - -.about { - .page-content { - text-align: center; - } - - .content-block:first-child { - margin: 15px 0; - } - - .content-block { - margin: 0 auto 15px; - - a { - color: #000; - } - } - - h3 { - font-weight: normal; - margin: 0; - - &.vendor { - color: #000; - font-weight: bold; - margin-top: 15px; - } - } - - p > label { - margin-right: 5px; - } - - .logo { - background: url('../../../../common/mobile/resources/img/about/logo.svg') no-repeat center; - } -} \ No newline at end of file diff --git a/apps/common/mobile/resources/less/material/_button.less b/apps/common/mobile/resources/less/material/_button.less deleted file mode 100644 index f680dcb57..000000000 --- a/apps/common/mobile/resources/less/material/_button.less +++ /dev/null @@ -1,9 +0,0 @@ -// Active button icon color - -.button { - &.active { - i.icon { - background-color: #fff; - } - } -} diff --git a/apps/common/mobile/resources/less/material/_collaboration.less b/apps/common/mobile/resources/less/material/_collaboration.less deleted file mode 100644 index 2d89a7280..000000000 --- a/apps/common/mobile/resources/less/material/_collaboration.less +++ /dev/null @@ -1,507 +0,0 @@ -.page-change { - .block-description { - background-color: @fill-white; - padding-top: 15px; - padding-bottom: 15px; - margin: 0; - max-width: 100%; - word-wrap: break-word; - } - #user-name { - font-size: 16px; - line-height: 22px; - color: @fill-black; - margin: 0; - } - #date-change { - font-size: 14px; - line-height: 18px; - color: @text-tertiary; - margin: 0; - margin-top: 3px; - } - #text-change { - color: @fill-black; - font-size: 15px; - line-height: 20px; - margin: 0; - margin-top: 10px; - } - .block-btn { - position: absolute; - bottom: 0; - display: flex; - flex-direction: row; - justify-content: space-between; - margin: 0; - width: 100%; - height: 56px; - align-items: center; - box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2); - - #btn-reject-change { - margin-left: 15px; - } - .change-buttons, .accept-reject, .next-prev { - display: flex; - } - .link { - 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 { - position: absolute; - right: 5px; - } - .page-content .list-block:first-child { - margin-top: -1px; - } -} - -//Display mode -.page-display-mode { - .list-block { - .item-subtitle { - font-size: 14px; - color: @gray; - } - } -} - -//Edit users -@initialEditUser: #373737; - -#user-list { - .item-content { - padding-left: 0; - } - .item-inner { - justify-content: flex-start; - padding-left: 15px; - } - .length { - margin-left: 4px; - } - .color { - min-width: 40px; - min-height: 40px; - margin-right: 20px; - text-align: center; - border-radius: 50px; - line-height: 40px; - color: @initialEditUser; - font-weight: 400; - } - ul:before { - content: none; - } -} - -//Comments -.page-comments, .page-add-comment, .page-view-comments, .container-edit-comment, .container-add-reply, .page-edit-comment, .page-add-reply, .page-edit-reply { - .list-block { - ul { - &:before, &:after { - content: none; - } - } - .item-inner { - display: block; - padding: 16px 0; - word-wrap: break-word; - &:after { - content: none; - } - } - } - .list-reply { - padding-left: 26px; - } - .reply-textarea, .comment-textarea, .edit-reply-textarea { - resize: vertical; - } - .user-name { - font-size: 16px; - line-height: 22px; - color: @fill-black; - margin: 0; - } - .comment-date, .reply-date { - font-size: 12px; - line-height: 18px; - color: @text-secondary; - margin: 0; - margin-top: 0px; - } - .comment-text, .reply-text { - color: @fill-black; - font-size: 15px; - line-height: 25px; - margin: 0; - max-width: 100%; - padding-right: 15px; - pre { - white-space: pre-wrap; - } - } - .reply-item { - padding-right: 16px; - padding-top: 13px; - .header-reply { - display: flex; - justify-content: space-between; - } - .user-name { - padding-top: 3px; - } - } - .comment-quote { - color: @text-secondary; - border-left: 1px solid @text-secondary; - padding-left: 10px; - padding-right: 16px; - margin: 5px 0; - font-size: 15px; - } - - .wrap-comment, .wrap-reply { - padding: 16px 24px 0 16px; - } - .comment-textarea, .reply-textarea, .edit-reply-textarea { - margin-top: 10px; - background:transparent; - outline:none; - width: 100%; - font-size: 15px; - border: none; - border-radius: 3px; - min-height: 100px; - } - - .header-comment { - display: flex; - justify-content: space-between; - padding-right: 16px; - .comment-right { - display: flex; - justify-content: space-between; - width: 70px; - } - .comment-left { - display: flex; - justify-content: space-between; - } - .initials-comment { - height: 40px; - width: 40px; - border-radius: 50px; - color: #FFFFFF; - display: flex; - justify-content: center; - align-items: center; - margin-right: 16px; - font-size: 18px; - } - } - .header-reply { - .reply-left { - display: flex; - justify-content: space-between; - align-items: flex-start; - } - .initials-reply { - width: 24px; - height: 24px; - color: #FFFFFF; - font-size: 11px; - display: flex; - justify-content: center; - align-items: center; - margin-right: 16px; - border-radius: 50px; - margin-top: 5px; - } - } -} -.settings.popup .list-block ul.list-reply:last-child:after, .settings.popover .list-block ul.list-reply:last-child:after { - display: none; -} - -//view comment -.container-view-comment { - position: fixed; - -webkit-transition: height 100ms; - transition: height 100ms; - background-color: #FFFFFF; - border-top-left-radius: 4px; - border-top-right-radius: 4px; - height: 50%; - box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2), 0px 4px 5px rgba(0, 0, 0, 0.12), 0px 2px 4px rgba(0, 0, 0, 0.14); - .page-view-comments { - background-color: #FFFFFF; - .list-block { - margin-bottom: 120px; - ul:before, ul:after { - content: none; - } - .item-inner { - padding: 0; - } - } - - } - .toolbar { - position: fixed; - background-color: #FFFFFF; - box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2), 0px 4px 5px rgba(0, 0, 0, 0.12), 0px 2px 4px rgba(0, 0, 0, 0.14); - &.toolbar-bottom { - top: auto; - } - &:before { - content: none; - } - a { - &.link { - color: @brandColor; - font-size: 16px; - } - } - .toolbar-inner { - display: flex; - justify-content: space-between; - padding: 0 16px; - .button-left { - min-width: 80px; - } - .button-right { - min-width: 62px; - display: flex; - justify-content: space-between; - a { - padding: 0 8px; - } - } - } - } - .swipe-container { - display: flex; - justify-content: center; - height: 40px; - background-color: @background-primary; - .icon-swipe { - margin-top: 8px; - width: 40px; - height: 4px; - background: rgba(0, 0, 0, 0.12); - border-radius: 2px; - } - } - .list-block { - margin-top: 0; - } - &.popover { - position: absolute; - border-radius: 4px; - min-height: 170px; - height: 400px; - max-height: 600px; - - .toolbar { - position: absolute; - border-radius: 0 0 4px 4px; - .toolbar-inner { - padding-right: 0; - } - } - - .pages { - position: absolute; - - .page { - border-radius: 13px; - - .page-content { - padding: 16px; - padding-bottom: 80px; - - .list-block { - margin-bottom: 0px; - - .item-content { - padding-left: 0; - - .header-comment, .reply-item { - padding-right: 0; - } - } - } - - .block-reply { - margin-top: 10px; - - .reply-textarea { - min-height: 70px; - width: 278px; - border: 1px solid #c4c4c4; - border-radius: 6px; - padding: 5px; - } - } - - .edit-reply-textarea { - min-height: 60px; - width: 100%; - border: 1px solid #c4c4c4; - border-radius: 6px; - padding: 5px; - height: 60px; - margin-top: 10px; - } - - .comment-text { - padding-right: 0; - - .comment-textarea { - border: 1px solid #c4c4c4; - border-radius: 6px; - padding: 8px; - min-height: 80px; - height: 80px; - } - } - } - } - } - - } -} - -#done-comment { - padding: 0 16px; -} -.page-add-comment { - .wrap-comment, .wrap-reply { - padding: 16px 24px 0 16px; - .header-comment { - justify-content: flex-start; - } - .user-name { - font-size: 17px; - font-weight: bold; - } - .comment-date { - font-size: 13px; - color: @text-secondary; - } - .wrap-textarea { - margin-top: 16px; - padding-right: 6px; - .comment-textarea { - font-size: 17px; - border: none; - margin-top: 0; - min-height: 100px; - border-radius: 4px; - &::placeholder { - color: @gray; - font-size: 17px; - } - } - } - } -} - -.container-edit-comment, .container-add-reply { - height: 100%; - .navbar { - &:after { - content: ''; - position: absolute; - left: 0; - bottom: 0; - right: auto; - top: auto; - height: 1px; - width: 100%; - background-color: #c4c4c4; - display: block; - z-index: 15; - -webkit-transform-origin: 50% 100%; - transform-origin: 50% 100%; - } - .navbar-inner { - justify-content: space-between; - } - a.link i + span { - margin-left: 0; - } - .center { - font-size: 18px; - } - .right { - margin-left: 0; - } - } - .page-add-comment { - background-color: @fill-white; - } - .header-comment { - justify-content: flex-start; - } -} - -.actions-modal-button.color-red { - color: @red; -} - -.page-edit-comment, .page-add-reply, .page-edit-reply { - background-color: @fill-white; - .header-comment { - justify-content: flex-start; - } - .navbar { - .right { - height: 100%; - #add-new-reply, #edit-comment, #edit-reply { - display: flex; - align-items: center; - padding-left: 16px; - padding-right: 16px; - height: 100%; - } - } - } -} - -.container-edit-comment { - position: fixed; -} \ No newline at end of file diff --git a/apps/common/mobile/resources/less/material/_color-palette.less b/apps/common/mobile/resources/less/material/_color-palette.less deleted file mode 100644 index ab77c10a0..000000000 --- a/apps/common/mobile/resources/less/material/_color-palette.less +++ /dev/null @@ -1,175 +0,0 @@ -// Color palette - -.color-palette { - a { - flex-grow: 1; - position: relative; - min-width: 10px; - min-height: 26px; - margin: 1px 1px 0 0; - box-shadow: 0 0 0 1px rgba(0,0,0,0.15) inset; - - &.active { - &:after { - content:' '; - position: absolute; - width: 100%; - height: 100%; - box-shadow: 0 0 0 1px white, 0 0 0 4px @brandColor; - z-index: 1; - border-radius: 1px; - } - } - - &.transparent { - background-repeat: no-repeat; - background-size: 100% 100%; - .encoded-svg-background(""); - } - } - - .theme-colors { - .item-inner { - display: inline-block; - overflow: visible; - } - } - - .standart-colors, .dynamic-colors { - .item-inner { - overflow: visible; - } - } - - &.list-block:last-child li:last-child a { - border-radius: 0; - } - -} - -.custom-colors { - display: flex; - justify-content: space-around; - align-items: center; - margin: 15px; - &.phone { - max-width: 300px; - margin: 0 auto; - margin-top: 4px; - .button-round { - margin-top: 20px; - } - } - .right-block { - margin-left: 20px; - } - .button-round { - height: 72px; - width: 72px; - padding: 0; - display: flex; - justify-content: center; - align-items: center; - border-radius: 100px; - background-color: @brandColor; - box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); - border-color: transparent; - margin-top: 25px; - &.active-state { - background-color: rgba(0, 0, 0, 0.1); - } - } - .color-hsb-preview { - width: 72px; - height: 72px; - border-radius: 100px; - overflow: hidden; - border: 1px solid #ededed; - } - .new-color-hsb-preview { - width: 100%; - height: 36px; - } - .current-color-hsb-preview { - width: 100%; - height: 36px; - } - .list-block ul:before, .list-block ul:after { - content: none; - } - .list-block ul li { - border: 1px solid rgba(0, 0, 0, 0.3); - } - .color-picker-wheel { - position: relative; - width: 290px; - max-width: 100%; - height: auto; - font-size: 0; - - svg { - width: 100%; - height: auto; - } - - .color-picker-wheel-handle { - width: calc(100% / 6); - height: calc(100% / 6); - position: absolute; - box-sizing: border-box; - border: 2px solid #fff; - box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); - background: red; - border-radius: 50%; - left: 0; - top: 0; - } - - .color-picker-sb-spectrum { - background-color: #000; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, #000 100%), linear-gradient(to left, rgba(255, 255, 255, 0) 0%, #fff 100%); - position: relative; - width: 45%; - height: 45%; - left: 50%; - top: 50%; - transform: translate3d(-50%, -50%, 0); - position: absolute; - } - - .color-picker-sb-spectrum-handle { - width: 4px; - height: 4px; - position: absolute; - left: -2px; - top: -2px; - z-index: 1; - - &:after { - background-color: inherit; - content: ''; - position: absolute; - width: 16px; - height: 16px; - border: 1px solid #fff; - border-radius: 50%; - box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.5); - box-sizing: border-box; - left: 50%; - top: 50%; - transform: translate(-50%, -50%); - transition: 150ms; - transition-property: transform; - transform-origin: center; - } - - &.color-picker-sb-spectrum-handle-pressed:after { - transform: scale(1.5) translate(-33.333%, -33.333%); - } - } - } -} -#font-color-auto.active .color-auto { - box-shadow: 0 0 0 1px white, 0 0 0 4px @brandColor; - border-radius: 1px; -} diff --git a/apps/common/mobile/resources/less/material/_color-schema.less b/apps/common/mobile/resources/less/material/_color-schema.less deleted file mode 100644 index 2c4dc2449..000000000 --- a/apps/common/mobile/resources/less/material/_color-schema.less +++ /dev/null @@ -1,21 +0,0 @@ -.color-schemes-menu { - cursor: pointer; - display: block; - background-color: #fff; - .item-inner { - justify-content: flex-start; - } - .color-schema-block { - display: flex; - } - .color { - min-width: 26px; - min-height: 26px; - margin: 0 2px 0 0; - box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15) inset; - } - .text { - margin-left: 20px; - color: #212121; - } -} diff --git a/apps/common/mobile/resources/less/material/_container.less b/apps/common/mobile/resources/less/material/_container.less deleted file mode 100644 index 00f1877cd..000000000 --- a/apps/common/mobile/resources/less/material/_container.less +++ /dev/null @@ -1,77 +0,0 @@ -// Container - -.phone.android { - .container-edit, - .container-collaboration, - .container-filter { - - .page-content { - .list-block:first-child { - margin-top: -1px; - } - } - } -} - -.container-edit, -.container-add, -.container-settings, -.container-collaboration, -.container-filter { - &.popover { - width: 360px; - } -} - -.settings { - &.popup, - &.popover { - .list-block { - ul { - border-radius: 0; - background: #fff; - } - - &:first-child { - margin-top: 0; - - li:first-child a { - border-radius: 0; - } - } - } - - &, - .popover-inner { - > .content-block { - width: 100%; - height: 100%; - margin: 0; - padding: 0; - } - } - - .popover-view { - border-radius: 2px; - - > .pages { - border-radius: 2px; - } - } - } - - .categories { - width: 100%; - height: 100%; - margin: 0; - padding: 0; - - > .toolbar { - top: 0; - height: 100%; - } - } - .popover-inner { - height: 400px; - } -} \ No newline at end of file diff --git a/apps/common/mobile/resources/less/material/_contextmenu.less b/apps/common/mobile/resources/less/material/_contextmenu.less deleted file mode 100644 index 84e376cca..000000000 --- a/apps/common/mobile/resources/less/material/_contextmenu.less +++ /dev/null @@ -1,29 +0,0 @@ -// Context menu - -.document-menu { - width: auto; - line-height: 1 !important; - z-index: 12500; - - .popover-inner { - overflow: hidden; - } - - .list-block { - white-space: pre; - - ul { - height: 48px; - } - - li { - display: inline-block; - } - - .item-link { - html.phone & { - padding: 0 10px; - } - } - } -} \ No newline at end of file diff --git a/apps/common/mobile/resources/less/material/_dataview.less b/apps/common/mobile/resources/less/material/_dataview.less deleted file mode 100644 index fca18dbd7..000000000 --- a/apps/common/mobile/resources/less/material/_dataview.less +++ /dev/null @@ -1,32 +0,0 @@ -// Data view - -.dataview { - .row { - justify-content: space-around; - } - - ul { - padding: 0 10px; - list-style: none; - justify-content: space-around; - - li { - display: inline-block; - } - } - - .active { - position: relative; - z-index: 1; - - &::after { - content: ''; - position: absolute; - width: 22px; - height: 22px; - right: -5px; - bottom: -5px; - .encoded-svg-background(''); - } - } -} \ No newline at end of file diff --git a/apps/common/mobile/resources/less/material/_listview.less b/apps/common/mobile/resources/less/material/_listview.less deleted file mode 100644 index ba134cc39..000000000 --- a/apps/common/mobile/resources/less/material/_listview.less +++ /dev/null @@ -1,73 +0,0 @@ -// List extend - -.item-content{ - .item-after { - &.splitter { - label { - color: #000; - margin:0 5px; - line-height: 36px; - } - - .button { - min-width: 40px; - margin-left: 0; - } - } - - &.value { - display: block; - min-width: 50px; - color: @black; - margin-left: 10px; - text-align: right; - } - } - - &.buttons { - .item-inner { - padding-top: 0; - padding-bottom: 0; - - > .row { - width: 100%; - - .button { - flex: 1; - font-size: 17px; - margin-left: 5px; - - &:first-child { - margin-left: 0; - } - - &.active { - color: #fff; - background-color: @brandColor; - } - } - } - } - } - - .color-preview { - width: 30px; - height: 30px; - border-radius: 16px; - margin-top: -3px; - box-shadow: 0 0 0 1px rgba(0,0,0,0.15) inset; - } -} - -.item-link { - &.no-indicator { - .item-inner { - background-image: none; - padding-right: 16px; - } - } -} - -.popover .list-block:last-child li:last-child .buttons a { - border-radius: 3px; -} \ No newline at end of file diff --git a/apps/common/mobile/resources/less/material/comments.less b/apps/common/mobile/resources/less/material/comments.less index 98bd8ec3a..4b877c191 100644 --- a/apps/common/mobile/resources/less/material/comments.less +++ b/apps/common/mobile/resources/less/material/comments.less @@ -1,10 +1,6 @@ .device-android { .wrap-comment { height: calc(100% - 72px); - background-color: @background-tertiary; - .comment-date { - color: @text-secondary; - } } .add-comment-popup, .add-reply-popup, .add-comment-dialog, .add-reply-dialog { .wrap-textarea { diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index afed74a56..f49214895 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1616,6 +1616,12 @@ define([ this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this)); this.api.asc_registerCallback('asc_onConnectionStateChanged', _.bind(this.onUserConnection, this)); this.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(this.onDocumentModifiedChanged, this)); + + var value = Common.localStorage.getItem('de-settings-unit'); + value = (value!==null) ? parseInt(value) : (this.appOptions.customization && this.appOptions.customization.unit ? Common.Utils.Metric.c_MetricUnits[this.appOptions.customization.unit.toLocaleLowerCase()] : Common.Utils.Metric.getDefaultMetric()); + (value===undefined) && (value = Common.Utils.Metric.getDefaultMetric()); + Common.Utils.Metric.setCurrentMetric(value); + Common.Utils.InternalSettings.set("de-settings-unit", value); }, applyModeEditorElements: function() { @@ -1664,11 +1670,7 @@ define([ toolbarView.on('insertcontrol', _.bind(me.onInsertControl, me)); } - var value = Common.localStorage.getItem('de-settings-unit'); - value = (value!==null) ? parseInt(value) : (this.appOptions.customization && this.appOptions.customization.unit ? Common.Utils.Metric.c_MetricUnits[this.appOptions.customization.unit.toLocaleLowerCase()] : Common.Utils.Metric.getDefaultMetric()); - (value===undefined) && (value = Common.Utils.Metric.getDefaultMetric()); - Common.Utils.Metric.setCurrentMetric(value); - Common.Utils.InternalSettings.set("de-settings-unit", value); + var value = Common.Utils.InternalSettings.get("de-settings-unit"); me.api.asc_SetDocumentUnits((value==Common.Utils.Metric.c_MetricUnits.inch) ? Asc.c_oAscDocumentUnits.Inch : ((value==Common.Utils.Metric.c_MetricUnits.pt) ? Asc.c_oAscDocumentUnits.Point : Asc.c_oAscDocumentUnits.Millimeter)); value = Common.localStorage.itemExists('de-hidden-rulers') ? Common.localStorage.getBool('de-hidden-rulers') : (this.appOptions.customization && !!this.appOptions.customization.hideRulers); diff --git a/apps/documenteditor/main/app/view/ChartSettings.js b/apps/documenteditor/main/app/view/ChartSettings.js index b97bcb5b1..09b25f1fe 100644 --- a/apps/documenteditor/main/app/view/ChartSettings.js +++ b/apps/documenteditor/main/app/view/ChartSettings.js @@ -444,6 +444,8 @@ define([ }, onAddChartStylesPreview: function(styles){ + if (!this.cmbChartStyle) return; + var me = this; if (styles && styles.length>0){ var stylesStore = this.cmbChartStyle.menuPicker.store; diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index baf7de0e2..9d7e9f768 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -1147,33 +1147,47 @@ define([ '', '', '', + '', + '', + '', + '', '', '', // '', // '', // '', // '', - '', + '', '', '
', '', - '', + '', '', '
', '', - '', + '', '', '
', '', - '', - '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', '', '', '', '', '', - '', - '', + '', + '', '', '', '', @@ -1185,7 +1199,23 @@ define([ '', '', '', - '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', '', '
', '', @@ -1230,6 +1260,7 @@ define([ this.lblStatParagraphs = $markup.findById('#id-info-paragraphs'); this.lblStatSymbols = $markup.findById('#id-info-symbols'); this.lblStatSpaces = $markup.findById('#id-info-spaces'); + this.lblPageSize = $markup.findById('#id-info-pages-size'); // this.lblEditTime = $markup.find('#id-info-edittime'); // edited info @@ -1323,6 +1354,15 @@ define([ } }).on('keydown:before', keyDownBefore); + // pdf info + this.lblPageSize = $markup.findById('#id-info-page-size'); + this.lblPdfTitle = $markup.findById('#id-lbl-info-title'); + this.lblPdfSubject = $markup.findById('#id-lbl-info-subject'); + this.lblPdfAuthor = $markup.findById('#id-lbl-info-author'); + this.lblPdfVer = $markup.findById('#id-info-pdf-ver'); + this.lblPdfTagged = $markup.findById('#id-info-pdf-tagged'); + this.lblFastWV = $markup.findById('#id-info-fast-wv'); + this.btnApply = new Common.UI.Button({ el: $markup.findById('#fminfo-btn-apply') }); @@ -1399,10 +1439,16 @@ define([ this._ShowHideDocInfo(false); $('tr.divider.general', this.el)[visible?'show':'hide'](); + var pdfProps = (this.api) ? this.api.asc_getPdfProps() : null; var appname = (this.api) ? this.api.asc_getAppProps() : null; if (appname) { + $('.pdf-info', this.el).hide(); appname = (appname.asc_getApplication() || '') + (appname.asc_getAppVersion() ? ' ' : '') + (appname.asc_getAppVersion() || ''); this.lblApplication.text(appname); + } else if (pdfProps) { + $('.docx-info', this.el).hide(); + appname = pdfProps ? pdfProps.Producer || '' : ''; + this.lblApplication.text(appname); } this._ShowHideInfoItem(this.lblApplication, !!appname); @@ -1412,7 +1458,8 @@ define([ if (value) this.lblDate.text(value.toLocaleString(this.mode.lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(this.mode.lang, {timeStyle: 'short'})); this._ShowHideInfoItem(this.lblDate, !!value); - } + } else if (pdfProps) + this.updatePdfInfo(pdfProps); }, updateFileInfo: function() { @@ -1424,14 +1471,6 @@ define([ value; this.coreProps = props; - // var app = (this.api) ? this.api.asc_getAppProps() : null; - // if (app) { - // value = app.asc_getTotalTime(); - // if (value) - // this.lblEditTime.text(value + ' ' + this.txtMinutes); - // } - // this._ShowHideInfoItem(this.lblEditTime, !!value); - if (props) { var visible = false; value = props.asc_getModified(); @@ -1466,6 +1505,82 @@ define([ this.SetDisabled(); }, + updatePdfInfo: function(props) { + if (!this.rendered) + return; + + var me = this, + value; + + if (props) { + value = props.CreationDate; + if (value) { + value = new Date(value); + this.lblDate.text(value.toLocaleString(this.mode.lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(this.mode.lang, {timeStyle: 'short'})); + } + this._ShowHideInfoItem(this.lblDate, !!value); + + var visible = false; + value = props.ModDate; + if (value) { + value = new Date(value); + this.lblModifyDate.text(value.toLocaleString(this.mode.lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(this.mode.lang, {timeStyle: 'short'})); + } + visible = this._ShowHideInfoItem(this.lblModifyDate, !!value) || visible; + visible = this._ShowHideInfoItem(this.lblModifyBy, false) || visible; + $('tr.divider.modify', this.el)[visible?'show':'hide'](); + + if (props.PageWidth && props.PageHeight && (typeof props.PageWidth === 'number') && (typeof props.PageHeight === 'number')) { + var w = props.PageWidth, + h = props.PageHeight; + switch (Common.Utils.Metric.getCurrentMetric()) { + case Common.Utils.Metric.c_MetricUnits.cm: + w = parseFloat((w* 25.4 / 72000.).toFixed(2)); + h = parseFloat((h* 25.4 / 72000.).toFixed(2)); + break; + case Common.Utils.Metric.c_MetricUnits.pt: + w = parseFloat((w/100.).toFixed(2)); + h = parseFloat((h/100.).toFixed(2)); + break; + case Common.Utils.Metric.c_MetricUnits.inch: + w = parseFloat((w/7200.).toFixed(2)); + h = parseFloat((h/7200.).toFixed(2)); + break; + } + this.lblPageSize.text(w + ' ' + Common.Utils.Metric.getCurrentMetricName() + ' x ' + h + ' ' + Common.Utils.Metric.getCurrentMetricName()); + this._ShowHideInfoItem(this.lblPageSize, true); + } else + this._ShowHideInfoItem(this.lblPageSize, false); + + value = props.Title; + value && this.lblPdfTitle.text(value); + visible = this._ShowHideInfoItem(this.lblPdfTitle, !!value); + + value = props.Subject; + value && this.lblPdfSubject.text(value); + visible = this._ShowHideInfoItem(this.lblPdfSubject, !!value) || visible; + $('tr.divider.pdf-title', this.el)[visible?'show':'hide'](); + + value = props.Author; + value && this.lblPdfAuthor.text(value); + this._ShowHideInfoItem(this.lblPdfAuthor, !!value); + + value = props.Version; + value && this.lblPdfVer.text(value); + this._ShowHideInfoItem(this.lblPdfVer, !!value); + + value = props.Tagged; + if (value !== undefined) + this.lblPdfTagged.text(value===true ? this.txtYes : this.txtNo); + this._ShowHideInfoItem(this.lblPdfTagged, value !== undefined); + + value = props.FastWebView; + if (value !== undefined) + this.lblFastWV.text(value===true ? this.txtYes : this.txtNo); + this._ShowHideInfoItem(this.lblFastWV, value !== undefined); + } + }, + _ShowHideInfoItem: function(el, visible) { el.closest('tr')[visible?'show':'hide'](); return visible; @@ -1618,7 +1733,14 @@ define([ txtAddAuthor: 'Add Author', txtAddText: 'Add Text', txtMinutes: 'min', - okButtonText: 'Apply' + okButtonText: 'Apply', + txtPageSize: 'Page Size', + txtPdfVer: 'PDF Version', + txtPdfTagged: 'Tagged PDF', + txtFastWV: 'Fast Web View', + txtYes: 'Yes', + txtNo: 'No' + }, DE.Views.FileMenuPanels.DocumentInfo || {})); DE.Views.FileMenuPanels.DocumentRights = Common.UI.BaseView.extend(_.extend({ diff --git a/apps/documenteditor/main/app/view/TableSettings.js b/apps/documenteditor/main/app/view/TableSettings.js index 864408c8e..7b5b4bba1 100644 --- a/apps/documenteditor/main/app/view/TableSettings.js +++ b/apps/documenteditor/main/app/view/TableSettings.js @@ -794,9 +794,9 @@ define([ }); if (this._state.beginPreviewStyles) { this._state.beginPreviewStyles = false; - self.mnuTableTemplatePicker.store.reset(arr); + self.mnuTableTemplatePicker && self.mnuTableTemplatePicker.store.reset(arr); } else - self.mnuTableTemplatePicker.store.add(arr); + self.mnuTableTemplatePicker && self.mnuTableTemplatePicker.store.add(arr); !this._state.currentStyleFound && this.selectCurrentTableStyle(); }, diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 3d3506c65..63c6292e5 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -1710,6 +1710,12 @@ "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Title", "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Uploaded", "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Words", + "DE.Views.FileMenuPanels.DocumentInfo.txtPageSize": "Page Size", + "DE.Views.FileMenuPanels.DocumentInfo.txtPdfVer": "PDF Version", + "DE.Views.FileMenuPanels.DocumentInfo.txtPdfTagged": "Tagged PDF", + "DE.Views.FileMenuPanels.DocumentInfo.txtFastWV": "Fast Web View", + "DE.Views.FileMenuPanels.DocumentInfo.txtYes": "Yes", + "DE.Views.FileMenuPanels.DocumentInfo.txtNo": "No", "DE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Change access rights", "DE.Views.FileMenuPanels.DocumentRights.txtRights": "Persons who have rights", "DE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Warning", diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index dc6f715e5..177e058ec 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -224,7 +224,7 @@ "textBefore": "Before", "textBehind": "Behind Text", "textBorder": "Border", - "textBringToForeground": "Bring to foreground", + "textBringToForeground": "Bring to Foreground", "textBullets": "Bullets", "textBulletsAndNumbers": "Bullets & Numbers", "textCellMargins": "Cell Margins", diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx index c9ba77dfe..aa1f50825 100644 --- a/apps/documenteditor/mobile/src/controller/Main.jsx +++ b/apps/documenteditor/mobile/src/controller/Main.jsx @@ -283,10 +283,18 @@ class MainController extends Component { .then ( result => { window["flat_desine"] = true; const {t} = this.props; + let _translate = t('Main.SDK', {returnObjects:true}); + for (let item in _translate) { + if (_translate.hasOwnProperty(item)) { + const str = _translate[item]; + if (item[item.length-1]===' ' && str[str.length-1]!==' ') + _translate[item] += ' '; + } + } this.api = new Asc.asc_docs_api({ 'id-view' : 'editor_sdk', 'mobile' : true, - 'translate': t('Main.SDK', {returnObjects:true}) + 'translate': _translate }); Common.Notifications.trigger('engineCreated', this.api); diff --git a/apps/documenteditor/mobile/src/less/app-ios.less b/apps/documenteditor/mobile/src/less/app-ios.less index 0682ba596..e047609d5 100644 --- a/apps/documenteditor/mobile/src/less/app-ios.less +++ b/apps/documenteditor/mobile/src/less/app-ios.less @@ -60,27 +60,3 @@ } } -// Color Schemes - -.color-schemes-menu { - cursor: pointer; - display: block; - // background-color: #fff; - .item-inner { - justify-content: flex-start; - } - .color-schema-block { - display: flex; - } - .color { - min-width: 26px; - min-height: 26px; - margin: 0 2px 0 0; - box-shadow: 0 0 0 1px rgba(0,0,0,.15) inset; - } - .item-title { - margin-left: 20px; - // color: #212121; - } -} - diff --git a/apps/documenteditor/mobile/src/less/app-material.less b/apps/documenteditor/mobile/src/less/app-material.less index f40579d15..635b8d8e4 100644 --- a/apps/documenteditor/mobile/src/less/app-material.less +++ b/apps/documenteditor/mobile/src/less/app-material.less @@ -105,28 +105,4 @@ } } } -} - -// Color Schemes - -.color-schemes-menu { - cursor: pointer; - display: block; - // background-color: #fff; - .item-inner { - justify-content: flex-start; - } - .color-schema-block { - display: flex; - } - .color { - min-width: 26px; - min-height: 26px; - margin: 0 2px 0 0; - box-shadow: 0 0 0 1px rgba(0,0,0,.15) inset; - } - .item-title { - margin-left: 20px; - // color: #212121; - } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/src/less/app.less b/apps/documenteditor/mobile/src/less/app.less index a368b6bba..1e15ff13a 100644 --- a/apps/documenteditor/mobile/src/less/app.less +++ b/apps/documenteditor/mobile/src/less/app.less @@ -151,7 +151,7 @@ .table-styles .row div:not(:first-child) { margin: 2px auto 0px; } -.table-styles li, .table-styles .row div { +.table-styles .skeleton-list li, .table-styles .row div { padding: 0; } .table-styles .row .skeleton-list{ diff --git a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx index e6ba1a45d..f447cc90b 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx @@ -205,7 +205,7 @@ const PageStyle = props => { onRangeChanged={(value) => {props.onBorderSize(borderSizeTransform.sizeByIndex(value))}} > -
+
{stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)}
@@ -229,7 +229,7 @@ const PageStyle = props => { onRangeChanged={(value) => {props.onOpacity(value)}} >
-
+
{stateOpacity + ' %'}
diff --git a/apps/presentationeditor/main/app/controller/Animation.js b/apps/presentationeditor/main/app/controller/Animation.js index b9a423915..978ad6a0b 100644 --- a/apps/presentationeditor/main/app/controller/Animation.js +++ b/apps/presentationeditor/main/app/controller/Animation.js @@ -188,8 +188,6 @@ define([ }, addNewEffect: function (type, group, groupName, replace, parametr, preview) { - if (this._state.Effect == type && this._state.EffectGroup == group && replace) - parametr = this._state.EffectOption; var parameter = this.view.setMenuParameters(type, groupName, parametr); this.api.asc_AddAnimation(group, type, (parameter != undefined)?parameter:0, replace, preview); }, @@ -397,7 +395,6 @@ define([ } view.listEffects.selectRecord(item); view.listEffects.fillComboView(item, true, forceFill); - view.btnParameters.setIconCls('toolbar__icon icon ' + item.get('iconCls')); } else { store.remove(store.findWhere({isCustom: true})); // remove custom effects if (this._state.Effect==AscFormat.ANIM_PRESET_MULTIPLE) { // add and select "multiple" item @@ -410,7 +407,6 @@ define([ displayValue: view.textMultiple }), {at:1})); view.listEffects.menuPicker.deselectAll(); - view.btnParameters.setIconCls('toolbar__icon icon animation-none'); } else { // add custom effect to appropriate group if (group) { var items = store.where({group: group.get('id')}); @@ -425,11 +421,9 @@ define([ }), {at:index+1}); view.listEffects.selectRecord(item); view.listEffects.fillComboView(item, true, true); - view.btnParameters.setIconCls('toolbar__icon icon ' + item.get('iconCls')); } else { view.listEffects.fieldPicker.deselectAll(); view.listEffects.menuPicker.deselectAll(); - view.btnParameters.setIconCls('toolbar__icon icon animation-none'); } } } diff --git a/apps/presentationeditor/main/app/view/Animation.js b/apps/presentationeditor/main/app/view/Animation.js index 1f41b48af..0bd8be8c7 100644 --- a/apps/presentationeditor/main/app/view/Animation.js +++ b/apps/presentationeditor/main/app/view/Animation.js @@ -252,7 +252,7 @@ define([ this.btnParameters = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', caption: this.txtParameters, - iconCls: 'toolbar__icon icon animation-none', + iconCls: 'toolbar__icon icon animation-parameters', menu: new Common.UI.Menu({items: []}), lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.noAnimation, _set.noAnimationParam], dataHint: '1', diff --git a/apps/presentationeditor/main/app/view/ChartSettings.js b/apps/presentationeditor/main/app/view/ChartSettings.js index f5df0b4ec..b6475f081 100644 --- a/apps/presentationeditor/main/app/view/ChartSettings.js +++ b/apps/presentationeditor/main/app/view/ChartSettings.js @@ -385,6 +385,8 @@ define([ }, onAddChartStylesPreview: function(styles){ + if (!this.cmbChartStyle) return; + var me = this; if (styles && styles.length>0){ var stylesStore = this.cmbChartStyle.menuPicker.store; diff --git a/apps/presentationeditor/main/app/view/TableSettings.js b/apps/presentationeditor/main/app/view/TableSettings.js index 2c37f45ba..ca9a5424b 100644 --- a/apps/presentationeditor/main/app/view/TableSettings.js +++ b/apps/presentationeditor/main/app/view/TableSettings.js @@ -726,9 +726,9 @@ define([ }); if (this._state.beginPreviewStyles) { this._state.beginPreviewStyles = false; - self.mnuTableTemplatePicker.store.reset(arr); + self.mnuTableTemplatePicker && self.mnuTableTemplatePicker.store.reset(arr); } else - self.mnuTableTemplatePicker.store.add(arr); + self.mnuTableTemplatePicker && self.mnuTableTemplatePicker.store.add(arr); !this._state.currentStyleFound && this.selectCurrentTableStyle(); }, diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-bold-flash.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-bold-flash.png new file mode 100644 index 000000000..1661d69cc Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-bold-flash.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-bold-reveal.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-bold-reveal.png new file mode 100644 index 000000000..f4f279d14 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-bold-reveal.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-bold_flash.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-bold_flash.png deleted file mode 100644 index fdd8b6dea..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-bold_flash.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-bold_reveal.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-bold_reveal.png deleted file mode 100644 index 6e711bfbe..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-bold_reveal.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-brush-color.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-brush-color.png new file mode 100644 index 000000000..f90cd5554 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-brush-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-brush_color.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-brush_color.png deleted file mode 100644 index ac4452ce6..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-brush_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-color-pulse.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-color-pulse.png new file mode 100644 index 000000000..19e85bfdb Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-color-pulse.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-color_pulse.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-color_pulse.png deleted file mode 100644 index 014291545..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-color_pulse.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-complementary-color.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-complementary-color.png new file mode 100644 index 000000000..6af6f8453 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-complementary-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-complementary_color.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-complementary_color.png deleted file mode 100644 index cc92107e0..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-complementary_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-custom.png index 517917c84..7d8fbfbfd 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-custom.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-custom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-darken.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-darken.png index 0ee2cd51e..d20953096 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-darken.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-darken.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-desaturate.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-desaturate.png index 241f335d8..02fdfe12d 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-desaturate.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-desaturate.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-fill-color.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-fill-color.png new file mode 100644 index 000000000..4820ce96d Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-fill-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-fill_color.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-fill_color.png deleted file mode 100644 index 9e4d29317..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-fill_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-font-color.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-font-color.png new file mode 100644 index 000000000..f90cd5554 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-font-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-font_color.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-font_color.png deleted file mode 100644 index ac4452ce6..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-font_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-grow-or-shrink.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-grow-or-shrink.png new file mode 100644 index 000000000..9d1a63faf Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-grow-or-shrink.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-grow_or_Shrink.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-grow_or_Shrink.png deleted file mode 100644 index f345c4bed..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-grow_or_Shrink.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-lighten.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-lighten.png index 1122a0005..f031a4b11 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-lighten.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-lighten.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-line-color.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-line-color.png new file mode 100644 index 000000000..e3ffb6f62 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-line-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-line_color.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-line_color.png deleted file mode 100644 index 40346b95a..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-line_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-object-color.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-object-color.png new file mode 100644 index 000000000..4820ce96d Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-object-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-object_color.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-object_color.png deleted file mode 100644 index 9e4d29317..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-object_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-pulse.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-pulse.png index 71f7fe457..9924c5979 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-pulse.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-pulse.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-spin.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-spin.png index 49dc965f0..d4de6597d 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-spin.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-spin.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-teeter.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-teeter.png index 4125f719c..18cfe38f2 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-teeter.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-teeter.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-transparency.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-transparency.png index da2a484b7..8c9a03d0a 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-transparency.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-transparency.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-underline.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-underline.png index 8c43e2911..ba320cec3 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-underline.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-underline.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-wave.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-wave.png index 8322c2ddf..ff8d7c729 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-wave.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-emphasis-wave.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-appear.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-appear.png index 16f77543b..7380f3293 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-appear.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-appear.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-bounce.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-bounce.png index a220fec9e..aae1ef783 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-bounce.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-bounce.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-custom.png index 88d647a98..a19f6a417 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-custom.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-custom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-fade.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-fade.png index 814b52776..550684904 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-fade.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-fade.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-float-in.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-float-in.png new file mode 100644 index 000000000..386cb3628 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-float-in.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-float_in.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-float_in.png deleted file mode 100644 index 4e0237c3c..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-float_in.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-fly-in.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-fly-in.png new file mode 100644 index 000000000..a67a05545 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-fly-in.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-fly_in.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-fly_in.png deleted file mode 100644 index 83d3b729d..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-fly_in.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-grow-turn.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-grow-turn.png new file mode 100644 index 000000000..4000f1892 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-grow-turn.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-grow_turn.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-grow_turn.png deleted file mode 100644 index 150d79ef8..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-grow_turn.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-random-bars.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-random-bars.png new file mode 100644 index 000000000..df26b62c3 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-random-bars.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-random_bars.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-random_bars.png deleted file mode 100644 index 3054a7732..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-random_bars.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-shape.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-shape.png index 905ae5a58..3918f7e52 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-shape.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-shape.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-split.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-split.png index 89d69e5e8..6d26b297c 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-split.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-split.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-swivel.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-swivel.png index 20df5dee7..4d1304b00 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-swivel.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-swivel.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-wheel.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-wheel.png index bbed44d32..b4d3bc131 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-wheel.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-wheel.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-wipe.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-wipe.png index 64f772cfc..5558c953f 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-wipe.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-wipe.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-zoom.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-zoom.png index 4ead28596..a8a981de8 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-zoom.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-entrance-zoom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-Disappear.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-Disappear.png index 220154386..d3a41820a 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-Disappear.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-Disappear.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-bounce.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-bounce.png index dc1cd0b79..75cb5765d 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-bounce.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-bounce.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-custom.png index 7f4467c04..627c3b62e 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-custom.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-custom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-fade.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-fade.png index f87c0b501..4f4b22a33 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-fade.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-fade.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-float-out.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-float-out.png new file mode 100644 index 000000000..5fa43cd35 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-float-out.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-float_out.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-float_out.png deleted file mode 100644 index 1e4f00eae..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-float_out.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-fly-out.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-fly-out.png new file mode 100644 index 000000000..08278aa71 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-fly-out.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-fly_out.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-fly_out.png deleted file mode 100644 index dc2d134c5..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-fly_out.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-random-bars.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-random-bars.png new file mode 100644 index 000000000..18c038141 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-random-bars.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-random_bars.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-random_bars.png deleted file mode 100644 index 76f09f670..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-random_bars.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-shape.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-shape.png index a92b56500..acff016a8 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-shape.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-shape.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-shrink-turn.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-shrink-turn.png new file mode 100644 index 000000000..4c22a2836 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-shrink-turn.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-shrink_turn.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-shrink_turn.png deleted file mode 100644 index e087ecbec..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-shrink_turn.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-split.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-split.png index 2b49bec0d..f97234e46 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-split.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-split.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-swivel.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-swivel.png index e97559357..72e36d73b 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-swivel.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-swivel.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-wheel.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-wheel.png index 5cf7148b5..50a9b3d49 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-wheel.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-wheel.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-wipe.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-wipe.png index dc0f1d7c9..7bb424fd3 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-wipe.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-wipe.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-zoom.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-zoom.png index cb5452a8a..e6f60d673 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-zoom.png and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-exit-zoom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion-paths-arcs.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion-paths-arcs.png new file mode 100644 index 000000000..e3b53cc2b Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion-paths-arcs.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion-paths-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion-paths-custom.png new file mode 100644 index 000000000..095946dda Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion-paths-custom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion-paths-lines.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion-paths-lines.png new file mode 100644 index 000000000..25e0c3d83 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion-paths-lines.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion-paths-loops.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion-paths-loops.png new file mode 100644 index 000000000..176bf9500 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion-paths-loops.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion-paths-shapes.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion-paths-shapes.png new file mode 100644 index 000000000..c2b8eb146 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion-paths-shapes.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion-paths-turns.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion-paths-turns.png new file mode 100644 index 000000000..dd7e96c57 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion-paths-turns.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-arcs.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-arcs.png deleted file mode 100644 index 3309df749..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-arcs.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-custom.png deleted file mode 100644 index 0335e33d2..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-custom.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-custom_path.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-custom_path.png deleted file mode 100644 index 71a357a5a..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-custom_path.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-lines.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-lines.png deleted file mode 100644 index 7cc227f2c..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-lines.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-loops.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-loops.png deleted file mode 100644 index 2236b0c8b..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-loops.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-shapes.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-shapes.png deleted file mode 100644 index f35357224..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-shapes.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-turns.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-turns.png deleted file mode 100644 index 5df103fa5..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-motion_paths-turns.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-parameters.png b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-parameters.png new file mode 100644 index 000000000..012ed70fb Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.25x/big/animation-parameters.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/animation-repeat.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/animation-repeat.png index 5a4fd085b..45279de42 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/animation-repeat.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/animation-repeat.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-Object_color.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-Object_color.png deleted file mode 100644 index aba97471f..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-Object_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-bold-flash.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-bold-flash.png new file mode 100644 index 000000000..6d5e0b404 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-bold-flash.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-bold-reveal.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-bold-reveal.png new file mode 100644 index 000000000..5ad5fc992 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-bold-reveal.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-bold_flash.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-bold_flash.png deleted file mode 100644 index e94d445de..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-bold_flash.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-bold_reveal.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-bold_reveal.png deleted file mode 100644 index 49eec0414..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-bold_reveal.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-brush-color.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-brush-color.png new file mode 100644 index 000000000..a94935a96 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-brush-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-brush_color.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-brush_color.png deleted file mode 100644 index b4e79acb6..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-brush_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-color-pulse.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-color-pulse.png new file mode 100644 index 000000000..a758e6b98 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-color-pulse.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-color_pulse.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-color_pulse.png deleted file mode 100644 index 2f5de3519..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-color_pulse.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-complementary-color.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-complementary-color.png new file mode 100644 index 000000000..31da7ced8 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-complementary-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-complementary_color.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-complementary_color.png deleted file mode 100644 index 6c7b58a12..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-complementary_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-custom.png index 6f512969d..20e36a75f 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-custom.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-custom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-darken.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-darken.png index c5c0bebb7..1a6919dd3 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-darken.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-darken.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-desaturate.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-desaturate.png index d73a75ff5..903b7f546 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-desaturate.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-desaturate.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-fill-color.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-fill-color.png new file mode 100644 index 000000000..3ef065a90 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-fill-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-fill_color.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-fill_color.png deleted file mode 100644 index aba97471f..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-fill_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-font-color.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-font-color.png new file mode 100644 index 000000000..f38057460 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-font-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-font_color.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-font_color.png deleted file mode 100644 index b11b438ba..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-font_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-grow-or-shrink.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-grow-or-shrink.png new file mode 100644 index 000000000..3129a3b3f Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-grow-or-shrink.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-grow_or_Shrink.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-grow_or_Shrink.png deleted file mode 100644 index 73547b6e4..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-grow_or_Shrink.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-lighten.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-lighten.png index aa6732f6f..8a36340f7 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-lighten.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-lighten.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-line-color.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-line-color.png new file mode 100644 index 000000000..e304aec98 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-line-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-line_color.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-line_color.png deleted file mode 100644 index 8fcc97b49..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-line_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-object-color.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-object-color.png new file mode 100644 index 000000000..3ef065a90 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-object-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-pulse.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-pulse.png index 64f2ac8d2..b7f86f33f 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-pulse.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-pulse.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-spin.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-spin.png index 75160ae0a..c91a615d1 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-spin.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-spin.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-teeter.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-teeter.png index 86c908475..887eb38d1 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-teeter.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-teeter.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-transparency.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-transparency.png index 12d0d8ca6..cd85ce8ed 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-transparency.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-transparency.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-underline.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-underline.png index 16bacfd24..251e74ecf 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-underline.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-underline.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-wave.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-wave.png index 292ab5a43..7500994f8 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-wave.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-emphasis-wave.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-appear.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-appear.png index f6292c1a0..bc0aa7dc2 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-appear.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-appear.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-bounce.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-bounce.png index 0460d4901..8f96e56d1 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-bounce.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-bounce.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-custom.png index 56f92ac8a..aaf8ff19b 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-custom.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-custom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-fade.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-fade.png index 5e171baa6..384dfc9c3 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-fade.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-fade.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-float-in.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-float-in.png new file mode 100644 index 000000000..3c5794639 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-float-in.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-float_in.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-float_in.png deleted file mode 100644 index 0ed022b46..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-float_in.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-fly-in.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-fly-in.png new file mode 100644 index 000000000..19772aa74 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-fly-in.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-fly_in.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-fly_in.png deleted file mode 100644 index 942f34bee..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-fly_in.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-grow-turn.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-grow-turn.png new file mode 100644 index 000000000..29d6f6070 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-grow-turn.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-grow_turn.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-grow_turn.png deleted file mode 100644 index 28ab8900b..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-grow_turn.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-random-bars.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-random-bars.png new file mode 100644 index 000000000..489050c2d Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-random-bars.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-random_bars.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-random_bars.png deleted file mode 100644 index 853c9d33b..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-random_bars.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-shape.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-shape.png index 1fdcfa8b0..1a61721a0 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-shape.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-shape.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-split.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-split.png index ee636936a..a578f0dab 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-split.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-split.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-swivel.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-swivel.png index bd2276119..ad692588e 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-swivel.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-swivel.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-wheel.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-wheel.png index 7b82b6e74..714cace71 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-wheel.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-wheel.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-wipe.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-wipe.png index 09a5f3a43..b1b045630 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-wipe.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-wipe.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-zoom.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-zoom.png index 3ba5cb829..bc6ce9dc7 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-zoom.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-entrance-zoom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-Random_bars.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-Random_bars.png deleted file mode 100644 index 10376043f..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-Random_bars.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-Wheel.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-Wheel.png index 11a5eeb19..e87954643 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-Wheel.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-Wheel.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-bounce.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-bounce.png index a03091e39..434ebc5e4 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-bounce.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-bounce.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-custom.png index aa140ec68..f5064dba5 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-custom.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-custom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-disappear.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-disappear.png index e0b076703..a8888d7a9 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-disappear.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-disappear.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-fade.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-fade.png index fb1361853..fedd10162 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-fade.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-fade.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-float-out.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-float-out.png new file mode 100644 index 000000000..1a42dfc54 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-float-out.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-float_out.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-float_out.png deleted file mode 100644 index 9a671569d..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-float_out.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-fly-out.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-fly-out.png new file mode 100644 index 000000000..c5cf6b7df Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-fly-out.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-fly_out.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-fly_out.png deleted file mode 100644 index a86625685..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-fly_out.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-random-bars.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-random-bars.png new file mode 100644 index 000000000..80478e1a4 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-random-bars.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-shape.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-shape.png index 887118035..b2c76f787 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-shape.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-shape.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-shrink-turn.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-shrink-turn.png new file mode 100644 index 000000000..e627962be Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-shrink-turn.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-shrink_turn.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-shrink_turn.png deleted file mode 100644 index fc7418ed6..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-shrink_turn.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-split.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-split.png index 400c90623..a4024008c 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-split.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-split.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-swivel.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-swivel.png index 5d4f99966..2085492c4 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-swivel.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-swivel.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-wipe.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-wipe.png index 84b3f6e87..8658bf138 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-wipe.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-wipe.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-zoom.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-zoom.png index 3653dbee5..d1ae67d53 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-zoom.png and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-exit-zoom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion-paths-arcs.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion-paths-arcs.png new file mode 100644 index 000000000..1cff6d30f Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion-paths-arcs.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion-paths-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion-paths-custom.png new file mode 100644 index 000000000..9d20d4d49 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion-paths-custom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion-paths-lines.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion-paths-lines.png new file mode 100644 index 000000000..8c325a801 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion-paths-lines.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion-paths-loops.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion-paths-loops.png new file mode 100644 index 000000000..680420fed Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion-paths-loops.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion-paths-shapes.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion-paths-shapes.png new file mode 100644 index 000000000..c6f6e7abd Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion-paths-shapes.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion-paths-turns.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion-paths-turns.png new file mode 100644 index 000000000..004999469 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion-paths-turns.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-arcs.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-arcs.png deleted file mode 100644 index 4302636cf..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-arcs.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-custom.png deleted file mode 100644 index 3f6e01ca5..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-custom.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-custom_path.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-custom_path.png deleted file mode 100644 index a19c8a7d0..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-custom_path.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-lines.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-lines.png deleted file mode 100644 index 791db55b7..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-lines.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-loops.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-loops.png deleted file mode 100644 index 4c5520b0d..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-loops.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-shapes.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-shapes.png deleted file mode 100644 index 640c998c1..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-shapes.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-turns.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-turns.png deleted file mode 100644 index bb30c231c..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-motion_paths-turns.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-parameters.png b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-parameters.png new file mode 100644 index 000000000..0d542389f Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.5x/big/animation-parameters.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-bold-flash.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-bold-flash.png new file mode 100644 index 000000000..7900e65cc Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-bold-flash.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-bold-reveal.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-bold-reveal.png new file mode 100644 index 000000000..8298a81f1 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-bold-reveal.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-bold_flash.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-bold_flash.png deleted file mode 100644 index 0d25ec681..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-bold_flash.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-bold_reveal.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-bold_reveal.png deleted file mode 100644 index b0d13fe32..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-bold_reveal.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-brush-color.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-brush-color.png new file mode 100644 index 000000000..613148282 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-brush-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-brush_color.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-brush_color.png deleted file mode 100644 index 045cf1287..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-brush_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-color-pulse.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-color-pulse.png new file mode 100644 index 000000000..aa3ae81d4 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-color-pulse.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-color_pulse.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-color_pulse.png deleted file mode 100644 index 6be0c7407..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-color_pulse.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-complementary-color.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-complementary-color.png new file mode 100644 index 000000000..d5e96da35 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-complementary-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-complementary_color.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-complementary_color.png deleted file mode 100644 index 83d7566c3..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-complementary_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-custom.png index be1322f05..54ce7893a 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-custom.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-custom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-darken.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-darken.png index 87c570af7..15e0f7637 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-darken.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-darken.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-desaturate.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-desaturate.png index 6a6368560..31bdfb206 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-desaturate.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-desaturate.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-fill-color.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-fill-color.png new file mode 100644 index 000000000..efca753ef Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-fill-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-fill_color.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-fill_color.png deleted file mode 100644 index f09eebb49..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-fill_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-font-color.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-font-color.png new file mode 100644 index 000000000..577d709ea Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-font-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-font_color.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-font_color.png deleted file mode 100644 index 3cb3ddf76..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-font_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-grow-or-shrink.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-grow-or-shrink.png new file mode 100644 index 000000000..d05f3d591 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-grow-or-shrink.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-grow_or_Shrink.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-grow_or_Shrink.png deleted file mode 100644 index 8f01e1ece..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-grow_or_Shrink.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-lighten.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-lighten.png index 0e4989bd9..c754e721a 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-lighten.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-lighten.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-line-color.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-line-color.png new file mode 100644 index 000000000..f8e781d4c Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-line-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-line_color.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-line_color.png deleted file mode 100644 index 65403b538..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-line_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-object-color.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-object-color.png new file mode 100644 index 000000000..efca753ef Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-object-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-object_color.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-object_color.png deleted file mode 100644 index f09eebb49..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-object_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-pulse.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-pulse.png index f8f38d85b..6b354a856 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-pulse.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-pulse.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-spin.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-spin.png index ee6b34bfe..4821b2609 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-spin.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-spin.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-teeter.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-teeter.png index aeaf2fba1..5d738e97b 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-teeter.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-teeter.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-transparency.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-transparency.png index 781c8e546..ea3aa7c3f 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-transparency.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-transparency.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-underline.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-underline.png index bc040c82c..c13aea661 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-underline.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-underline.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-wave.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-wave.png index c6d17fa11..e5dea6750 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-wave.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-emphasis-wave.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-appear.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-appear.png index 150f33a5e..b7c62c6bc 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-appear.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-appear.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-bounce.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-bounce.png index ba01b90fd..73ad31292 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-bounce.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-bounce.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-custom.png index 931b04d75..a3be4edce 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-custom.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-custom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-fade.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-fade.png index 05c6a287e..fd7039d6d 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-fade.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-fade.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-float-in.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-float-in.png new file mode 100644 index 000000000..2831b5aca Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-float-in.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-float_in.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-float_in.png deleted file mode 100644 index 1dd2a4c70..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-float_in.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-fly-in.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-fly-in.png new file mode 100644 index 000000000..ebcb19973 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-fly-in.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-fly_in.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-fly_in.png deleted file mode 100644 index b294880e6..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-fly_in.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-grow-turn.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-grow-turn.png new file mode 100644 index 000000000..3a08b91fc Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-grow-turn.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-grow_turn.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-grow_turn.png deleted file mode 100644 index 93332f3a8..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-grow_turn.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-random-bars.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-random-bars.png new file mode 100644 index 000000000..367fad721 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-random-bars.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-random_bars.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-random_bars.png deleted file mode 100644 index 35450c4cc..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-random_bars.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-shape.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-shape.png index 79ed210c3..fd84baf0a 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-shape.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-shape.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-split.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-split.png index 5010b14d7..d1fd22b49 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-split.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-split.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-swivel.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-swivel.png index 60b45b73c..20b97bdde 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-swivel.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-swivel.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-wheel.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-wheel.png index 864f6c8fa..37d4e07a0 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-wheel.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-wheel.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-wipe.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-wipe.png index 3321bef22..e111af11c 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-wipe.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-wipe.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-zoom.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-zoom.png index e4c9a21ab..d4709de59 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-zoom.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-entrance-zoom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-bounce.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-bounce.png index 95338b363..148afb4a8 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-bounce.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-bounce.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-custom.png index 1c094cb90..760e09c83 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-custom.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-custom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-disappear.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-disappear.png index c271db9a0..5f604709f 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-disappear.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-disappear.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-fade.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-fade.png index d5523bac6..85987ccf5 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-fade.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-fade.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-float-out.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-float-out.png new file mode 100644 index 000000000..dc891a52e Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-float-out.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-float_out.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-float_out.png deleted file mode 100644 index aa9f14e48..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-float_out.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-fly-out.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-fly-out.png new file mode 100644 index 000000000..910838cd4 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-fly-out.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-fly_out.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-fly_out.png deleted file mode 100644 index 5c1b21bf0..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-fly_out.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-random-bars.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-random-bars.png new file mode 100644 index 000000000..73b450df9 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-random-bars.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-random_bars.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-random_bars.png deleted file mode 100644 index edbf2c7a0..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-random_bars.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-shape.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-shape.png index fd6e239fb..087ae87cb 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-shape.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-shape.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-shrink-turn.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-shrink-turn.png new file mode 100644 index 000000000..2e5c720c9 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-shrink-turn.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-shrink_turn.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-shrink_turn.png deleted file mode 100644 index 97d53daf5..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-shrink_turn.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-split.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-split.png index fb78c49e5..dc2ef613d 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-split.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-split.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-swivel.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-swivel.png index 9f34192de..c78da440e 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-swivel.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-swivel.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-wheel.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-wheel.png index d7486c56c..d90be1981 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-wheel.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-wheel.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-wipe.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-wipe.png index ebb9e6d40..0bbdb0e35 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-wipe.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-wipe.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-zoom.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-zoom.png index a50b43199..0c8073238 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-zoom.png and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-exit-zoom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion-paths-arcs.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion-paths-arcs.png new file mode 100644 index 000000000..9758f0e88 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion-paths-arcs.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion-paths-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion-paths-custom.png new file mode 100644 index 000000000..ebe7918cf Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion-paths-custom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion-paths-lines.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion-paths-lines.png new file mode 100644 index 000000000..d3d7fe737 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion-paths-lines.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion-paths-loops.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion-paths-loops.png new file mode 100644 index 000000000..5ea24f450 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion-paths-loops.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion-paths-shapes.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion-paths-shapes.png new file mode 100644 index 000000000..3b47a4b7f Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion-paths-shapes.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion-paths-turns.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion-paths-turns.png new file mode 100644 index 000000000..6584b3f18 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion-paths-turns.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-arcs.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-arcs.png deleted file mode 100644 index 118a0408c..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-arcs.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-custom.png deleted file mode 100644 index 3395d28bd..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-custom.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-custom_path.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-custom_path.png deleted file mode 100644 index fbf7296d3..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-custom_path.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-lines.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-lines.png deleted file mode 100644 index 80f5dc6c8..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-lines.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-loops.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-loops.png deleted file mode 100644 index d48cbd04b..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-loops.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-shapes.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-shapes.png deleted file mode 100644 index 9c2a48897..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-shapes.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-turns.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-turns.png deleted file mode 100644 index 6597eb4ef..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-motion_paths-turns.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-parameters.png b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-parameters.png new file mode 100644 index 000000000..90f978d89 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1.75x/big/animation-parameters.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-bold-flash.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-bold-flash.png new file mode 100644 index 000000000..a82e90985 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-bold-flash.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-bold-reveal.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-bold-reveal.png new file mode 100644 index 000000000..987286573 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-bold-reveal.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-bold_flash.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-bold_flash.png deleted file mode 100644 index 17fef551f..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-bold_flash.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-bold_reveal.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-bold_reveal.png deleted file mode 100644 index 761833948..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-bold_reveal.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-brush-color.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-brush-color.png new file mode 100644 index 000000000..9b605bc4d Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-brush-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-brush_color.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-brush_color.png deleted file mode 100644 index c3e64a40c..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-brush_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-color-pulse.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-color-pulse.png new file mode 100644 index 000000000..83723fb5d Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-color-pulse.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-color_pulse.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-color_pulse.png deleted file mode 100644 index b78035213..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-color_pulse.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-complementary-color.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-complementary-color.png new file mode 100644 index 000000000..2bb6d0761 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-complementary-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-complementary_color.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-complementary_color.png deleted file mode 100644 index 051d24705..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-complementary_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-custom.png index a87408d49..ead8797a0 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-custom.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-custom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-darken.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-darken.png index 4cd0ecd6d..50dd779d8 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-darken.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-darken.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-desaturate.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-desaturate.png index f1503b43c..d689f83cf 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-desaturate.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-desaturate.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-fill-color.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-fill-color.png new file mode 100644 index 000000000..e2732b03a Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-fill-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-fill_color.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-fill_color.png deleted file mode 100644 index 16cc9aeb0..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-fill_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-font-color.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-font-color.png new file mode 100644 index 000000000..04c7607bc Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-font-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-font_color.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-font_color.png deleted file mode 100644 index 4ea6d89b7..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-font_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-grow-or-shrink.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-grow-or-shrink.png new file mode 100644 index 000000000..079253c73 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-grow-or-shrink.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-grow_or_Shrink.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-grow_or_Shrink.png deleted file mode 100644 index fb9357a63..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-grow_or_Shrink.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-lighten.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-lighten.png index 746873743..69da3c3ac 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-lighten.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-lighten.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-line-color.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-line-color.png new file mode 100644 index 000000000..dc010eff6 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-line-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-line_color.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-line_color.png deleted file mode 100644 index 9bb684382..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-line_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-object-color.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-object-color.png new file mode 100644 index 000000000..e2732b03a Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-object-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-object_color.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-object_color.png deleted file mode 100644 index 16cc9aeb0..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-object_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-pulse.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-pulse.png index 545c7818f..00206b3eb 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-pulse.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-pulse.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-spin.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-spin.png index dc61e2a22..5e8dd88a3 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-spin.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-spin.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-teeter.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-teeter.png index cd96004a5..6ebfa6fd8 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-teeter.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-teeter.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-transparency.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-transparency.png index 3d70161fd..5e2e9214c 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-transparency.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-transparency.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-underline.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-underline.png index cdd015975..da799f1a5 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-underline.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-underline.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-wave.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-wave.png index be960de02..be93b1889 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-wave.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-emphasis-wave.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-appear.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-appear.png index 09ef9408f..c2bd64e06 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-appear.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-appear.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-bounce.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-bounce.png index 5abafeaa5..cf5040b08 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-bounce.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-bounce.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-custom.png index 9eb8a1a1c..34282ffe3 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-custom.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-custom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-fade.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-fade.png index 97c1ba397..cbb314eb4 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-fade.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-fade.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-float-in.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-float-in.png new file mode 100644 index 000000000..3f6fc053d Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-float-in.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-float_in.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-float_in.png deleted file mode 100644 index e3eb38415..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-float_in.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-fly-in.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-fly-in.png new file mode 100644 index 000000000..5ad49773f Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-fly-in.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-fly_in.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-fly_in.png deleted file mode 100644 index 73ae2e230..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-fly_in.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-grow-turn.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-grow-turn.png new file mode 100644 index 000000000..9fa0d4618 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-grow-turn.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-grow_turn.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-grow_turn.png deleted file mode 100644 index 8b383dab4..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-grow_turn.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-random-bars.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-random-bars.png new file mode 100644 index 000000000..afb0289af Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-random-bars.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-random_bars.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-random_bars.png deleted file mode 100644 index b4879f4a5..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-random_bars.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-shape.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-shape.png index b6fbb5f06..d9ef515f1 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-shape.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-shape.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-split.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-split.png index d200cf625..2585a6d4b 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-split.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-split.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-swivel.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-swivel.png index 821d48e11..d72167438 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-swivel.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-swivel.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-wheel.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-wheel.png index b44d75f0e..220d5f03c 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-wheel.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-wheel.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-wipe.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-wipe.png index 6e1196cb0..79287c827 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-wipe.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-wipe.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-zoom.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-zoom.png index 991ce0be2..5ab173dcf 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-zoom.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-entrance-zoom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-bounce.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-bounce.png index d21abde2c..4f3cf0c4d 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-bounce.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-bounce.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-custom.png index 170583fac..eee41d9a8 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-custom.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-custom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-disappear.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-disappear.png index 1496defc2..bf189e002 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-disappear.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-disappear.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-fade.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-fade.png index ef186ea66..b5c676783 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-fade.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-fade.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-float-out.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-float-out.png new file mode 100644 index 000000000..2d3bf461c Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-float-out.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-float_out.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-float_out.png deleted file mode 100644 index e041cf5d8..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-float_out.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-fly-out.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-fly-out.png new file mode 100644 index 000000000..f51abc456 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-fly-out.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-fly_out.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-fly_out.png deleted file mode 100644 index e57178dc7..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-fly_out.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-random-bars.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-random-bars.png new file mode 100644 index 000000000..7ab055808 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-random-bars.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-random_bars.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-random_bars.png deleted file mode 100644 index 8086ad434..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-random_bars.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-shape.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-shape.png index 01f5bf5fb..f3dafd78a 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-shape.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-shape.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-shrink-turn.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-shrink-turn.png new file mode 100644 index 000000000..b4bd6ef95 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-shrink-turn.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-shrink_turn.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-shrink_turn.png deleted file mode 100644 index a8bb27739..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-shrink_turn.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-split.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-split.png index f17ad742a..d8ead95a6 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-split.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-split.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-swivel.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-swivel.png index 4008bfd16..01dd604c2 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-swivel.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-swivel.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-wheel.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-wheel.png index 8fe9db2ac..140707e4a 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-wheel.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-wheel.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-wipe.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-wipe.png index 319a25fc7..bcc4df4c1 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-wipe.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-wipe.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-zoom.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-zoom.png index 8b325f318..6b70abaa0 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-zoom.png and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-exit-zoom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion-paths-arcs.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion-paths-arcs.png new file mode 100644 index 000000000..ab0c2e086 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion-paths-arcs.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion-paths-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion-paths-custom.png new file mode 100644 index 000000000..8b51acacf Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion-paths-custom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion-paths-lines.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion-paths-lines.png new file mode 100644 index 000000000..158d833b2 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion-paths-lines.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion-paths-loops.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion-paths-loops.png new file mode 100644 index 000000000..2bcbbf89f Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion-paths-loops.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion-paths-shapes.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion-paths-shapes.png new file mode 100644 index 000000000..f12946cad Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion-paths-shapes.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion-paths-turns.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion-paths-turns.png new file mode 100644 index 000000000..3a60e9dc3 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion-paths-turns.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-arcs.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-arcs.png deleted file mode 100644 index a2436402f..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-arcs.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-custom.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-custom.png deleted file mode 100644 index b680cfb1d..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-custom.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-custom_path.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-custom_path.png deleted file mode 100644 index 5bc90dcd6..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-custom_path.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-lines.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-lines.png deleted file mode 100644 index e6028fdcd..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-lines.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-loops.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-loops.png deleted file mode 100644 index 141dcb1db..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-loops.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-shapes.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-shapes.png deleted file mode 100644 index ddc3b4ae2..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-shapes.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-turns.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-turns.png deleted file mode 100644 index 8f884a84f..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-motion_paths-turns.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-parameters.png b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-parameters.png new file mode 100644 index 000000000..fcc551b36 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/1x/big/animation-parameters.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-bold-flash.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-bold-flash.png new file mode 100644 index 000000000..70af5adef Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-bold-flash.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-bold-reveal.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-bold-reveal.png new file mode 100644 index 000000000..5edf0a2c9 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-bold-reveal.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-bold_flash.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-bold_flash.png deleted file mode 100644 index 567312289..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-bold_flash.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-bold_reveal.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-bold_reveal.png deleted file mode 100644 index 6a70cb5c0..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-bold_reveal.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-brush-color.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-brush-color.png new file mode 100644 index 000000000..032aa87ac Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-brush-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-brush_color.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-brush_color.png deleted file mode 100644 index ab78aaf14..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-brush_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-color-pulse.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-color-pulse.png new file mode 100644 index 000000000..a5e2a626b Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-color-pulse.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-color_pulse.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-color_pulse.png deleted file mode 100644 index efcbb0653..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-color_pulse.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-complementary-color.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-complementary-color.png new file mode 100644 index 000000000..8ef18eb43 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-complementary-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-complementary_color.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-complementary_color.png deleted file mode 100644 index 123be41bd..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-complementary_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-custom.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-custom.png index 6983151c2..dc77abe06 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-custom.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-custom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-darken.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-darken.png index bc9f725b4..7ef3d34c2 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-darken.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-darken.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-desaturate.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-desaturate.png index 2ca9348ee..b0bf992a6 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-desaturate.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-desaturate.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-fill-color.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-fill-color.png new file mode 100644 index 000000000..94b95ef4e Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-fill-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-fill_color.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-fill_color.png deleted file mode 100644 index a5d9a5110..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-fill_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-font-color.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-font-color.png new file mode 100644 index 000000000..c9d4cc959 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-font-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-font_color.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-font_color.png deleted file mode 100644 index 81beca421..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-font_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-grow-or-shrink.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-grow-or-shrink.png new file mode 100644 index 000000000..e361c7689 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-grow-or-shrink.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-grow_or_Shrink.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-grow_or_Shrink.png deleted file mode 100644 index 321a60eea..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-grow_or_Shrink.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-lighten.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-lighten.png index 61337bbb5..fe986ff52 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-lighten.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-lighten.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-line-color.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-line-color.png new file mode 100644 index 000000000..7faaa178c Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-line-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-line_color.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-line_color.png deleted file mode 100644 index cb62e2e51..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-line_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-object-color.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-object-color.png new file mode 100644 index 000000000..94b95ef4e Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-object-color.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-object_color.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-object_color.png deleted file mode 100644 index a5d9a5110..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-object_color.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-pulse.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-pulse.png index 751f5052f..86d103eba 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-pulse.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-pulse.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-spin.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-spin.png index 56efade1c..3494c1f3b 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-spin.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-spin.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-teeter.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-teeter.png index 4e1eb2393..6f013a6aa 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-teeter.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-teeter.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-transparency.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-transparency.png index 7ff65d1a9..e1b3b1e18 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-transparency.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-transparency.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-underline.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-underline.png index e95122f30..7d5f07b63 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-underline.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-underline.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-wave.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-wave.png index 2c2bc19a2..0a340c489 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-wave.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-emphasis-wave.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-appear.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-appear.png index 0589a8032..5defd8a91 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-appear.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-appear.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-bounce.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-bounce.png index 4f4fae04f..c56d99693 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-bounce.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-bounce.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-custom.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-custom.png index 5ab7170c8..c29b36fc0 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-custom.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-custom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-fade.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-fade.png index 669cabf4a..8bac5437f 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-fade.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-fade.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-float-in.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-float-in.png new file mode 100644 index 000000000..da1655a74 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-float-in.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-float_in.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-float_in.png deleted file mode 100644 index 06f71d58c..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-float_in.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-fly-in.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-fly-in.png new file mode 100644 index 000000000..ecaaec596 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-fly-in.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-fly_in.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-fly_in.png deleted file mode 100644 index 8306b210b..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-fly_in.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-grow-turn.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-grow-turn.png new file mode 100644 index 000000000..989a187a1 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-grow-turn.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-grow_turn.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-grow_turn.png deleted file mode 100644 index 4be198450..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-grow_turn.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-random-bars.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-random-bars.png new file mode 100644 index 000000000..bacda643d Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-random-bars.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-random_bars.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-random_bars.png deleted file mode 100644 index 3407cffb9..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-random_bars.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-shape.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-shape.png index 125665b2c..d5f381999 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-shape.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-shape.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-split.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-split.png index 5dca465b8..76972cb60 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-split.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-split.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-swivel.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-swivel.png index 0e2ee2e4e..9984ba85d 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-swivel.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-swivel.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-wheel.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-wheel.png index 12d8cd82a..ef7353c14 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-wheel.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-wheel.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-wipe.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-wipe.png index 7f3ead3d9..eebf34826 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-wipe.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-wipe.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-zoom.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-zoom.png index 3ffe376cf..f9bcd3908 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-zoom.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-entrance-zoom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-bounce.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-bounce.png index 874165655..28ad32071 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-bounce.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-bounce.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-custom.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-custom.png index e99d0939a..c700645ba 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-custom.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-custom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-disappear.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-disappear.png index b22cd2653..6c9cb24fd 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-disappear.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-disappear.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-fade.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-fade.png index f054474a4..addf61313 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-fade.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-fade.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-float-out.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-float-out.png new file mode 100644 index 000000000..b50058b82 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-float-out.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-float_out.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-float_out.png deleted file mode 100644 index 5d4f9ffe4..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-float_out.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-fly-out.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-fly-out.png new file mode 100644 index 000000000..8bc2b9752 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-fly-out.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-fly_out.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-fly_out.png deleted file mode 100644 index 181481801..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-fly_out.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-random-bars.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-random-bars.png new file mode 100644 index 000000000..aa54c18c8 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-random-bars.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-random_bars.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-random_bars.png deleted file mode 100644 index ed4f126de..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-random_bars.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-shape.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-shape.png index f534e24f8..159905ee0 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-shape.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-shape.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-shrink-turn.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-shrink-turn.png new file mode 100644 index 000000000..52d445e43 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-shrink-turn.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-shrink_turn.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-shrink_turn.png deleted file mode 100644 index c1100fd05..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-shrink_turn.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-split.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-split.png index 147e68388..6d9025d6f 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-split.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-split.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-swivel.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-swivel.png index f2a2b49ed..853eea150 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-swivel.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-swivel.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-wheel.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-wheel.png index bee0a1632..4f2a8e898 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-wheel.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-wheel.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-wipe.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-wipe.png index 8be127623..dfeb55d5f 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-wipe.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-wipe.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-zoom.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-zoom.png index 6b11cbe31..11341c141 100644 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-zoom.png and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-exit-zoom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion-paths-arcs.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion-paths-arcs.png new file mode 100644 index 000000000..358eb3f61 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion-paths-arcs.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion-paths-custom.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion-paths-custom.png new file mode 100644 index 000000000..19fa4a587 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion-paths-custom.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion-paths-lines.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion-paths-lines.png new file mode 100644 index 000000000..18f70a0b3 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion-paths-lines.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion-paths-loops.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion-paths-loops.png new file mode 100644 index 000000000..4f06b102f Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion-paths-loops.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion-paths-shapes.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion-paths-shapes.png new file mode 100644 index 000000000..653f155f2 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion-paths-shapes.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion-paths-turns.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion-paths-turns.png new file mode 100644 index 000000000..19fa04ae4 Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion-paths-turns.png differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-arcs.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-arcs.png deleted file mode 100644 index 5e58bd2fd..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-arcs.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-custom.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-custom.png deleted file mode 100644 index 73a6cc316..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-custom.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-custom_path.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-custom_path.png deleted file mode 100644 index 51f0a3dd8..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-custom_path.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-lines.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-lines.png deleted file mode 100644 index f330d1fb3..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-lines.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-loops.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-loops.png deleted file mode 100644 index c8488229e..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-loops.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-shapes.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-shapes.png deleted file mode 100644 index 24d40f76a..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-shapes.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-turns.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-turns.png deleted file mode 100644 index 3a092acad..000000000 Binary files a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-motion_paths-turns.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-parameters.png b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-parameters.png new file mode 100644 index 000000000..022f1c1db Binary files /dev/null and b/apps/presentationeditor/main/resources/img/toolbar/2x/big/animation-parameters.png differ diff --git a/apps/presentationeditor/mobile/src/less/app.less b/apps/presentationeditor/mobile/src/less/app.less index 960129624..ded0ee9f0 100644 --- a/apps/presentationeditor/mobile/src/less/app.less +++ b/apps/presentationeditor/mobile/src/less/app.less @@ -123,7 +123,7 @@ .table-styles .row div:not(:first-child) { margin: 2px auto 0px; } -.table-styles li, .table-styles .row div { +.table-styles .skeleton-list li, .table-styles .row div { padding: 0; } .table-styles .row .skeleton-list{ diff --git a/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx b/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx index bd41e6a97..b851120ac 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx @@ -162,7 +162,7 @@ const PageStyle = props => { onRangeChanged={(value) => {props.onBorderSize(borderSizeTransform.sizeByIndex(value))}} >
-
+
{stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)}
@@ -186,7 +186,7 @@ const PageStyle = props => { onRangeChanged={(value) => {props.onOpacity(value)}} >
-
+
{stateOpacity + ' %'}
diff --git a/apps/presentationeditor/mobile/src/view/settings/ApplicationSettings.jsx b/apps/presentationeditor/mobile/src/view/settings/ApplicationSettings.jsx index 9a929743d..2007144e9 100644 --- a/apps/presentationeditor/mobile/src/view/settings/ApplicationSettings.jsx +++ b/apps/presentationeditor/mobile/src/view/settings/ApplicationSettings.jsx @@ -37,8 +37,7 @@ const PageApplicationSettings = props => { onChange={() => changeMeasureSettings(2)}> - - {_t.textSpellcheck} + { store.changeSpellCheck(!isSpellChecking); diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 5f73b1bbd..8a94dc5fb 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -2515,13 +2515,15 @@ define([ } funcarr.sort(function (a,b) { var atype = a.asc_getType(), - btype = b.asc_getType(), - aname = a.asc_getName(true).toLocaleUpperCase(), - bname = b.asc_getName(true).toLocaleUpperCase(); + btype = b.asc_getType(); + if (atype===btype && (atype === Asc.c_oAscPopUpSelectorType.TableColumnName)) + return 0; if (atype === Asc.c_oAscPopUpSelectorType.TableThisRow) return -1; if (btype === Asc.c_oAscPopUpSelectorType.TableThisRow) return 1; if ((atype === Asc.c_oAscPopUpSelectorType.TableColumnName || btype === Asc.c_oAscPopUpSelectorType.TableColumnName) && atype !== btype) return atype === Asc.c_oAscPopUpSelectorType.TableColumnName ? -1 : 1; + var aname = a.asc_getName(true).toLocaleUpperCase(), + bname = b.asc_getName(true).toLocaleUpperCase(); if (aname < bname) return -1; if (aname > bname) return 1; return 0; diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettings.js b/apps/spreadsheeteditor/main/app/view/ChartSettings.js index f16ce0bf7..797194841 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettings.js @@ -1011,7 +1011,7 @@ define([ }, onAddChartStylesPreview: function(styles){ - if (this._isEditType) return; + if (this._isEditType || !this.cmbChartStyle) return; if (styles && styles.length>0){ var stylesStore = this.cmbChartStyle.menuPicker.store; diff --git a/apps/spreadsheeteditor/mobile/src/controller/CellEditor.jsx b/apps/spreadsheeteditor/mobile/src/controller/CellEditor.jsx index 1f99abb82..0b4dfc2ff 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/CellEditor.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/CellEditor.jsx @@ -47,14 +47,15 @@ const CellEditor = inject("storeFunctions")(observer(props => { if(funcArr) { funcArr.sort(function (a, b) { let atype = a.asc_getType(), - btype = b.asc_getType(), - aname = a.asc_getName(true).toLocaleUpperCase(), - bname = b.asc_getName(true).toLocaleUpperCase(); - + btype = b.asc_getType(); + if (atype===btype && (atype === Asc.c_oAscPopUpSelectorType.TableColumnName)) + return 0; if (atype === Asc.c_oAscPopUpSelectorType.TableThisRow) return -1; if (btype === Asc.c_oAscPopUpSelectorType.TableThisRow) return 1; if ((atype === Asc.c_oAscPopUpSelectorType.TableColumnName || btype === Asc.c_oAscPopUpSelectorType.TableColumnName) && atype !== btype) return atype === Asc.c_oAscPopUpSelectorType.TableColumnName ? -1 : 1; + let aname = a.asc_getName(true).toLocaleUpperCase(), + bname = b.asc_getName(true).toLocaleUpperCase(); if (aname < bname) return -1; if (aname > bname) return 1; diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx index a8cef2809..b20b26c0c 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx @@ -156,7 +156,7 @@ const PageStyle = props => { onRangeChanged={(value) => {props.onBorderSize(borderSizeTransform.sizeByIndex(value))}} >
-
+
{stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)}
@@ -180,7 +180,7 @@ const PageStyle = props => { onRangeChanged={(value) => {props.onOpacity(value)}} >
-
+
{stateOpacity + ' %'}
diff --git a/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx b/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx index 52e08bb5d..30a319d05 100644 --- a/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx @@ -65,8 +65,7 @@ const PageApplicationSettings = props => { } {_t.textCommentingDisplay} - - {_t.textComments} + { storeApplicationSettings.changeDisplayComments(!isComments); @@ -74,8 +73,7 @@ const PageApplicationSettings = props => { }} /> - - {_t.textResolvedComments} + { storeApplicationSettings.changeDisplayResolved(!isResolvedComments); @@ -85,8 +83,7 @@ const PageApplicationSettings = props => { - - {_t.textR1C1Style} + { storeApplicationSettings.changeRefStyle(!isRefStyle); diff --git a/apps/spreadsheeteditor/mobile/src/view/settings/SpreadsheetSettings.jsx b/apps/spreadsheeteditor/mobile/src/view/settings/SpreadsheetSettings.jsx index 2c7170a01..616f20df7 100644 --- a/apps/spreadsheeteditor/mobile/src/view/settings/SpreadsheetSettings.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/settings/SpreadsheetSettings.jsx @@ -238,16 +238,14 @@ const PageSpreadsheetSettings = props => { onPageMarginsChange: props.onPageMarginsChange }}> - - - {_t.textHideHeadings} + + { storeSpreadsheetSettings.changeHideHeadings(!isHideHeadings); props.clickCheckboxHideHeadings(!isHideHeadings) }} /> - - {_t.textHideGridlines} + { storeSpreadsheetSettings.changeHideGridlines(!isHideGridlines); props.clickCheckboxHideGridlines(!isHideGridlines)