diff --git a/apps/common/main/lib/component/ComboBoxFonts.js b/apps/common/main/lib/component/ComboBoxFonts.js index 8ab9686fe1..340757d3f9 100644 --- a/apps/common/main/lib/component/ComboBoxFonts.js +++ b/apps/common/main/lib/component/ComboBoxFonts.js @@ -58,7 +58,13 @@ define([ {ratio: 1.25, path: '../../../../sdkjs/common/Images/fonts_thumbnail' + postfix + '@1.25x.png', width: iconWidth * 1.25, height: iconHeight * 1.25}, {ratio: 1.5, path: '../../../../sdkjs/common/Images/fonts_thumbnail' + postfix + '@1.5x.png', width: iconWidth * 1.5, height: iconHeight * 1.5}, {ratio: 1.75, path: '../../../../sdkjs/common/Images/fonts_thumbnail' + postfix + '@1.75x.png', width: iconWidth * 1.75, height: iconHeight * 1.75}, - {ratio: 2, path: '../../../../sdkjs/common/Images/fonts_thumbnail' + postfix + '@2x.png', width: iconWidth * 2, height: iconHeight * 2} + {ratio: 2, path: '../../../../sdkjs/common/Images/fonts_thumbnail' + postfix + '@2x.png', width: iconWidth * 2, height: iconHeight * 2}, + /*{ratio: 2.5, path: '../../../../sdkjs/common/Images/fonts_thumbnail' + postfix + '@2.5x.png', width: iconWidth * 2.5, height: iconHeight * 2.5}, + {ratio: 3, path: '../../../../sdkjs/common/Images/fonts_thumbnail' + postfix + '@3x.png', width: iconWidth * 3, height: iconHeight * 3}, + {ratio: 3.5, path: '../../../../sdkjs/common/Images/fonts_thumbnail' + postfix + '@3.5x.png', width: iconWidth * 3.5, height: iconHeight * 3.5}, + {ratio: 4, path: '../../../../sdkjs/common/Images/fonts_thumbnail' + postfix + '@4x.png', width: iconWidth * 4, height: iconHeight * 4}, + {ratio: 4.5, path: '../../../../sdkjs/common/Images/fonts_thumbnail' + postfix + '@4.5x.png', width: iconWidth * 4.5, height: iconHeight * 4.5}, + {ratio: 5, path: '../../../../sdkjs/common/Images/fonts_thumbnail' + postfix + '@5x.png', width: iconWidth * 5, height: iconHeight * 5},*/ ], thumbIdx = 0, listItemHeight = 28, @@ -71,6 +77,12 @@ define([ thumbs[2].path = Common.Controllers.Desktop.call('getFontsSprite', '@1.5x'); thumbs[3].path = Common.Controllers.Desktop.call('getFontsSprite', '@1.75x'); thumbs[4].path = Common.Controllers.Desktop.call('getFontsSprite', '@2x'); + /*thumbs[5].path = Common.Controllers.Desktop.call('getFontsSprite', '@2.5x'); + thumbs[6].path = Common.Controllers.Desktop.call('getFontsSprite', '@3x'); + thumbs[7].path = Common.Controllers.Desktop.call('getFontsSprite', '@3.5x'); + thumbs[8].path = Common.Controllers.Desktop.call('getFontsSprite', '@4x'); + thumbs[9].path = Common.Controllers.Desktop.call('getFontsSprite', '@4.5x'); + thumbs[10].path = Common.Controllers.Desktop.call('getFontsSprite', '@5x');*/ } var bestDistance = Math.abs(applicationPixelRatio-thumbs[0].ratio); diff --git a/apps/common/main/resources/less/asc-mixins.less b/apps/common/main/resources/less/asc-mixins.less index 2f23254f5f..cf56607887 100644 --- a/apps/common/main/resources/less/asc-mixins.less +++ b/apps/common/main/resources/less/asc-mixins.less @@ -293,6 +293,107 @@ } } +.background-ximage-all-scale(@image, @w: auto, @h: auto, @repeat: no-repeat, @commonimage: true) { + .choose-image-path(@commonimage); + @imagepath: '@{path}/@{image}'; + + background-image: if(@icon-src-base64, data-uri(%("%s", '@{imagepath}')), ~"url(@{imagepath})"); + background-repeat: @repeat; + + @1d5ximage: replace(@imagepath, '\.png$', '@1.5x.png'); + @1d75ximage: replace(@imagepath, '\.png$', '@1.75x.png'); + @1d25ximage: replace(@imagepath, '\.png$', '@1.25x.png'); + @2ximage: replace(@imagepath, '\.png$', '@2x.png'); + @2d5ximage: replace(@imagepath, '\.png$', '@2.5x.png'); + @3ximage: replace(@imagepath, '\.png$', '@3x.png'); + @3d5ximage: replace(@imagepath, '\.png$', '@3.5x.png'); + @4ximage: replace(@imagepath, '\.png$', '@4x.png'); + @4d5ximage: replace(@imagepath, '\.png$', '@4.5x.png'); + @5ximage: replace(@imagepath, '\.png$', '@5x.png'); + + @media only screen { + @media (-webkit-min-device-pixel-ratio: 1.25) and (-webkit-max-device-pixel-ratio: 1.49), + (min-resolution: 1.25dppx) and (max-resolution: 1.49dppx), + (min-resolution: 120dpi) and (max-resolution: 143dpi) + { + background-image: ~"url(@{1d25ximage})"; + background-size: @w @h; + } + + @media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.74), + (min-resolution: 1.5dppx) and (max-resolution: 1.74dppx), + (min-resolution: 144dpi) and (max-resolution: 167dpi) + { + background-image: ~"url(@{1d5ximage})"; + background-size: @w @h; + } + + @media (-webkit-min-device-pixel-ratio: 1.75) and (-webkit-max-device-pixel-ratio: 1.9), + (min-resolution: 1.75dppx) and (max-resolution: 1.9dppx), + (min-resolution: 168dpi) and (max-resolution: 191dpi) + { + background-image: ~"url(@{1d75ximage})"; + background-size: @w @h; + } + + @media (-webkit-min-device-pixel-ratio: 2) and (-webkit-max-device-pixel-ratio: 2.49), + (min-resolution: 2dppx) and (max-resolution: 2.49dppx), + (min-resolution: 192dpi) and (max-resolution: 239dpi) + { + background-image: ~"url(@{2ximage})"; + background-size: @w @h; + } + + @media (-webkit-min-device-pixel-ratio: 2.5) and (-webkit-max-device-pixel-ratio: 2.9), + (min-resolution: 2.5dppx) and (max-resolution: 2.9dppx), + (min-resolution: 240dpi) and (max-resolution: 287dpi) + { + background-image: ~"url(@{2d5ximage})"; + background-size: @w @h; + } + + @media (-webkit-min-device-pixel-ratio: 3) and (-webkit-max-device-pixel-ratio: 3.49), + (min-resolution: 3dppx) and (max-resolution: 3.49dppx), + (min-resolution: 288dpi) and (max-resolution: 335dpi) + { + background-image: ~"url(@{3ximage})"; + background-size: @w @h; + } + + @media (-webkit-min-device-pixel-ratio: 3.5) and (-webkit-max-device-pixel-ratio: 3.9), + (min-resolution: 3.5dppx) and (max-resolution: 3.9dppx), + (min-resolution: 336dpi) and (max-resolution: 383dpi) + { + background-image: ~"url(@{3d5ximage})"; + background-size: @w @h; + } + + @media (-webkit-min-device-pixel-ratio: 4) and (-webkit-max-device-pixel-ratio: 4.49), + (min-resolution: 4dppx) and (max-resolution: 4.49dppx), + (min-resolution: 384dpi) and (max-resolution: 431dpi) + { + background-image: ~"url(@{4ximage})"; + background-size: @w @h; + } + + @media (-webkit-min-device-pixel-ratio: 4.5) and (-webkit-max-device-pixel-ratio: 4.9), + (min-resolution: 4.5dppx) and (max-resolution: 4.9dppx), + (min-resolution: 432dpi) and (max-resolution: 479dpi) + { + background-image: ~"url(@{4d5ximage})"; + background-size: @w @h; + } + + @media (-webkit-min-device-pixel-ratio: 5), + (min-resolution: 5dppx), + (min-resolution: 480dpi) + { + background-image: ~"url(@{5ximage})"; + background-size: @w @h; + } + } +} + .img-commonctrl { &.img-colored { filter: none; diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 7ec83ea0e5..33bafeca92 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -1173,10 +1173,26 @@ } .asc-window.modal { - .btn-toolbar:not(.bg-white), .btn-group { - &:focus:not(.disabled) { - .box-shadow(0 0 0 @scaled-one-px-value-ie @border-control-focus-ie); - .box-shadow(0 0 0 @scaled-one-px-value @border-control-focus); + .btn-toolbar:not(.bg-white):not(.disabled) { + &:focus { + .box-inner-shadow(0 0 0 @scaled-one-px-value-ie @border-control-focus-ie); + .box-inner-shadow(0 0 0 @scaled-one-px-value @border-control-focus); + } + } + .btn-group:not(.split) { + &.open, + &.active, + &:active { + .btn-toolbar:not(.bg-white):not(.disabled) { + .box-inner-shadow(0 0 0 @scaled-one-px-value-ie @border-control-focus-ie); + .box-inner-shadow(0 0 0 @scaled-one-px-value @border-control-focus); + } + } + } + .btn-group.split, + .input-field-btn { + .btn-toolbar:not(.bg-white):not(.disabled):focus { + .box-shadow(none); } } } diff --git a/apps/documenteditor/main/app/controller/DocumentHolder.js b/apps/documenteditor/main/app/controller/DocumentHolder.js index 07cac05feb..d1c8c357d0 100644 --- a/apps/documenteditor/main/app/controller/DocumentHolder.js +++ b/apps/documenteditor/main/app/controller/DocumentHolder.js @@ -141,11 +141,6 @@ define([ isVisible: false }; me.eyedropperTip = { - toolTip: new Common.UI.Tooltip({ - owner: this, - html: true, - cls: 'eyedropper-tooltip' - }), isHidden: true, isVisible: false, eyedropperColor: null, @@ -1069,6 +1064,16 @@ define([ me.eyedropperTip.toolTip.hide(); } + if (!me.eyedropperTip.toolTip) { + var tipEl = $('
'); + me.documentHolder.cmpEl.append(tipEl); + me.eyedropperTip.toolTip = new Common.UI.Tooltip({ + owner: tipEl, + html: true, + cls: 'eyedropper-tooltip' + }); + } + var color = moveData.get_EyedropperColor().asc_getColor(), r = color.get_r(), g = color.get_g(), diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js index 81c42077f6..b24bb6fb44 100644 --- a/apps/presentationeditor/main/app/controller/DocumentHolder.js +++ b/apps/presentationeditor/main/app/controller/DocumentHolder.js @@ -119,11 +119,6 @@ define([ isVisible: false }; me.eyedropperTip = { - toolTip: new Common.UI.Tooltip({ - owner: this, - html: true, - cls: 'eyedropper-tooltip' - }), isHidden: true, isVisible: false, eyedropperColor: null, @@ -928,6 +923,16 @@ define([ me.eyedropperTip.toolTip.hide(); } + if (!me.eyedropperTip.toolTip) { + var tipEl = $('
'); + me.documentHolder.cmpEl.append(tipEl); + me.eyedropperTip.toolTip = new Common.UI.Tooltip({ + owner: tipEl, + html: true, + cls: 'eyedropper-tooltip' + }); + } + var color = moveData.get_EyedropperColor().asc_getColor(), r = color.get_r(), g = color.get_g(), diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less index 888ff9635f..99e5cd426d 100644 --- a/apps/presentationeditor/main/resources/less/toolbar.less +++ b/apps/presentationeditor/main/resources/less/toolbar.less @@ -111,7 +111,7 @@ .item-theme { width: 88px; height: 40px; - .background-ximage-all('../../../../../../sdkjs/common/Images/themes_thumbnail.png', 88px); + .background-ximage-all-scale('../../../../../../sdkjs/common/Images/themes_thumbnail.png', 88px); background-size: cover } diff --git a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js index 772c65475e..7ef552a2d6 100644 --- a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js @@ -682,8 +682,8 @@ define([ var numFormatTemplate = _.template(''+ '
'+ - '
<%= caption %>
' + - '' + + '
<%= caption %>
' + + '' + '
'); me.pmiNumFormat = new Common.UI.MenuItem({ diff --git a/apps/spreadsheeteditor/main/index_internal.html b/apps/spreadsheeteditor/main/index_internal.html index 9cd39d84ec..30833d5582 100644 --- a/apps/spreadsheeteditor/main/index_internal.html +++ b/apps/spreadsheeteditor/main/index_internal.html @@ -216,6 +216,7 @@ +
diff --git a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less index 4493f15d6f..6ac91f6d4d 100644 --- a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less +++ b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less @@ -378,7 +378,7 @@ .item-container { position: relative; .name { - width: 100px; + width: 125px; position: absolute; left: 0; .rtl & { @@ -394,12 +394,12 @@ text-overflow: ellipsis; .text-align-right(); vertical-align: bottom; - padding-left: 100px; + padding-left: 125px; color: silver; white-space: nowrap; .rtl & { padding-left: 0; - padding-right: 100px; + padding-right: 125px; } } } diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less index 3f3e075dec..15e965f1af 100644 --- a/apps/spreadsheeteditor/main/resources/less/toolbar.less +++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less @@ -286,7 +286,7 @@ .rtl & { text-align: left; padding-left: 0; - padding-right: 100px; + padding-right: 125px; } } }