diff --git a/apps/common/main/resources/less/advanced-settings-window.less b/apps/common/main/resources/less/advanced-settings-window.less index 2cfd6bbf6..a813e5f4a 100644 --- a/apps/common/main/resources/less/advanced-settings-window.less +++ b/apps/common/main/resources/less/advanced-settings-window.less @@ -22,6 +22,11 @@ line-height: normal; height: auto; white-space: normal; + + .rtl & { + text-align: right; + padding: 9px 12px 9px 2px; + } } } diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less index 5ba0d02e7..4ccc6286d 100644 --- a/apps/common/main/resources/less/window.less +++ b/apps/common/main/resources/less/window.less @@ -256,6 +256,11 @@ button { &:not(:first-child) { margin-left: 10px; + + .rtl & { + margin-left: 0; + margin-right: 10px; + } } } } @@ -314,6 +319,11 @@ button { &:not(:first-child) { margin-left: 10px; + + .rtl & { + margin-left: 0; + margin-right: 10px; + } } } } diff --git a/apps/documenteditor/main/app/template/ImageSettingsAdvanced.template b/apps/documenteditor/main/app/template/ImageSettingsAdvanced.template index 8af0473dc..47630167d 100644 --- a/apps/documenteditor/main/app/template/ImageSettingsAdvanced.template +++ b/apps/documenteditor/main/app/template/ImageSettingsAdvanced.template @@ -41,7 +41,7 @@
- +
@@ -68,7 +68,7 @@
- +
@@ -94,7 +94,7 @@
-
+
@@ -102,7 +102,7 @@ - @@ -135,7 +135,7 @@ - @@ -143,7 +143,7 @@ - @@ -156,7 +156,7 @@
-
+
@@ -166,7 +166,7 @@
-
+
@@ -181,11 +181,11 @@
-
+
-
+
@@ -200,8 +200,8 @@
- - + +
@@ -213,7 +213,7 @@
-
+
@@ -223,7 +223,7 @@
-
+
diff --git a/apps/documenteditor/main/app/template/TableSettingsAdvanced.template b/apps/documenteditor/main/app/template/TableSettingsAdvanced.template index ad82ecbe2..1b1c8edc4 100644 --- a/apps/documenteditor/main/app/template/TableSettingsAdvanced.template +++ b/apps/documenteditor/main/app/template/TableSettingsAdvanced.template @@ -12,7 +12,7 @@
- +
@@ -120,14 +120,14 @@
-
-
-
-
+
+
+
+
-
-
+
+
diff --git a/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template b/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template index 22de247ca..e955e7855 100644 --- a/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template +++ b/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template @@ -5,18 +5,18 @@
-
+
-
+
+ -->
-
+
+ -->
@@ -92,7 +92,7 @@
-
+
@@ -100,7 +100,7 @@
-
+
@@ -112,7 +112,7 @@
- +
@@ -127,7 +127,7 @@
+
+
+
-
+
@@ -88,7 +88,7 @@ -
+
@@ -147,18 +147,18 @@
-
-
+
+
-
-
-
-
+
+
+
+
@@ -200,7 +200,7 @@
-
+
@@ -210,7 +210,7 @@
-
+
@@ -236,7 +236,7 @@
- +
diff --git a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js index 2fd57511c..f31d45750 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js @@ -411,7 +411,6 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem _.each(_arrBorderPresets, function(item, index, list){ var _btn = new Common.UI.Button({ parentEl: $('#'+item[2]), - style: 'margin-left: 4px; margin-bottom: 4px;', cls: 'btn-options large border-off', iconCls: item[1], strId :item[0], diff --git a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js index 87ce9d700..4b59cc5de 100644 --- a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js @@ -948,7 +948,6 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat _.each(_arrBorderPresets, function(item, index, list){ var _btn = new Common.UI.Button({ parentEl: $('#'+item[2]), - style: 'margin-left: 4px; margin-bottom: 4px;', cls: 'btn-options large border-off', iconCls: item[1], strId :item[0], diff --git a/apps/documenteditor/main/resources/less/advanced-settings.less b/apps/documenteditor/main/resources/less/advanced-settings.less index 84d9d48f1..f937fc767 100644 --- a/apps/documenteditor/main/resources/less/advanced-settings.less +++ b/apps/documenteditor/main/resources/less/advanced-settings.less @@ -72,4 +72,235 @@ #id-text-table-spn-fixed, #bookmarks-radio-location { display: inline-block; vertical-align: middle; +} + +#id-adv-paragraph-indents { + .outline-level { + float: right; + + .rtl & { + float: left; + } + } + + .margin-right { + margin-right: 3px; + + .rtl & { + margin-right: 0; + margin-left: 3px; + } + } +} + +#id-adv-paragraph-borders { + .border-color { + padding-left: 20px; + + .rtl & { + padding-left: 0; + padding-right: 20px; + } + } + + .back-color { + margin-right: 5px; + + .rtl & { + margin-right: 0; + margin-left: 5px; + } + } + + .border-types { + text-align: right; + margin-left: 9px; + + .rtl & { + text-align: left; + margin-left: 0; + margin-right: 9px; + } + + .btn { + margin-left: 4px; + margin-bottom: 4px; + + .rtl & { + margin-left: 0; + margin-right: 4px; + } + } + } +} + +#id-adv-paragraph-font { + .padding-left { + padding-left: 40px; + + .rtl & { + padding-left: 0; + padding-right: 40px; + } + } + + .position { + margin-left: 15px; + + .rtl & { + margin-left: 0; + margin-right: 15px; + } + } + + .ligatures { + margin-left: 5px; + + .rtl & { + margin-left: 0; + margin-right: 5px; + } + } +} + +#id-adv-paragraph-tabs { + .tab-position { + margin-right: 8px; + + .rtl & { + margin-right: 0; + margin-left: 8px; + } + } + + .margin-right { + margin-right: 9px; + + .rtl & { + margin-right: 0; + margin-left: 9px; + } + } +} + +#id-adv-paragraph-margins { + .padding-left { + padding-left: 15px; + + .rtl & { + padding-left: 0; + padding-right: 15px; + } + } +} + +#id-adv-table-width, #id-adv-table-cell-props { + .margin-right { + margin-right: 10px; + + .rtl & { + margin-right: 0; + margin-left: 10px; + } + } +} + +#id-adv-table-borders { + .border-color { + float: right; + + .rtl & { + float: left; + } + } + + .border-types { + padding-left: 10px; + + .rtl & { + padding-left: 0; + padding-right: 10px; + } + + .btn { + margin-left: 4px; + margin-bottom: 4px; + + .rtl & { + margin-left: 0; + margin-right: 4px; + } + } + } + + .back-color { + margin-right: 5px; + + .rtl & { + margin-right: 0; + margin-left: 5px; + } + } +} + +#id-adv-table-wrap { + .margin-right { + margin-right: 5px; + + .rtl & { + margin-right: 0; + margin-left: 5px; + } + } + + .number-indent { + margin-left: 20px; + + .rtl & { + margin-left: 0; + margin-right: 20px; + } + } +} + +#id-adv-image-rotate { + #image-advanced-spin-angle { + margin-left: 5px; + + .rtl & { + margin-left: 0; + margin-right: 5px; + } + } + + .flipped { + margin-right: 15px; + + .rtl & { + margin-right: 0; + margin-left: 15px; + } + } +} + +#id-adv-image-wrap { + .margin-right { + margin-right: 7px; + + .rtl & { + margin-right: 0; + margin-left: 7px; + } + } +} + +#id-adv-shape-size { + .padding-right { + padding-right: 15px; + + .rtl & { + padding-right: 0; + padding-left: 15px; + } + } } \ No newline at end of file