Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[rtl] Make dropdown menu

Browse source
This commit is contained in:
JuliaSvinareva 2022-10-04 16:41:46 +03:00
parent 9ecd26958a
commit 1fc88fb6c3
4 changed files with 53 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/common/main/resources/less/common.less
View file

@ -325,4 +325,22 @@ body {
.ps-scrollbar-y {
left: 0 !important;
}
}
.menu-margins {
.margin-vertical {
display: inline-block;
margin-right: 20px;
min-width: 80px;
.rtl & {
margin-right: 0;
margin-left: 20px;
}
}
.margin-horizontal {
display: inline-block;
}
label {
display: block;
}
}

18
apps/common/main/resources/less/dropdown-menu.less
View file

@ -80,6 +80,12 @@
float: left;
margin-left: -18px;
background-position: @menu-check-offset-x @menu-check-offset-y;
.rtl & {
float: right;
margin-left: 0;
margin-right: -18px;
}
}
&.custom-scale:before {
margin-top: 3px;
@ -99,6 +105,11 @@
margin: -2px 5px 0 -15px;
background-repeat: no-repeat;
opacity: @component-normal-icon-opacity;
.rtl & {
float: right;
margin: -2px -15px 0 5px;
}
}
.no-checkmark.checked {
@ -140,9 +151,16 @@
li {
& > a {
padding-left: 28px;
.rtl & {
padding-left: 20px;
padding-right: 28px;
}
}
.menu-item-icon {
margin: -2px 0 0 -24px;
.rtl & {
margin: -2px -24px 0 0;
}
}
.checked:not(.no-checkmark):before {
margin-left: -22px;

10
apps/common/main/resources/less/dropdown-submenu.less
View file

@ -27,6 +27,16 @@
border-left-color: @icon-normal;
margin-top: 5px;
margin-right: -7px;
.rtl & {
float: left;
margin-right: 0;
margin-left: -7px;
border-color: transparent;
border-width: 3px 3px 3px 0;
border-right-color: @icon-normal-ie;
border-right-color: @icon-normal;
}
}
&.over:not(.disabled) > .dropdown-menu {

12
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -1033,11 +1033,12 @@ define([
var pageMarginsTemplate = _.template('<a id="<%= id %>" tabindex="-1" type="menuitem"><div><b><%= caption %></b></div>' +
'<% if (options.value !== null) { %><div style="display: inline-block;margin-right: 20px;min-width: 80px;">' +
'<label style="display: block;">' + this.textTop + '<%= parseFloat(Common.Utils.Metric.fnRecalcFromMM(options.value[0]).toFixed(2)) %> <%= Common.Utils.Metric.getCurrentMetricName() %></label>' +
'<label style="display: block;">' + this.textLeft + '<%= parseFloat(Common.Utils.Metric.fnRecalcFromMM(options.value[1]).toFixed(2)) %> <%= Common.Utils.Metric.getCurrentMetricName() %></label></div><div style="display: inline-block;">' +
'<label style="display: block;">' + this.textBottom + '<%= parseFloat(Common.Utils.Metric.fnRecalcFromMM(options.value[2]).toFixed(2)) %> <%= Common.Utils.Metric.getCurrentMetricName() %></label>' +
'<label style="display: block;">' + this.textRight + '<%= parseFloat(Common.Utils.Metric.fnRecalcFromMM(options.value[3]).toFixed(2)) %> <%= Common.Utils.Metric.getCurrentMetricName() %></label></div>' +
'<% if (options.value !== null) { %><div class="margin-vertical">' +
'<label>' + this.textTop + '<%= parseFloat(Common.Utils.Metric.fnRecalcFromMM(options.value[0]).toFixed(2)) %> <%= Common.Utils.Metric.getCurrentMetricName() %></label>' +
'<label>' + this.textLeft + '<%= parseFloat(Common.Utils.Metric.fnRecalcFromMM(options.value[1]).toFixed(2)) %> <%= Common.Utils.Metric.getCurrentMetricName() %></label></div>' +
'<div class="margin-horizontal">' +
'<label>' + this.textBottom + '<%= parseFloat(Common.Utils.Metric.fnRecalcFromMM(options.value[2]).toFixed(2)) %> <%= Common.Utils.Metric.getCurrentMetricName() %></label>' +
'<label>' + this.textRight + '<%= parseFloat(Common.Utils.Metric.fnRecalcFromMM(options.value[3]).toFixed(2)) %> <%= Common.Utils.Metric.getCurrentMetricName() %></label></div>' +
'<% } %></a>');
this.btnPageMargins = new Common.UI.Button({
@ -1047,6 +1048,7 @@ define([
lock: [_set.docPropsLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart],
caption: me.capBtnMargins,
menu: new Common.UI.Menu({
cls: 'menu-margins',
items: [
{
caption: this.textMarginsLast,