-
-
-
+
+
+
-
+
-
+
diff --git a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js
index 61f20633cb..eebece6bbd 100644
--- a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js
+++ b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js
@@ -2123,8 +2123,8 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
ShowHideSpacing: function(spacing) {
this.BordersContainer.toggleClass('settings-hidden', spacing);
this.BordersSpacingContainer.toggleClass('settings-hidden', !spacing);
- this.TableBackContainer.css('display', (!spacing && !this._allTable) ? 'none' : 'inline-block');
- this.CellBackContainer.css('display', (!spacing && this._allTable) ? 'none' : 'inline-block');
+ this.TableBackContainer.css('display', (!spacing && !this._allTable) ? 'none' : 'flex');
+ this.CellBackContainer.css('display', (!spacing && this._allTable) ? 'none' : 'flex');
this.TableBackContainer.css('float', (!spacing && this._allTable) ? 'none' : 'right');
(spacing) ? this._UpdateBordersSpacing_() : this._UpdateBordersNoSpacing_();
},
diff --git a/apps/documenteditor/main/resources/less/advanced-settings.less b/apps/documenteditor/main/resources/less/advanced-settings.less
index 15a77b1bb6..279e7a389f 100644
--- a/apps/documenteditor/main/resources/less/advanced-settings.less
+++ b/apps/documenteditor/main/resources/less/advanced-settings.less
@@ -88,7 +88,29 @@
}
#id-adv-paragraph-borders {
+ .settings-wrap {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ }
+
+ #paragraphadv-combo-border-size {
+ width: 93px;
+ }
+
+ #paragraphadv-border-color-btn,
+ #paragraphadv-combo-border-size {
+ margin-left: 3px;
+
+ .rtl & {
+ margin-left: 0;
+ margin-right: 3px;
+ }
+ }
+
.border-color {
+ display: flex;
+ align-items: center;
padding-left: 20px;
.rtl & {
@@ -200,11 +222,34 @@
}
#id-adv-table-borders {
- .border-color {
- float: right;
+ .settings-wrap {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ }
+
+ #tableadv-combo-border-size {
+ width: 93px;
+ }
+
+ #tableadv-border-color-btn,
+ #tableadv-combo-border-size {
+ margin-left: 3px;
.rtl & {
- float: left;
+ margin-left: 0;
+ margin-right: 3px;
+ }
+ }
+
+ .border-color {
+ padding-left: 20px;
+ display: flex;
+ align-items: center;
+
+ .rtl & {
+ padding-left: 0;
+ padding-right: 20px;
}
}
@@ -235,6 +280,12 @@
margin-left: 5px;
}
}
+
+ #tableadv-panel-cell-back,
+ #tableadv-panel-table-back {
+ display: flex;
+ align-items: center;
+ }
}
#id-adv-table-wrap {
diff --git a/apps/spreadsheeteditor/main/app/template/SlicerSettingsAdvanced.template b/apps/spreadsheeteditor/main/app/template/SlicerSettingsAdvanced.template
index a2b2768107..befc43effd 100644
--- a/apps/spreadsheeteditor/main/app/template/SlicerSettingsAdvanced.template
+++ b/apps/spreadsheeteditor/main/app/template/SlicerSettingsAdvanced.template
@@ -12,13 +12,13 @@