diff --git a/apps/common/main/lib/template/AutoCorrectDialog.template b/apps/common/main/lib/template/AutoCorrectDialog.template index 1afb35db7d..d4cf089402 100644 --- a/apps/common/main/lib/template/AutoCorrectDialog.template +++ b/apps/common/main/lib/template/AutoCorrectDialog.template @@ -113,7 +113,7 @@ -
+
diff --git a/apps/common/main/lib/view/InsertTableDialog.js b/apps/common/main/lib/view/InsertTableDialog.js index 7dd30a2a4e..e6a667e50e 100644 --- a/apps/common/main/lib/view/InsertTableDialog.js +++ b/apps/common/main/lib/view/InsertTableDialog.js @@ -63,10 +63,10 @@ define([ this.template = [ '
', '
', - '
', + '
', '
', '
', - '
', + '
', '
', '
' ].join(''); diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 09be4dfb85..5793742723 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -322,6 +322,14 @@ opacity: @component-disabled-opacity; pointer-events: none; } + + .rtl & { + padding: 0 6px 0 8px; + .caption { + margin-left: 8px; + margin-right: -26px; + } + } } .btn-header-share { @@ -463,6 +471,27 @@ max-width: 200px; .font-weight-bold(); } + + .rtl & { + text-align: right; + } + } + } + + #tlb-users-menu-descr { + width: 100%; + text-align: left; + .rtl & { + text-align: right; + } + } + + .rtl & { + &.dropdown-menu { + left: unset; + right: 100%; + margin-left: 0; + margin-right: -285px; } } } diff --git a/apps/documenteditor/main/app/template/ShapeSettings.template b/apps/documenteditor/main/app/template/ShapeSettings.template index 4bb69cbac6..329ea46c79 100644 --- a/apps/documenteditor/main/app/template/ShapeSettings.template +++ b/apps/documenteditor/main/app/template/ShapeSettings.template @@ -26,7 +26,7 @@
-
+
@@ -44,11 +44,11 @@
-
+
-
+
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") { %>', - '
', + '
', '
', '
', '<% } %>', @@ -204,7 +204,7 @@ define([ '<% _.each(rows, function(row) { %>', '<% _.each(row, function(item) { %>', '<% if (item.type!==Asc.c_oAscFileType.DOCM || fileType=="docm") { %>', - '
', + '
', '
', '
', '<% } %>', diff --git a/apps/documenteditor/main/app/view/Links.js b/apps/documenteditor/main/app/view/Links.js index fa7ebc4975..ef86e0e1fe 100644 --- a/apps/documenteditor/main/app/view/Links.js +++ b/apps/documenteditor/main/app/view/Links.js @@ -337,9 +337,9 @@ define([ '<% if(!_.isUndefined(options.stopPropagation)) { %>', 'data-stopPropagation="true"', '<% } %>', '>', - '', - '', - '', + '', + '', + '', '
' ].join('')) : _.template([ @@ -347,9 +347,9 @@ define([ '<% if(!_.isUndefined(options.stopPropagation)) { %>', 'data-stopPropagation="true"', '<% } %>', '>', - '', - '', - '', + '', + '', + '', '
' ].join('')), stopPropagation: true @@ -360,9 +360,9 @@ define([ '<% if(!_.isUndefined(options.stopPropagation)) { %>', 'data-stopPropagation="true"', '<% } %>', '>', - '', - '', - '', + '', + '', + '', '
' ].join('')) : _.template([ @@ -370,9 +370,9 @@ define([ '<% if(!_.isUndefined(options.stopPropagation)) { %>', 'data-stopPropagation="true"', '<% } %>', '>', - '', - '', - '', + '', + '', + '', '
' ].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 @@
-
+
-
+
@@ -61,7 +61,7 @@
-
+
@@ -108,7 +108,7 @@
-
+
@@ -151,7 +151,7 @@
-
+
diff --git a/apps/presentationeditor/main/app/template/SlideSettings.template b/apps/presentationeditor/main/app/template/SlideSettings.template index 91ec7097c5..a0a67a22c3 100644 --- a/apps/presentationeditor/main/app/template/SlideSettings.template +++ b/apps/presentationeditor/main/app/template/SlideSettings.template @@ -26,7 +26,7 @@
-
+
@@ -44,11 +44,11 @@
-
+
-
+
@@ -61,7 +61,7 @@
-
+
@@ -108,7 +108,7 @@
-
+
diff --git a/apps/presentationeditor/main/app/template/StatusBar.template b/apps/presentationeditor/main/app/template/StatusBar.template index f2f8702953..de1ae76086 100644 --- a/apps/presentationeditor/main/app/template/StatusBar.template +++ b/apps/presentationeditor/main/app/template/StatusBar.template @@ -6,11 +6,11 @@
-