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

[rtl] Fix toolbar in view and comment mode

Browse source
This commit is contained in:
JuliaSvinareva 2022-12-27 22:44:58 +03:00
parent a630e74c53
commit 727b344c89
3 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/common/main/lib/component/Mixtbar.js
View file

@ -56,7 +56,7 @@ define([
var onScrollTabs = function(opts, e) { var onScrollTabs = function(opts, e) {
var sv = $boxTabs.scrollLeft(); var sv = $boxTabs.scrollLeft();
if ( sv || opts == 'right' ) { if (sv || opts == 'right' || Common.UI.isRTL() && opts == 'left') {
$boxTabs.animate({scrollLeft: opts == 'left' ? sv - 100 : sv + 100}, 200); $boxTabs.animate({scrollLeft: opts == 'left' ? sv - 100 : sv + 100}, 200);
} }
}; };
@ -412,6 +412,7 @@ define([
if ( $active && $active.length ) { if ( $active && $active.length ) {
var _maxright = $active.parents('.box-controls').width(), var _maxright = $active.parents('.box-controls').width(),
_staticPanelWidth = $active.parents('.box-controls').find('.panel.static').outerWidth(); _staticPanelWidth = $active.parents('.box-controls').find('.panel.static').outerWidth();
if (!_staticPanelWidth) _staticPanelWidth = 0;
var data = $active.data(), var data = $active.data(),
_rightedge = data.rightedge, _rightedge = data.rightedge,
_btns = data.buttons, _btns = data.buttons,
@ -444,7 +445,6 @@ define([
if (_flex.length>0) { if (_flex.length>0) {
for (var i=0; i<_flex.length; i++) { for (var i=0; i<_flex.length; i++) {
var item = _flex[i].el; var item = _flex[i].el;
//_rightedge = $active.get(0).getBoundingClientRect().right;
_rightedge = $active.outerWidth() + _staticPanelWidth; _rightedge = $active.outerWidth() + _staticPanelWidth;
if (item.outerWidth() > parseInt(item.css('min-width'))) { if (item.outerWidth() > parseInt(item.css('min-width'))) {
data.rightedge = _rightedge; data.rightedge = _rightedge;
@ -574,8 +574,9 @@ define([
var more_section_width = parseInt(more_section.css('width')) || 0, var more_section_width = parseInt(more_section.css('width')) || 0,
box_controls_width = $active.parents('.box-controls').width(), box_controls_width = $active.parents('.box-controls').width(),
_staticPanelWidth = $active.parents('.box-controls').find('.panel.static').outerWidth(), _staticPanelWidth = $active.parents('.box-controls').find('.panel.static').outerWidth(),
_maxright = box_controls_width, _maxright = box_controls_width;
_rightedge = $active.outerWidth() + _staticPanelWidth, if (!_staticPanelWidth) _staticPanelWidth = 0;
var _rightedge = $active.outerWidth() + _staticPanelWidth,
delta = (this._prevBoxWidth) ? (_maxright - this._prevBoxWidth) : -1, delta = (this._prevBoxWidth) ? (_maxright - this._prevBoxWidth) : -1,
hideAllMenus = false; hideAllMenus = false;
this._prevBoxWidth = _maxright; this._prevBoxWidth = _maxright;

2
apps/common/main/lib/controller/Plugins.js
View file

@ -263,7 +263,7 @@ define([
} else { } else {
_group.appendTo(me.$toolbarPanelPlugins); _group.appendTo(me.$toolbarPanelPlugins);
$('<div class="separator long invisible"></div>').appendTo(me.$toolbarPanelPlugins); $('<div class="separator long invisible"></div>').appendTo(me.$toolbarPanelPlugins);
_group = $('<div class="group" style="padding-left: 0;"></div>'); _group = $('<div class="group" style="' + (Common.UI.isRTL() ? 'padding-right: 0;' : 'padding-left: 0;') + '"></div>');
} }
var btn = me.panelPlugins.createPluginButton(model); var btn = me.panelPlugins.createPluginButton(model);

10
apps/common/main/resources/less/toolbar.less
View file

@ -169,6 +169,11 @@
&:after { &:after {
transform: rotate(135deg); transform: rotate(135deg);
margin-left: 8px; margin-left: 8px;
.rtl & {
margin-left: 0;
margin-right: 4px;
}
} }
} }
&.right{ &.right{
@ -178,6 +183,11 @@
&:after { &:after {
transform: rotate(-45deg); transform: rotate(-45deg);
margin-left: 4px; margin-left: 4px;
.rtl & {
margin-left: 0;
margin-right: 8px;
}
} }
} }