Skip to content

Commit

Permalink
Merge pull request 'fix bug 70451' (#82) from fix/bug-70451 into hotf…
Browse files Browse the repository at this point in the history 
…ix/v8.2.1
  • Loading branch information
Julia Radzhabova committed Oct 21, 2024
2 parents 9fbda96 + 7b6a3e1 commit 11b3381
Show file tree
Hide file tree
Showing 11 changed files with 204 additions and 92 deletions.
2 changes: 1 addition & 1 deletion apps/common/main/lib/component/MenuItem.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ define([
tagName : 'li',

template: _.template([
'<a id="<%= id %>" class="menu-item" style="<%= style %>" <% if(options.canFocused) { %> tabindex="-1" type="menuitem" <% }; if(!_.isUndefined(options.stopPropagation)) { %> data-stopPropagation="true" <% }; if(!_.isUndefined(options.dataHint)) { %> data-hint="<%= options.dataHint %>" <% }; if(!_.isUndefined(options.dataHintDirection)) { %> data-hint-direction="<%= options.dataHintDirection %>" <% }; if(!_.isUndefined(options.dataHintOffset)) { %> data-hint-offset="<%= options.dataHintOffset %>" <% }; if(options.dataHintTitle) { %> data-hint-title="<%= options.dataHintTitle %>" <% }; %> >',
'<a id="<%= id %>" class="menu-item" <% if (_.isEmpty(iconCls)) { %> data-no-icon <% } %> style="<%= style %>" <% if(options.canFocused) { %> tabindex="-1" type="menuitem" <% }; if(!_.isUndefined(options.stopPropagation)) { %> data-stopPropagation="true" <% }; if(!_.isUndefined(options.dataHint)) { %> data-hint="<%= options.dataHint %>" <% }; if(!_.isUndefined(options.dataHintDirection)) { %> data-hint-direction="<%= options.dataHintDirection %>" <% }; if(!_.isUndefined(options.dataHintOffset)) { %> data-hint-offset="<%= options.dataHintOffset %>" <% }; if(options.dataHintTitle) { %> data-hint-title="<%= options.dataHintTitle %>" <% }; %> >',
'<% if (!_.isEmpty(iconCls)) { %>',
'<span class="menu-item-icon <%= iconCls %>"></span>',
'<% } else if (!_.isEmpty(iconImg)) { %>',
Expand Down
8 changes: 4 additions & 4 deletions apps/common/main/lib/view/DocumentPropertyDialog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@ define([], function () { 'use strict';
}, options);

this.template = [
'<div style="display: flex; flex-direction: column; margin: 0 20px; gap: 10px;">',
'<div>',
'<div style="display: flex; flex-direction: column; margin: 0 20px;">',
'<div style="margin-bottom: 10px;flex-shrink:0;">',
'<label>' + this.txtPropertyTitleLabel + '</label>',
'<div id="id-dlg-title"></div>',
'</div>',
'<div>',
'<div style="margin-bottom: 10px;flex-shrink:0;">',
'<label>' + this.txtPropertyTypeLabel + '</label>',
'<div id="id-dlg-type"></div>',
'</div>',
'<div>',
'<div style="flex-shrink:0;">',
'<label>' + this.txtPropertyValueLabel + '</label>',
'<div id="id-dlg-value-input"></div>',
'<div id="id-dlg-value-date"></div>',
Expand Down
19 changes: 12 additions & 7 deletions apps/common/main/resources/less/common.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@ label {
background-color: @background-toolbar;
display: flex;
flex-direction: column;
gap: 4px;
padding: 15px 0 24px;

.rtl & {
Expand All @@ -222,6 +221,7 @@ label {
list-style: none;
position: relative;
flex-shrink: 0;
margin-bottom: 4px;

&.fm-btn {
height: 28px;
Expand Down Expand Up @@ -249,7 +249,8 @@ label {
}

.menu-item-icon {
background-position-x: var(--button-small-active-icon-offset-x, 0);
background-position-x: -20px;
background-position-x: @button-small-active-icon-offset-x;
}

svg.menu-item-icon {
Expand All @@ -268,12 +269,12 @@ label {
&.devider {
.dropdown-menu .divider;
margin-top: 10px;
margin-bottom: 10px;
margin-bottom: 14px;
}

&.devider-small {
margin-top: 7px;
margin-bottom: 7px;
margin-bottom: 11px;
}

&.devider-last {
Expand All @@ -287,7 +288,8 @@ label {
line-height: 20px;
position: relative;
&:not(:disabled) {
opacity: var(--component-normal-icon-opacity, 0.8);
opacity: 0.8;
opacity: @component-normal-icon-opacity;
}
}

Expand All @@ -303,7 +305,6 @@ label {
padding:0;
display: flex;
align-items: center;
gap: 8px;
overflow: hidden;
text-overflow: ellipsis;
font-size: 12px;
Expand All @@ -317,7 +318,11 @@ label {
outline: 0;
}

&:not(:has(.menu-item-icon)) {
.menu-item-icon {
.margin-right-8();
}

&[data-no-icon] {
.padding-left-28();
}
}
Expand Down
16 changes: 7 additions & 9 deletions apps/documenteditor/main/app/view/FileMenuPanels.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1457,19 +1457,17 @@ define([], function () {
'<td class="right"><div id="id-info-comment"></div></td>',
'</tr>',
'</tbody>',
'</table>',
'<div id="fms-flex-add-property">',
'<table class="main">',
'<tr style="gap: 20px;">',
'<tbody>',
'<tr>',
'<td class="left"></td>',
'<td class="right">',
'<button id="fminfo-btn-add-property" class="btn" data-hint="2" data-hint-direction="bottom" data-hint-offset="big">',
'<span>' + this.txtAddProperty + '</span>',
'</button>',
'<button id="fminfo-btn-add-property" class="btn" data-hint="2" data-hint-direction="bottom" data-hint-offset="big">',
'<span>' + this.txtAddProperty + '</span>',
'</button>',
'</td>',
'</tr>',
'</table>',
'</div>',
'</tbody>',
'</table>'
].join(''));

this.infoObj = {PageCount: 0, WordsCount: 0, ParagraphCount: 0, SymbolsCount: 0, SymbolsWSCount:0};
Expand Down
39 changes: 23 additions & 16 deletions apps/documenteditor/main/resources/less/filemenu.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,13 +194,7 @@

#panel-info {
#file-menu-panel & {
padding: 30px;

.flex-settings {
gap: 30px;
display: flex;
flex-direction: column;
}
padding: 0 30px;
}

.header {
Expand All @@ -209,14 +203,17 @@
line-height: unset;
}

table.main {
margin: 30px 0 18px;
}

table {
display: flex;
gap: 24px;
flex-direction: column;

tr {
display: flex;
gap: 24px;
margin-bottom: 12px;

td {
.font-size-normal();
Expand All @@ -232,8 +229,10 @@
}

&.left {
display: block;
width: 140px;
flex-shrink: 0;
.margin-right(24px);
}

&.right {
Expand All @@ -248,14 +247,17 @@

tbody {
display: flex;
gap: 12px;
flex-direction: column;

&:not(:last-of-type) {
margin-bottom: 12px;
}

&.properties-tab {
gap: 10px;
margin-bottom: 0;

tr {
gap: 20px;
margin-bottom: 10px;
}

td {
Expand All @@ -265,6 +267,7 @@
td.left {
display: flex;
align-items: center;
.margin-right-20();

label {
text-overflow: ellipsis;
Expand All @@ -284,8 +287,10 @@
}

display: flex;
gap: 5px;
align-items: center;
& > *:not(:last-child) {
.margin-right-5();
}
}
}

Expand All @@ -312,15 +317,17 @@
height: 24px;

span {
text-decoration: underline dotted;
text-underline-offset: 4px;
border-bottom: 1px dotted currentColor;
padding-bottom: 2px;
}
}

.custom-property-wrapper {
display: flex;
gap: 5px;
align-items: center;
& > *:not(:last-child) {
.margin-right-5();
}
}

.tool.close:before, .tool.close:after {
Expand Down
14 changes: 6 additions & 8 deletions apps/pdfeditor/main/app/view/FileMenuPanels.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1234,20 +1234,18 @@ define([], function () {
'<td class="right"><label id="id-info-page-size"></label></td>',
'</tr>',
'</tbody>',
'<tbody>',
'<tr>',
'<td class="left"></td>',
'<td class="right"><button id="fminfo-btn-apply" class="btn normal dlg-btn primary" data-hint="2" data-hint-direction="bottom" data-hint-offset="big"><%= scope.okButtonText %></button></td>',
'</tr>',
'</tbody>',
// '<tr>',
// '<td class="left"><label>' + this.txtEditTime + '</label></td>',
// '<td class="right"><label id="id-info-edittime"></label></td>',
// '</tr>',
'</table>',
'</div>',
'<div id="fms-flex-apply">',
'<table class="main">',
'<tr>',
'<td class="left"></td>',
'<td class="right"><button id="fminfo-btn-apply" class="btn normal dlg-btn primary" data-hint="2" data-hint-direction="bottom" data-hint-offset="big"><%= scope.okButtonText %></button></td>',
'</tr>',
'</table>',
'</div>'
].join(''));

this.infoObj = {PageCount: 0, WordsCount: 0, ParagraphCount: 0, SymbolsCount: 0, SymbolsWSCount:0};
Expand Down
Loading

0 comments on commit 11b3381

Please sign in to comment.