-
-
+
+
-
+
-
diff --git a/apps/presentationeditor/main/app/view/Viewport.js b/apps/presentationeditor/main/app/view/Viewport.js
index fe746ac42f..b8976aa0c3 100644
--- a/apps/presentationeditor/main/app/view/Viewport.js
+++ b/apps/presentationeditor/main/app/view/Viewport.js
@@ -99,7 +99,8 @@ define([
stretch: true
}, {
el: items[3],
- height: 25
+ alias: 'statusbar',
+ height: parseInt(window.getComputedStyle(document.body).getPropertyValue('--statusbar-height'))
}]
});
diff --git a/apps/presentationeditor/main/resources/less/app.less b/apps/presentationeditor/main/resources/less/app.less
index 3959530052..bc47300314 100644
--- a/apps/presentationeditor/main/resources/less/app.less
+++ b/apps/presentationeditor/main/resources/less/app.less
@@ -128,6 +128,7 @@
@import "../../../../common/main/resources/less/updown-picker.less";
@import "../../../../common/main/resources/less/calendar.less";
@import "../../../../common/main/resources/less/macros-dialog.less";
+@import "../../../../common/main/resources/less/statusbar.less";
// App
// --------------------------------------------------
diff --git a/apps/presentationeditor/main/resources/less/statusbar.less b/apps/presentationeditor/main/resources/less/statusbar.less
index 512489e57d..6df8b8f86c 100644
--- a/apps/presentationeditor/main/resources/less/statusbar.less
+++ b/apps/presentationeditor/main/resources/less/statusbar.less
@@ -1,7 +1,5 @@
-@statusbar-height: 25px;
+@statusbar-height: var(--statusbar-height, 25px);
.statusbar {
- display: table;
- padding: 2px;
.status-label {
position: relative;
@@ -20,9 +18,7 @@
}
.status-group {
- display: table-cell;
white-space: nowrap;
- vertical-align: top;
&.dropup {
position: static;
}
@@ -58,7 +54,6 @@
.cnt-zoom {
display: inline-block;
vertical-align: middle;
- margin-top: 4px;
.dropdown-menu {
min-width: 80px;
.margin-left(-4px);
@@ -90,8 +85,4 @@
display: inline-block;
}
}
-
- #slot-status-btn-preview {
- width: 32px;
- }
}
diff --git a/apps/spreadsheeteditor/main/app/controller/Viewport.js b/apps/spreadsheeteditor/main/app/controller/Viewport.js
index f37e4ff3c6..438f94a081 100644
--- a/apps/spreadsheeteditor/main/app/controller/Viewport.js
+++ b/apps/spreadsheeteditor/main/app/controller/Viewport.js
@@ -73,7 +73,8 @@ define([
},
'Statusbar': {
'view:compact': function (statusbar, state) {
- me.viewport.vlayout.getItem('statusbar').height = state ? 25 : 50;
+ var height = parseInt(window.getComputedStyle(document.body).getPropertyValue('--statusbar-height'));
+ me.viewport.vlayout.getItem('statusbar').height = state ? height : height * 2;
}
},
'Toolbar': {
@@ -369,8 +370,10 @@ define([
this.viewport.vlayout.getItem('toolbar').height = this.toolbar && this.toolbar.isCompact() ?
_intvars.get('toolbar-height-compact') : _intvars.get('toolbar-height-normal');
- this.viewport.vlayout.getItem('statusbar').height = parseInt(computed_style.getPropertyValue('--statusbar-height') || 25);
-
+ var height = parseInt(computed_style.getPropertyValue('--statusbar-height'));
+ var NoCompact = $('.statusbar').hasClass('no-compact');
+ this.viewport.vlayout.getItem('statusbar').height = NoCompact ? height * 2 : height;
+
Common.NotificationCenter.trigger('layout:changed', 'toolbar');
}
},
diff --git a/apps/spreadsheeteditor/main/app/template/StatusBar.template b/apps/spreadsheeteditor/main/app/template/StatusBar.template
index 2c0096414d..bf1e7bd9aa 100644
--- a/apps/spreadsheeteditor/main/app/template/StatusBar.template
+++ b/apps/spreadsheeteditor/main/app/template/StatusBar.template
@@ -1,16 +1,16 @@