pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 02:38:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2439 from ONLYOFFICE/release/v7.4.0

Browse Source 
Release/v7.4.0
This commit is contained in:
Julia Radzhabova
2023-06-13 22:09:14 +03:00
committed by GitHub
parent 021e0a3743 702f38dbee
commit a49c62d79b
11 changed files with 163 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/common/main/lib/component/ComboBoxFonts.js
View File

@ -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);

101
apps/common/main/resources/less/asc-mixins.less
View File

@ -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;

24
apps/common/main/resources/less/buttons.less
View File

@ -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);
}
}
}

15
apps/documenteditor/main/app/controller/DocumentHolder.js
View File

@ -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 = $('<div id="tip-container-eyedroppertip" style="position: absolute; z-index: 10000;"></div>');
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(),

15
apps/presentationeditor/main/app/controller/DocumentHolder.js
View File

@ -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 = $('<div id="tip-container-eyedroppertip" style="position: absolute; z-index: 10000;"></div>');
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(),

2
apps/presentationeditor/main/resources/less/toolbar.less
View File

@ -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
}

4
apps/spreadsheeteditor/main/app/view/DocumentHolder.js
View File

@ -682,8 +682,8 @@ define([
var numFormatTemplate = _.template('<a id="<%= id %>" tabindex="-1" type="menuitem">'+
'<div style="position: relative;">'+
'<div style="position: absolute; left: 0; width: 100px;"><%= caption %></div>' +
'<label style="width: 100%; max-width: 300px; overflow: hidden; text-overflow: ellipsis; text-align: right; vertical-align: bottom; padding-left: 100px; color: silver;cursor: pointer;"><%= options.exampleval ? options.exampleval : "" %></label>' +
'<div style="position: absolute; left: 0; width: 125px;"><%= caption %></div>' +
'<label style="width: 100%; max-width: 300px; overflow: hidden; text-overflow: ellipsis; text-align: right; vertical-align: bottom; padding-left: 125px; color: silver;cursor: pointer;"><%= options.exampleval ? options.exampleval : "" %></label>' +
'</div></a>');
me.pmiNumFormat = new Common.UI.MenuItem({

1
apps/spreadsheeteditor/main/index_internal.html
View File

@ -216,6 +216,7 @@
<script src="../../../vendor/svg-injector/svg-injector.min.js"></script>
<!--<img class="inline-svg" src="../../common/main/resources/img/header/buttons.svg">-->
<img class="inline-svg" src="../../common/main/resources/img/toolbar/charttypes.svg">
<img class="inline-svg" src="resources/img/toolbar/BorderSize.svg">
<div class="inlined-svg"></div>
<script>
var svgpoints = document.querySelectorAll('img.inline-svg');

1
apps/spreadsheeteditor/main/index_internal.html.deploy
View File

@ -233,6 +233,7 @@
<!--<inline src="../../common/main/resources/img/header/buttons.svg" />-->
<inline src="../../common/main/resources/img/toolbar/charttypes.svg" />
<inline src="resources/img/toolbar/BorderSize.svg" />
<div class="inlined-svg"></div>
<script data-main="app" src="../../../vendor/requirejs/require.js"></script>

6
apps/spreadsheeteditor/main/resources/less/advanced-settings.less
View File

@ -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;
}
}
}

2
apps/spreadsheeteditor/main/resources/less/toolbar.less
View File

@ -286,7 +286,7 @@
.rtl & {
text-align: left;
padding-left: 0;
padding-right: 100px;
padding-right: 125px;
}
}
}