diff --git a/apps/common/main/resources/less/history.less b/apps/common/main/resources/less/history.less index 3b3bcd74f8..860112c85b 100644 --- a/apps/common/main/resources/less/history.less +++ b/apps/common/main/resources/less/history.less @@ -26,6 +26,11 @@ background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; } + + .rtl & { + padding-left: 0; + padding-right: 20px; + } } } @@ -47,6 +52,11 @@ .font-size-large(); cursor: pointer; + .rtl & { + padding-left: 0; + padding-right: 20px; + } + &:hover { background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; @@ -96,6 +106,10 @@ color: @text-normal; text-overflow: ellipsis; + .rtl & { + padding: 10px 20px 15px 2px; + } + .user-date { display: inline-block; .font-size-medium(); @@ -103,6 +117,11 @@ margin-right: 12px; white-space: nowrap; overflow: hidden; + + .rtl & { + margin-right: 0; + margin-left: 12px; + } } .user-version { @@ -132,6 +151,11 @@ cursor: pointer; text-overflow: ellipsis; padding-right: 35px; + + .rtl & { + padding-right: 0; + padding-left: 35px; + } } .color { @@ -141,6 +165,10 @@ border: @scaled-one-px-value solid @border-toolbar; margin: 0 5px 3px 0; vertical-align: middle; + + .rtl & { + margin: 0 0 3px 5px; + } } .revision-expand { @@ -158,6 +186,11 @@ //transition: transform 0.2s ease; transform: rotate(-135deg) ; + .rtl & { + right: auto; + left: 2px; + } + &.up { transform: rotate(45deg); } diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index c265f3589a..6262d30093 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -174,16 +174,28 @@ #slot-field-fontname { float: left; width: 84px; + .rtl & { + float: right; + } } #slot-field-fontsize { float: left; width: 45px; margin-left: 2px; + .rtl & { + float: right; + margin-left: 0; + margin-right: 2px; + } } #slot-btn-incfont, #slot-btn-decfont, #slot-btn-changecase { margin-left: 2px; + .rtl & { + margin-left: 0; + margin-right: 2px; + } } #special-paste-container, diff --git a/apps/presentationeditor/main/app/template/Toolbar.template b/apps/presentationeditor/main/app/template/Toolbar.template index 5571fe19d4..20816ea537 100644 --- a/apps/presentationeditor/main/app/template/Toolbar.template +++ b/apps/presentationeditor/main/app/template/Toolbar.template @@ -52,8 +52,8 @@
- - + + diff --git a/apps/presentationeditor/main/app/view/DocumentPreview.js b/apps/presentationeditor/main/app/view/DocumentPreview.js index 6c053338da..04285bc93c 100644 --- a/apps/presentationeditor/main/app/view/DocumentPreview.js +++ b/apps/presentationeditor/main/app/view/DocumentPreview.js @@ -69,17 +69,17 @@ define([ this.template = [ '
', - '
', + '
', '
', - '', + !Common.UI.isRTL() ? '' : '', '', - '', + !Common.UI.isRTL() ? '' : '', '
', '
', '
', '', '', '
', diff --git a/apps/presentationeditor/main/resources/less/document-preview.less b/apps/presentationeditor/main/resources/less/document-preview.less index 81733da17b..623a86eb6f 100644 --- a/apps/presentationeditor/main/resources/less/document-preview.less +++ b/apps/presentationeditor/main/resources/less/document-preview.less @@ -8,6 +8,8 @@ height: 35px; z-index: 10; opacity: 0.2; + position: absolute; + bottom: 0; &:hover { opacity: 1 !important; @@ -30,9 +32,21 @@ #btn-preview-prev { margin-left: 10px; + .rtl & { + margin-left: 0; + } + } + #btn-preview-next { + .rtl & { + margin-right: 10px; + } } #btn-preview-close { margin-right: 10px; + .rtl & { + margin-right: 0; + margin-left: 10px; + } } .separator { @@ -47,10 +61,22 @@ margin-left: 80px; margin-bottom: 2px; min-width: 130px; + .rtl & { + margin-left: 0; + margin-right: 80px; + } > label { - display: inline-block; - margin-right: 10px; + display: inline-block; + line-height:22px; + margin-right: 10px; + float: left; + + .rtl & { + margin-right: 0; + margin-left: 10px; + float: right; + } } > input[type=text] { diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less index c601d2feb4..40670f329c 100644 --- a/apps/presentationeditor/main/resources/less/toolbar.less +++ b/apps/presentationeditor/main/resources/less/toolbar.less @@ -125,4 +125,29 @@ #slot-btn-incfont, #slot-btn-decfont, #slot-btn-changecase { margin-left: 2px; + .rtl & { + margin-left: 0; + margin-right: 2px; + } +} + +#slot-field-fontname { + width: 89px; + float: left; + + .rtl & { + float: right; + } +} + +#slot-field-fontsize { + width: 40px; + float: left; + margin-left: 2px; + + .rtl & { + float: right; + margin-left: 0; + margin-right: 2px; + } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less index fb53707d43..914b757f9d 100644 --- a/apps/spreadsheeteditor/main/resources/less/toolbar.less +++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less @@ -22,10 +22,18 @@ .font-attr { > .btn-slot:not(:last-child):not(.split) { margin-right: 2px; + .rtl & { + margin-right: 0; + margin-left: 2px; + } } > .btn-slot.split:not(:last-child) { margin-right: 2px; + .rtl & { + margin-right: 0; + margin-left: 2px; + } } } @@ -34,9 +42,16 @@ > .btn-slot { float: left; + .rtl & { + float: right; + } &:not(:first-child) { margin-left: 2px; + .rtl & { + margin-left: 0; + margin-right: 2px; + } } }