diff --git a/apps/common/main/lib/template/ExtendedColorDialog.template b/apps/common/main/lib/template/ExtendedColorDialog.template index e7321fc99..65cda0513 100644 --- a/apps/common/main/lib/template/ExtendedColorDialog.template +++ b/apps/common/main/lib/template/ExtendedColorDialog.template @@ -2,7 +2,7 @@
-
+
diff --git a/apps/common/main/resources/less/extended-color-picker.less b/apps/common/main/resources/less/extended-color-picker.less index 92b809b6e..e082906e1 100644 --- a/apps/common/main/resources/less/extended-color-picker.less +++ b/apps/common/main/resources/less/extended-color-picker.less @@ -57,6 +57,10 @@ &:before { height: 64px; transform: translate(29px, -22px) rotate(73deg); + + .rtl & { + transform: translate(-29px, -22px) rotate(73deg); + } } } } @@ -78,4 +82,13 @@ } } } + + .color-preview { + margin-left: 15px; + + .rtl & { + margin-left: 0; + margin-right: 15px; + } + } } \ No newline at end of file diff --git a/apps/common/main/resources/less/hsb-colorpicker.less b/apps/common/main/resources/less/hsb-colorpicker.less index 526418eec..6f9987229 100644 --- a/apps/common/main/resources/less/hsb-colorpicker.less +++ b/apps/common/main/resources/less/hsb-colorpicker.less @@ -82,6 +82,12 @@ margin-left: calc(-3px - @scaled-one-px-value); position: absolute; background-position: -12px -196px; + + .rtl & { + margin-left: 0; + margin-right: -4px; + margin-right: calc(-3px - @scaled-one-px-value); + } } .empty-color { diff --git a/apps/documenteditor/main/app/view/ListSettingsDialog.js b/apps/documenteditor/main/app/view/ListSettingsDialog.js index debd1b0d4..1cc113b23 100644 --- a/apps/documenteditor/main/app/view/ListSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ListSettingsDialog.js @@ -72,11 +72,11 @@ define([ }, options || {}); this.template = [ - '
', + '
', '<% if (type == 2) { %>', '', '', - '', @@ -88,7 +88,7 @@ define([ '', '
', '', - '', @@ -97,7 +97,7 @@ define([ '<% } else {%>', '
', + '', '', '
', '
', + '', '', '
', '
', '', - '', - '', '', '', - '', - '', @@ -125,7 +125,7 @@ define([ '<% } %>', '
', + '', '<% if (type == 0) { %>', '', '', @@ -106,17 +106,17 @@ define([ '
', '<% } %>', '
', + '', '', '
', '
', + '', '', '
', '
', + '', '', '
', '
', '', - '', diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 62b029361..d73ef7729 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -2079,11 +2079,11 @@ define([ cls: 'shifted-left', style: 'min-width: 145px', items: [ - {template: _.template('')}, + {template: _.template('')}, {caption: '--'}, this.mnuMarkerChangeLevel = new Common.UI.MenuItem({ + cls: 'list-level', caption: this.textChangeLevel, - style: 'padding-right:20px;', disabled: (this.mnuMarkersPicker.conf.index || 0)==0, menu: new Common.UI.Menu({ cls: 'list-settings-level', @@ -2110,11 +2110,11 @@ define([ new Common.UI.Menu({ cls: 'shifted-left', items: [ - {template: _.template('')}, + {template: _.template('')}, {caption: '--'}, this.mnuNumberChangeLevel = new Common.UI.MenuItem({ + cls: 'list-level', caption: this.textChangeLevel, - style: 'padding-right:20px;', disabled: (this.mnuNumbersPicker.conf.index || 0)==0, menu: new Common.UI.Menu({ cls: 'list-settings-level', @@ -2141,11 +2141,11 @@ define([ cls: 'shifted-left', style: 'min-width: 177px', items: [ - {template: _.template('')}, + {template: _.template('')}, {caption: '--'}, this.mnuMultiChangeLevel = new Common.UI.MenuItem({ + cls: 'list-level', caption: this.textChangeLevel, - style: 'padding-right:20px;', disabled: (this.mnuMultilevelPicker.conf.index || 0)==0, menu: new Common.UI.Menu({ cls: 'list-settings-level', diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index 768d27e72..9d6fe4db8 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -217,3 +217,53 @@ } } } + +#id-toolbar-btn-markers, +#id-toolbar-btn-numbering, +#id-toolbar-btn-multilevels { + .menu-markers { + margin: 0 0 0 9px; + + .rtl & { + margin: 0 9px 0 0; + } + } + + .list-level > a { + padding-right: 20px; + + .rtl & { + padding-right: 12px; + padding-left: 20px; + } + } +} + +.list-settings { + .padding-right { + padding-right: 5px; + + .rtl & { + padding-right: 0; + padding-left: 5px; + } + } + + .padding-left { + padding-left: 5px; + + .rtl & { + padding-left: 0; + padding-right: 5px; + } + } + + .padding-right-big { + padding-right: 10px; + + .rtl & { + padding-right: 0; + padding-left: 10px; + } + } +} diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less index 3e9be97c1..14790def0 100644 --- a/apps/spreadsheeteditor/main/resources/less/toolbar.less +++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less @@ -222,6 +222,11 @@ .group-description { padding: 3px 0 3px 10px; .font-weight-bold(); + + .rtl & { + padding: 3px 10px 3px 0; + text-align: right; + } } .group-items-container {