diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js index 4f7ca3807a..5d44fe4eaf 100644 --- a/apps/common/main/lib/component/Button.js +++ b/apps/common/main/lib/component/Button.js @@ -275,7 +275,8 @@ define([ visible : true, dataHint : '', dataHintDirection: '', - dataHintOffset: '0, 0' + dataHintOffset: '0, 0', + scaling : false, }, template: _.template([ @@ -345,6 +346,9 @@ define([ me.render(); } else if (me.options.parentEl) me.render(me.options.parentEl); + + // TODO: for review scaling feature only. remove after + me.options.scaling = true; }, getCaptionWithBreaks: function (caption) { @@ -620,6 +624,17 @@ define([ // Register the button in the toggle manager Common.UI.ToggleManager.register(me); + + if ( me.options.scaling !== false ) { + el.attr('ratio', 'ratio'); + me.applyScaling(Common.UI.Scaling.currentRatio()); + + el.on('app:scaling', function (e, info) { + if ( me.options.scaling != info.ratio ) { + me.applyScaling(info.ratio); + } + }); + } } me.rendered = true; @@ -851,7 +866,30 @@ define([ if (this.rendered) this.menu.render(this.cmpEl); } - } + }, + + applyScaling: function (ratio) { + const me = this; + if ( me.options.scaling != ratio ) { + // me.cmpEl.attr('ratio', ratio); + me.options.scaling = ratio; + + if (ratio > 2) { + if (!me.$el.find('svg.icon').length) { + const re_icon_name = /btn-[^\s]+/.exec(me.iconCls); + const icon_name = re_icon_name ? re_icon_name[0] : "null"; + const svg_icon = ``; + + me.$el.find('i.icon').after(svg_icon); + } + } else { + if (!me.$el.find('i.icon')) { + const png_icon = ` `; + me.$el.find('svg.icon').after(png_icon); + } + } + } + }, }); }); diff --git a/apps/common/main/lib/controller/Scaling.js b/apps/common/main/lib/controller/Scaling.js new file mode 100644 index 0000000000..20ed0a341d --- /dev/null +++ b/apps/common/main/lib/controller/Scaling.js @@ -0,0 +1,53 @@ +/** + * Created by Maxim.Kadushkin on 2/5/2021. + */ + +define([ + 'core' +], function () { + 'use strict'; + + Common.UI.Scaling = new (function() { + const scales_map = { + 'pixel-ratio__1' : 1, + 'pixel-ratio__1_25' : 1.25, + 'pixel-ratio__1_5' : 1.5, + 'pixel-ratio__1_75' : 1.75, + 'pixel-ratio__2' : 2, + 'pixel-ratio__2_5' : 2.5, + } + + let _body_classes = document.body.className; + + const _from_class_list = function (str) { + const reg_ratio = /(pixel-ratio__[\w-]+)/.exec(str); + if ( reg_ratio && (reg_ratio[1] in scales_map) ) { + return reg_ratio[1]; + } + + return 'pixel-ratio__1'; + } + + let _current_ratio_str = _from_class_list(_body_classes); + + const _callback = function (records, observer) { + const _changed_ratio = _from_class_list(document.body.className); + if ( _changed_ratio != _current_ratio_str ) { + $('[ratio]').trigger('app:scaling', {ratio: scales_map[_changed_ratio]}); + + _current_ratio_str = _changed_ratio; + } + }; + + (new MutationObserver(_callback.bind(this))) + .observe(document.body, { + attributes : true, + attributeFilter : ['class'], + }) + + return { + currentRatio: function () { return scales_map[_current_ratio_str] }, + currentRatioSelector: function () { return _current_ratio_str }, + }; + }); +}); \ No newline at end of file diff --git a/apps/common/main/lib/util/htmlutils.js b/apps/common/main/lib/util/htmlutils.js index 550c8c8fdc..7e8ca2cf65 100644 --- a/apps/common/main/lib/util/htmlutils.js +++ b/apps/common/main/lib/util/htmlutils.js @@ -61,13 +61,34 @@ function checkScaling() { } } - if ( !window.matchMedia("screen and (-webkit-device-pixel-ratio: 1.5)," + - "screen and (-webkit-device-pixel-ratio: 1)," + - "screen and (-webkit-device-pixel-ratio: 2)").matches ) - { - // don't add zoom for mobile devices - // if (!(/android|avantgo|playbook|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od|ad)|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(navigator.userAgent || navigator.vendor || window.opera))) - // document.getElementsByTagName('html')[0].setAttribute('style', 'zoom: ' + (1 / window.devicePixelRatio) + ';'); + matches = { + 'pixel-ratio__2_5': `screen and (-webkit-min-device-pixel-ratio: 2.5), screen and (min-resolution: 2.5dppx)`, + }; + for (let c in matches) { + if ( window.matchMedia(matches[c]).matches ) { + document.body.classList.add(c); + Common.Utils.injectSvgIcons(); + break; + } + } +} + +window.Common = { + Utils: { + injectSvgIcons: function () { + const el = document.querySelector('div.inlined-svg'); + if (!el || !el.innerHTML.firstChild) { + fetch('./resources/img/iconssmall@2.5x.svg') + .then(r => { + if (r.ok) return r.text(); + else {/* error */ + } + }).then(text => { + const el = document.querySelector('div.inlined-svg') + el.innerHTML = text; + }).catch(console.error.bind(console)); + } + } } } diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js index e7f8a03f0e..18b6c3b2ea 100644 --- a/apps/common/main/lib/util/utils.js +++ b/apps/common/main/lib/util/utils.js @@ -143,6 +143,8 @@ var utils = new(function() { "screen and (min-resolution: 1.75dppx) and (max-resolution: 1.99dppx)"; var str_mq_200 = "screen and (-webkit-min-device-pixel-ratio: 2), " + "screen and (min-resolution: 2dppx), screen and (min-resolution: 192dpi)"; + const str_mq_250 = "screen and (-webkit-min-device-pixel-ratio: 2.5), " + + "screen and (min-resolution: 2.5dppx), screen and (min-resolution: 240dpi)"; if ( window.matchMedia(str_mq_125).matches ) { scale.devicePixelRatio = 1.5; @@ -156,6 +158,10 @@ var utils = new(function() { if ( window.matchMedia(str_mq_200).matches ) scale.devicePixelRatio = 2; else scale.devicePixelRatio = 1; + + if ( window.matchMedia(str_mq_250).matches ) { + scale.devicePixelRatio = 2.5; + } } var $root = $(document.body); @@ -180,11 +186,16 @@ var utils = new(function() { if ( !/pixel-ratio__1_75/.test(classes) ) { document.body.className = clear_list + ' pixel-ratio__1_75'; } - } else { - $root.addClass('pixel-ratio__2'); - if ( !/pixel-ratio__2/.test(classes) ) { + } else + if ( !(scale.devicePixelRatio < 2) && scale.devicePixelRatio < 2.5 ) { + if ( !/pixel-ratio__2\b/.test(classes) ) { document.body.className = clear_list + ' pixel-ratio__2'; } + } else { + // $root.addClass('pixel-ratio__2_5'); + if ( !/pixel-ratio__2_5/.test(classes) ) { + document.body.className = clear_list + ' pixel-ratio__2_5'; + } } me.zoom = scale.correct ? scale.zoom : 1; diff --git a/apps/common/main/resources/img/toolbar/2.5x/advanced-btn-ratio.svg b/apps/common/main/resources/img/toolbar/2.5x/advanced-btn-ratio.svg new file mode 100644 index 0000000000..e368921546 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/advanced-btn-ratio.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/arrange-back.svg b/apps/common/main/resources/img/toolbar/2.5x/arrange-back.svg new file mode 100644 index 0000000000..660e7045bb --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/arrange-back.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/arrange-backward.svg b/apps/common/main/resources/img/toolbar/2.5x/arrange-backward.svg new file mode 100644 index 0000000000..7122c56b45 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/arrange-backward.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/arrange-forward.svg b/apps/common/main/resources/img/toolbar/2.5x/arrange-forward.svg new file mode 100644 index 0000000000..addf0cd909 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/arrange-forward.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/arrange-front.svg b/apps/common/main/resources/img/toolbar/2.5x/arrange-front.svg new file mode 100644 index 0000000000..0e2ea4939b --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/arrange-front.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-audio.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-audio.svg new file mode 100644 index 0000000000..c643fc4fc1 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-audio.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-colorsschemas.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-colorsschemas.svg new file mode 100644 index 0000000000..0f39f9d05d --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-colorsschemas.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-compare.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-compare.svg new file mode 100644 index 0000000000..24f6664bbe --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-compare.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-datetime.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-datetime.svg new file mode 100644 index 0000000000..c4aff0fcf1 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-datetime.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-editheader.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-editheader.svg new file mode 100644 index 0000000000..b5e50b6760 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-editheader.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-ic-chat.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-ic-chat.svg new file mode 100644 index 0000000000..f0af688963 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-ic-chat.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-ic-coedet.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-ic-coedet.svg new file mode 100644 index 0000000000..4e3f5bfaef --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-ic-coedet.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-ic-history.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-ic-history.svg new file mode 100644 index 0000000000..32dbfeba54 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-ic-history.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-ic-protect.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-ic-protect.svg new file mode 100644 index 0000000000..dfb4f90306 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-ic-protect.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-ic-sharing.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-ic-sharing.svg new file mode 100644 index 0000000000..2567716577 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-ic-sharing.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-ic-signature.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-ic-signature.svg new file mode 100644 index 0000000000..8d6e34361d --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-ic-signature.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-img-align.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-img-align.svg new file mode 100644 index 0000000000..99a014f2fc --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-img-align.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-img-bkwd.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-img-bkwd.svg new file mode 100644 index 0000000000..400c865868 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-img-bkwd.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-img-frwd.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-img-frwd.svg new file mode 100644 index 0000000000..4f27e60d2c --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-img-frwd.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-img-group.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-img-group.svg new file mode 100644 index 0000000000..dcbe62a3b3 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-img-group.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-insertchart.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-insertchart.svg new file mode 100644 index 0000000000..24f517fa57 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-insertchart.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-insertequation.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-insertequation.svg new file mode 100644 index 0000000000..ed9a8e7044 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-insertequation.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-inserthyperlink.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-inserthyperlink.svg new file mode 100644 index 0000000000..9cd1cabbbd --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-inserthyperlink.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-insertimage.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-insertimage.svg new file mode 100644 index 0000000000..3d3f5a93b0 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-insertimage.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-insertshape.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-insertshape.svg new file mode 100644 index 0000000000..7866c5e1e3 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-insertshape.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-inserttable.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-inserttable.svg new file mode 100644 index 0000000000..486d31a579 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-inserttable.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-menu-comments.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-menu-comments.svg new file mode 100644 index 0000000000..3f204f675b --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-menu-comments.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-menu-navigation.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-menu-navigation.svg new file mode 100644 index 0000000000..c85ae453f8 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-menu-navigation.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-more.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-more.svg new file mode 100644 index 0000000000..8241efe0a0 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-more.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-pagemargins.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-pagemargins.svg new file mode 100644 index 0000000000..148c594c86 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-pagemargins.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-pageorient.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-pageorient.svg new file mode 100644 index 0000000000..a121de4d04 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-pageorient.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-pagesize.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-pagesize.svg new file mode 100644 index 0000000000..8fe4423879 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-pagesize.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-rem-comment.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-rem-comment.svg new file mode 100644 index 0000000000..779742aae2 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-rem-comment.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-resolve-all.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-resolve-all.svg new file mode 100644 index 0000000000..6cf1478843 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-resolve-all.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-sheet-view.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-sheet-view.svg new file mode 100644 index 0000000000..0117f0c64d --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-sheet-view.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-symbol.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-symbol.svg new file mode 100644 index 0000000000..aedc158570 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-symbol.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-text.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-text.svg new file mode 100644 index 0000000000..053ef56a32 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-text.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-textart.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-textart.svg new file mode 100644 index 0000000000..db23fc5796 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-textart.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-update.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-update.svg new file mode 100644 index 0000000000..d222d93049 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-update.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-video.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-video.svg new file mode 100644 index 0000000000..52dc981d7c --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-video.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/day.svg b/apps/common/main/resources/img/toolbar/2.5x/big/day.svg new file mode 100644 index 0000000000..316f0534e4 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/day.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/night.svg b/apps/common/main/resources/img/toolbar/2.5x/big/night.svg new file mode 100644 index 0000000000..076395d835 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/night.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-add-breakpoint.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-add-breakpoint.svg new file mode 100644 index 0000000000..d5b7c26799 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-add-breakpoint.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-addcell.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-addcell.svg new file mode 100644 index 0000000000..b133cc641a --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-addcell.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-align-bottom.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-align-bottom.svg new file mode 100644 index 0000000000..78725400f9 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-align-bottom.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-align-center.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-align-center.svg new file mode 100644 index 0000000000..f014022ba7 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-align-center.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-align-just.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-align-just.svg new file mode 100644 index 0000000000..2ae151c9d9 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-align-just.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-align-left.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-align-left.svg new file mode 100644 index 0000000000..aa32c0a6b2 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-align-left.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-align-middle.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-align-middle.svg new file mode 100644 index 0000000000..44cfbaaa82 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-align-middle.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-align-right.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-align-right.svg new file mode 100644 index 0000000000..c3e9215a9b --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-align-right.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-align-top.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-align-top.svg new file mode 100644 index 0000000000..db368f72e6 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-align-top.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-arrow-down.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-arrow-down.svg new file mode 100644 index 0000000000..90ce477f57 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-arrow-down.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-arrow-up.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-arrow-up.svg new file mode 100644 index 0000000000..32b109d47c --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-arrow-up.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-autocorrect.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-autocorrect.svg new file mode 100644 index 0000000000..4e359f2c08 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-autocorrect.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-bold(ru).svg b/apps/common/main/resources/img/toolbar/2.5x/btn-bold(ru).svg new file mode 100644 index 0000000000..a618f59941 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-bold(ru).svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-bold.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-bold.svg new file mode 100644 index 0000000000..9b0660d7fa --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-bold.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-border-all.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-border-all.svg new file mode 100644 index 0000000000..ca23166b31 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-border-all.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-border-bottom.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-border-bottom.svg new file mode 100644 index 0000000000..326a4adcd7 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-border-bottom.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-border-diagdown.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-border-diagdown.svg new file mode 100644 index 0000000000..1d3da81f66 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-border-diagdown.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-border-diagup.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-border-diagup.svg new file mode 100644 index 0000000000..b2a7f460f0 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-border-diagup.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-border-inside.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-border-inside.svg new file mode 100644 index 0000000000..445926d6b1 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-border-inside.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-border-insidehor.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-border-insidehor.svg new file mode 100644 index 0000000000..dd66ce911d --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-border-insidehor.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-border-insidevert.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-border-insidevert.svg new file mode 100644 index 0000000000..96228cc999 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-border-insidevert.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-border-left.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-border-left.svg new file mode 100644 index 0000000000..6bd4196ead --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-border-left.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-border-no.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-border-no.svg new file mode 100644 index 0000000000..c9f2901b18 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-border-no.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-border-out.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-border-out.svg new file mode 100644 index 0000000000..4b08bbdb71 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-border-out.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-border-right.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-border-right.svg new file mode 100644 index 0000000000..89b091908c --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-border-right.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-border-top.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-border-top.svg new file mode 100644 index 0000000000..d253fe4c9a --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-border-top.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-change-case.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-change-case.svg new file mode 100644 index 0000000000..13b16349d8 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-change-case.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-clearstyle.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-clearstyle.svg new file mode 100644 index 0000000000..5c232a4478 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-clearstyle.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-close.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-close.svg new file mode 100644 index 0000000000..1a41e9125a --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-close.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-colorschemas.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-colorschemas.svg new file mode 100644 index 0000000000..afacbe8def --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-colorschemas.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-copy.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-copy.svg new file mode 100644 index 0000000000..11071f6649 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-copy.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-copystyle.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-copystyle.svg new file mode 100644 index 0000000000..538a1ecde6 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-copystyle.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-cut.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-cut.svg new file mode 100644 index 0000000000..c282edad8b --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-cut.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-decfont.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-decfont.svg new file mode 100644 index 0000000000..a341b511d5 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-decfont.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-decoffset.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-decoffset.svg new file mode 100644 index 0000000000..e2d778ea20 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-decoffset.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-delcell.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-delcell.svg new file mode 100644 index 0000000000..839a3583a3 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-delcell.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-docspell.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-docspell.svg new file mode 100644 index 0000000000..a56e92f12f --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-docspell.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-download.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-download.svg new file mode 100644 index 0000000000..6ac5c741bb --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-download.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-edit.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-edit.svg new file mode 100644 index 0000000000..e51a63e7da --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-edit.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-embed .svg b/apps/common/main/resources/img/toolbar/2.5x/btn-embed .svg new file mode 100644 index 0000000000..0fac88f2be --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-embed .svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-favorite.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-favorite.svg new file mode 100644 index 0000000000..e48f7f8309 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-favorite.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-firstitem.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-firstitem.svg new file mode 100644 index 0000000000..9d834b7250 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-firstitem.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-flip-hor.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-flip-hor.svg new file mode 100644 index 0000000000..f7dca6951e --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-flip-hor.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-flip-vert.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-flip-vert.svg new file mode 100644 index 0000000000..f554fa5355 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-flip-vert.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-fontcolor.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-fontcolor.svg new file mode 100644 index 0000000000..ef925df97d --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-fontcolor.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-goback.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-goback.svg new file mode 100644 index 0000000000..05b296ef8e --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-goback.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-highlight.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-highlight.svg new file mode 100644 index 0000000000..ecbf010167 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-highlight.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-ic-doclang.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-ic-doclang.svg new file mode 100644 index 0000000000..5ca6ae4eb6 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-ic-doclang.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-ic-docspell(ru).svg b/apps/common/main/resources/img/toolbar/2.5x/btn-ic-docspell(ru).svg new file mode 100644 index 0000000000..4b3fbf5dc1 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-ic-docspell(ru).svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-ic-options.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-ic-options.svg new file mode 100644 index 0000000000..1cc08edfc9 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-ic-options.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-ic-review.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-ic-review.svg new file mode 100644 index 0000000000..2832d16bc3 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-ic-review.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-ic-zoomtopage.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-ic-zoomtopage.svg new file mode 100644 index 0000000000..65d5a011b6 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-ic-zoomtopage.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-ic-zoomtowidth.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-ic-zoomtowidth.svg new file mode 100644 index 0000000000..ee7779128e --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-ic-zoomtowidth.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-in-favorite.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-in-favorite.svg new file mode 100644 index 0000000000..8c2b845c4e --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-in-favorite.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-incfont.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-incfont.svg new file mode 100644 index 0000000000..0826872b02 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-incfont.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-incoffset.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-incoffset.svg new file mode 100644 index 0000000000..09c9e53740 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-incoffset.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-inserthyperlink.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-inserthyperlink.svg new file mode 100644 index 0000000000..f48451305f --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-inserthyperlink.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-italic(ru).svg b/apps/common/main/resources/img/toolbar/2.5x/btn-italic(ru).svg new file mode 100644 index 0000000000..e39f045c3b --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-italic(ru).svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-italic.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-italic.svg new file mode 100644 index 0000000000..903c08b3b1 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-italic.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-lastitem.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-lastitem.svg new file mode 100644 index 0000000000..713547816a --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-lastitem.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-linespace.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-linespace.svg new file mode 100644 index 0000000000..faa5845056 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-linespace.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-menu-about.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-about.svg new file mode 100644 index 0000000000..5d03d7a5d5 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-about.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-menu-chart.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-chart.svg new file mode 100644 index 0000000000..229cf2a9a9 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-chart.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-menu-chat.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-chat.svg new file mode 100644 index 0000000000..f0e14bc6d4 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-chat.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-menu-comments.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-comments.svg new file mode 100644 index 0000000000..76dbe870ba --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-comments.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-menu-image.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-image.svg new file mode 100644 index 0000000000..306f549b98 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-image.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-menu-navigation.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-navigation.svg new file mode 100644 index 0000000000..e39b26a26d --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-navigation.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-menu-search.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-search.svg new file mode 100644 index 0000000000..887a7239e5 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-search.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-menu-shape.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-shape.svg new file mode 100644 index 0000000000..14ac9c6356 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-shape.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-menu-signature.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-signature.svg new file mode 100644 index 0000000000..c21f47cd34 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-signature.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-menu-support.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-support.svg new file mode 100644 index 0000000000..61a94c6a79 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-support.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-menu-table.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-table.svg new file mode 100644 index 0000000000..2e0d6f8809 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-table.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-menu-textart.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-textart.svg new file mode 100644 index 0000000000..26fbe1764b --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-menu-textart.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-merge-cells.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-merge-cells.svg new file mode 100644 index 0000000000..5587a6d09c --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-merge-cells.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-nextitem.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-nextitem.svg new file mode 100644 index 0000000000..54d5f1992d --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-nextitem.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-numbering.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-numbering.svg new file mode 100644 index 0000000000..318e8de883 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-numbering.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-paracolor.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-paracolor.svg new file mode 100644 index 0000000000..88b921239f --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-paracolor.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-paragraph.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-paragraph.svg new file mode 100644 index 0000000000..7805c42d85 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-paragraph.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-paste.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-paste.svg new file mode 100644 index 0000000000..4b82b816dc --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-paste.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-previtem.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-previtem.svg new file mode 100644 index 0000000000..e308e0bbdf --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-previtem.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-print.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-print.svg new file mode 100644 index 0000000000..d7c46cdf52 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-print.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-redo.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-redo.svg new file mode 100644 index 0000000000..e6e422133a --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-redo.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-remove-breakpoint.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-remove-breakpoint.svg new file mode 100644 index 0000000000..4b32257a14 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-remove-breakpoint.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-rotate-270.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-rotate-270.svg new file mode 100644 index 0000000000..666012eff8 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-rotate-270.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-rotate-90.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-rotate-90.svg new file mode 100644 index 0000000000..a5f803f24b --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-rotate-90.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-save-coauth.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-save-coauth.svg new file mode 100644 index 0000000000..19f799fba3 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-save-coauth.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-save.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-save.svg new file mode 100644 index 0000000000..4cab612086 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-save.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-select-range.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-select-range.svg new file mode 100644 index 0000000000..89a843c8a9 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-select-range.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-setmarkers.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-setmarkers.svg new file mode 100644 index 0000000000..cb1fdd5820 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-setmarkers.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-settings.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-settings.svg new file mode 100644 index 0000000000..bc20327654 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-settings.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-share.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-share.svg new file mode 100644 index 0000000000..32d3309dc7 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-share.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-sheet-view.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-sheet-view.svg new file mode 100644 index 0000000000..a94ccac733 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-sheet-view.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-sorting.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-sorting.svg new file mode 100644 index 0000000000..d801140b96 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-sorting.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-strikeout(ru).svg b/apps/common/main/resources/img/toolbar/2.5x/btn-strikeout(ru).svg new file mode 100644 index 0000000000..2569665d39 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-strikeout(ru).svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-strikeout.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-strikeout.svg new file mode 100644 index 0000000000..9bd4c35d02 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-strikeout.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-subscript.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-subscript.svg new file mode 100644 index 0000000000..672518fce6 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-subscript.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-superscript.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-superscript.svg new file mode 100644 index 0000000000..1c797eee1c --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-superscript.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-underline(ru).svg b/apps/common/main/resources/img/toolbar/2.5x/btn-underline(ru).svg new file mode 100644 index 0000000000..00351152f7 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-underline(ru).svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-underline.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-underline.svg new file mode 100644 index 0000000000..51bbd156de --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-underline.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-undo.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-undo.svg new file mode 100644 index 0000000000..b18129dcc1 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-undo.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-user.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-user.svg new file mode 100644 index 0000000000..647bfd064c --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-user.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-users.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-users.svg new file mode 100644 index 0000000000..a05c73ab64 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-users.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-zoomdown.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-zoomdown.svg new file mode 100644 index 0000000000..a88c7f830f --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-zoomdown.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-zoomup.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-zoomup.svg new file mode 100644 index 0000000000..b7b30e4ebf --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-zoomup.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/collapse-all.svg b/apps/common/main/resources/img/toolbar/2.5x/collapse-all.svg new file mode 100644 index 0000000000..bd43ba149c --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/collapse-all.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/columns-one.svg b/apps/common/main/resources/img/toolbar/2.5x/columns-one.svg new file mode 100644 index 0000000000..6f024d2591 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/columns-one.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/columns-three.svg b/apps/common/main/resources/img/toolbar/2.5x/columns-three.svg new file mode 100644 index 0000000000..d263f2e81e --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/columns-three.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/columns-two.svg b/apps/common/main/resources/img/toolbar/2.5x/columns-two.svg new file mode 100644 index 0000000000..78d427e7f5 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/columns-two.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/demote.svg b/apps/common/main/resources/img/toolbar/2.5x/demote.svg new file mode 100644 index 0000000000..25461eed35 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/demote.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/expand-all.svg b/apps/common/main/resources/img/toolbar/2.5x/expand-all.svg new file mode 100644 index 0000000000..bc1300ae1b --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/expand-all.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/hide-password.svg b/apps/common/main/resources/img/toolbar/2.5x/hide-password.svg new file mode 100644 index 0000000000..eafd84b12a --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/hide-password.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/latex.svg b/apps/common/main/resources/img/toolbar/2.5x/latex.svg new file mode 100644 index 0000000000..58a4856abf --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/latex.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/linear-equation.svg b/apps/common/main/resources/img/toolbar/2.5x/linear-equation.svg new file mode 100644 index 0000000000..dc8914bf71 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/linear-equation.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/page-landscape.svg b/apps/common/main/resources/img/toolbar/2.5x/page-landscape.svg new file mode 100644 index 0000000000..5e2bd5104d --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/page-landscape.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/page-portrait.svg b/apps/common/main/resources/img/toolbar/2.5x/page-portrait.svg new file mode 100644 index 0000000000..04ac1ff508 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/page-portrait.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/professional-equation.svg b/apps/common/main/resources/img/toolbar/2.5x/professional-equation.svg new file mode 100644 index 0000000000..159ac7540f --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/professional-equation.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/promote.svg b/apps/common/main/resources/img/toolbar/2.5x/promote.svg new file mode 100644 index 0000000000..5d2df4c22e --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/promote.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/rows-and-columns.svg b/apps/common/main/resources/img/toolbar/2.5x/rows-and-columns.svg new file mode 100644 index 0000000000..b6397d634d --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/rows-and-columns.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/select-all.svg b/apps/common/main/resources/img/toolbar/2.5x/select-all.svg new file mode 100644 index 0000000000..8f00a72baf --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/select-all.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/shape-align-bottom.svg b/apps/common/main/resources/img/toolbar/2.5x/shape-align-bottom.svg new file mode 100644 index 0000000000..5b47360eec --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/shape-align-bottom.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/shape-align-center.svg b/apps/common/main/resources/img/toolbar/2.5x/shape-align-center.svg new file mode 100644 index 0000000000..65c3790c88 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/shape-align-center.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/shape-align-left.svg b/apps/common/main/resources/img/toolbar/2.5x/shape-align-left.svg new file mode 100644 index 0000000000..6ced5b8a5b --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/shape-align-left.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/shape-align-middle.svg b/apps/common/main/resources/img/toolbar/2.5x/shape-align-middle.svg new file mode 100644 index 0000000000..73fb7309c6 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/shape-align-middle.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/shape-align-right.svg b/apps/common/main/resources/img/toolbar/2.5x/shape-align-right.svg new file mode 100644 index 0000000000..30ae43a493 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/shape-align-right.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/shape-align-top.svg b/apps/common/main/resources/img/toolbar/2.5x/shape-align-top.svg new file mode 100644 index 0000000000..d6b609b621 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/shape-align-top.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/shape-distribute-hor.svg b/apps/common/main/resources/img/toolbar/2.5x/shape-distribute-hor.svg new file mode 100644 index 0000000000..56a005367d --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/shape-distribute-hor.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/shape-distribute-vert.svg b/apps/common/main/resources/img/toolbar/2.5x/shape-distribute-vert.svg new file mode 100644 index 0000000000..ac3119dc0f --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/shape-distribute-vert.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/shape-group.svg b/apps/common/main/resources/img/toolbar/2.5x/shape-group.svg new file mode 100644 index 0000000000..3e17f531e8 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/shape-group.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/shape-ungroup.svg b/apps/common/main/resources/img/toolbar/2.5x/shape-ungroup.svg new file mode 100644 index 0000000000..d142b1b5d2 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/shape-ungroup.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/text-orient-hor.svg b/apps/common/main/resources/img/toolbar/2.5x/text-orient-hor.svg new file mode 100644 index 0000000000..e03b9b3dbb --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/text-orient-hor.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/text-orient-rdown.svg b/apps/common/main/resources/img/toolbar/2.5x/text-orient-rdown.svg new file mode 100644 index 0000000000..238554b016 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/text-orient-rdown.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/text-orient-rup.svg b/apps/common/main/resources/img/toolbar/2.5x/text-orient-rup.svg new file mode 100644 index 0000000000..618335d5fc --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/text-orient-rup.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/unicode.svg b/apps/common/main/resources/img/toolbar/2.5x/unicode.svg new file mode 100644 index 0000000000..d395e14758 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/unicode.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/common/main/resources/less/bigscaling.less b/apps/common/main/resources/less/bigscaling.less new file mode 100644 index 0000000000..dcd554cf1c --- /dev/null +++ b/apps/common/main/resources/less/bigscaling.less @@ -0,0 +1,19 @@ +.pixel-ratio__2_5 { + .btn-toolbar, + .btn-header, + .btn-category + { + i.icon { + display: none; + } + } +} + +.btn-toolbar, + .btn-header, + .btn-category +{ + svg.icon:not(.pixel-ratio__2_5 *) { + display: none; + } +} \ No newline at end of file diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 961621877d..5d55b304fb 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -432,8 +432,8 @@ only screen and (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9), only screen and (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx), only screen and (min-resolution: 144dpi) and (max-resolution: 143dpi) { - width:calc(~"28px/1.5"); - height:calc(~"28px/1.5"); + //width:calc(~"28px/1.5"); + //height:calc(~"28px/1.5"); } } } diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 2cdc69ae42..643f6d712f 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -3234,6 +3234,8 @@ define([ this.toolbar.createDelayedElements(); this.attachUIEvents(this.toolbar); this.onChangeProtectDocument(); + + Common.Utils.injectSvgIcons(); }, onAppShowed: function (config) { diff --git a/apps/documenteditor/main/app_dev.js b/apps/documenteditor/main/app_dev.js index 6a5c482a43..fb06ccfde9 100644 --- a/apps/documenteditor/main/app_dev.js +++ b/apps/documenteditor/main/app_dev.js @@ -166,6 +166,7 @@ require([ function() { require([ 'common/main/lib/util/LocalStorage', + 'common/main/lib/controller/Scaling', 'common/main/lib/controller/Themes', 'common/main/lib/controller/Desktop', 'documenteditor/main/app/controller/Viewport', diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index 1a82fd74bb..fcf7ffee6e 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -335,6 +335,7 @@ +