diff --git a/apps/documenteditor/main/app/template/StatusBar.template b/apps/documenteditor/main/app/template/StatusBar.template
index fd8805d1d3..cea4290bab 100644
--- a/apps/documenteditor/main/app/template/StatusBar.template
+++ b/apps/documenteditor/main/app/template/StatusBar.template
@@ -3,7 +3,7 @@
diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js
index 83450ac78f..cc26f2bb31 100644
--- a/apps/documenteditor/main/app/view/FileMenuPanels.js
+++ b/apps/documenteditor/main/app/view/FileMenuPanels.js
@@ -80,7 +80,7 @@ define([
'<% _.each(rows, function(row) { %>',
'<% _.each(row, function(item) { %>',
'<% if (item.type!==Asc.c_oAscFileType.DOCM || fileType=="docm") { %>',
- '
'
].join('')),
stopPropagation: true
diff --git a/apps/documenteditor/main/resources/less/advanced-settings.less b/apps/documenteditor/main/resources/less/advanced-settings.less
index fc8cc03819..c071b4ee87 100644
--- a/apps/documenteditor/main/resources/less/advanced-settings.less
+++ b/apps/documenteditor/main/resources/less/advanced-settings.less
@@ -23,6 +23,19 @@
background-position: @menu-check-offset-x @menu-check-offset-y;
}
}
+
+ .rtl & {
+ padding-right:16px;
+ padding-left: 5px;
+
+ &.checked {
+ &:before {
+ float: right;
+ margin-left: 0;
+ margin-right: -18px;
+ }
+ }
+ }
}
padding-right: 6px;
@@ -31,6 +44,11 @@
text-overflow: ellipsis;
overflow: hidden;
white-space: pre;
+
+ .rtl & {
+ padding-right: 0;
+ padding-left: 6px;
+ }
}
}
diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less
index 62eb8160af..9841c4ce59 100644
--- a/apps/documenteditor/main/resources/less/filemenu.less
+++ b/apps/documenteditor/main/resources/less/filemenu.less
@@ -124,11 +124,9 @@
.format-items {
.format-item {
- float: left;
margin: 0 24px 34px 0;
.rtl & {
- float: right;
margin: 0 0 34px 24px;
}
diff --git a/apps/documenteditor/main/resources/less/rightmenu.less b/apps/documenteditor/main/resources/less/rightmenu.less
index 4a41474114..7bcfef6a29 100644
--- a/apps/documenteditor/main/resources/less/rightmenu.less
+++ b/apps/documenteditor/main/resources/less/rightmenu.less
@@ -186,20 +186,10 @@
border: 1px solid #AFAFAF;
border-radius: 2px;
background: #ffffff;
- float:right;
-
- .rtl & {
- float: left;
- }
}
#shape-foreground-color-btn, #shape-background-color-btn {
display: inline-block;
- float:right;
-
- .rtl & {
- float: left;
- }
}
}
diff --git a/apps/documenteditor/main/resources/less/statusbar.less b/apps/documenteditor/main/resources/less/statusbar.less
index 346cad9008..91e5511233 100644
--- a/apps/documenteditor/main/resources/less/statusbar.less
+++ b/apps/documenteditor/main/resources/less/statusbar.less
@@ -142,12 +142,10 @@
> label {
display: inline-block;
margin-right: 10px;
- float:left;
line-height:22px;
.rtl & {
margin-right: 0;
margin-left: 10px;
- float: right;
}
}
diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less
index 20b2b248ce..47193f0705 100644
--- a/apps/documenteditor/main/resources/less/toolbar.less
+++ b/apps/documenteditor/main/resources/less/toolbar.less
@@ -109,38 +109,25 @@
line-height: @line-height-base;
.title {
padding: 5px 5px 5px 20px;
- float: left;
//max-width: 95px;
overflow: hidden;
text-overflow: ellipsis;
.rtl & {
- float: right;
padding: 5px 20px 5px 5px;
}
}
- .zoom {
- padding: 5px 3px;
- float: right;
- min-width: 40px;
- text-align: center;
- }
-
.btn.next {
- float: right;
margin: 2px 5px 0 0;
.rtl & {
- float: left;
margin: 2px 0 0 0 !important;
}
}
.btn.prev {
- float: right;
margin-top: 2px;
.rtl & {
- float: left;
margin: 2px 0 0 5px;
}
}
diff --git a/apps/presentationeditor/main/app/template/ShapeSettings.template b/apps/presentationeditor/main/app/template/ShapeSettings.template
index 8806dd0a10..b3e05d4445 100644
--- a/apps/presentationeditor/main/app/template/ShapeSettings.template
+++ b/apps/presentationeditor/main/app/template/ShapeSettings.template
@@ -26,7 +26,7 @@
- |
@@ -44,11 +44,11 @@
-
+
-
+