From e51c7dcebfbfdcac5bed794c317edbd725f09381 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 14 Jun 2017 17:29:36 +0300 Subject: [PATCH] Debug toolbar layout. --- apps/documenteditor/main/app/view/Viewport.js | 2 +- apps/documenteditor/main/resources/less/toolbar.less | 2 +- apps/presentationeditor/main/app/view/Viewport.js | 2 +- apps/presentationeditor/main/resources/less/toolbar.less | 2 +- apps/spreadsheeteditor/main/app/controller/Viewport.js | 2 +- apps/spreadsheeteditor/main/resources/less/toolbar.less | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/documenteditor/main/app/view/Viewport.js b/apps/documenteditor/main/app/view/Viewport.js index 88948cc265..b4547c48a4 100644 --- a/apps/documenteditor/main/app/view/Viewport.js +++ b/apps/documenteditor/main/app/view/Viewport.js @@ -85,7 +85,7 @@ define([ items: [{ el: $container.find(' > .layout-item#toolbar'), // rely: true - height: Common.localStorage.getBool('de-compact-toolbar') ? 40 : 40+67 + height: Common.localStorage.getBool('de-compact-toolbar') ? 32 : 32+67 }, { el: $container.find(' > .layout-item.middle'), stretch: true diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index 42dc97c62d..da3bc227b3 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -28,7 +28,7 @@ .toolbar-mask { position: absolute; - top: 0; + top: 32px; left: 48px; right: 45px; height: 100%; diff --git a/apps/presentationeditor/main/app/view/Viewport.js b/apps/presentationeditor/main/app/view/Viewport.js index fcb4b73c33..e7da2ea5fc 100644 --- a/apps/presentationeditor/main/app/view/Viewport.js +++ b/apps/presentationeditor/main/app/view/Viewport.js @@ -87,7 +87,7 @@ define([ box: $container, items: [{ el: items[0], - height: Common.localStorage.getBool('pe-compact-toolbar') ? 40 : 40+67 + height: Common.localStorage.getBool('pe-compact-toolbar') ? 32 : 32+67 }, { el: items[1], stretch: true diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less index 44826f3fc4..716594bd06 100644 --- a/apps/presentationeditor/main/resources/less/toolbar.less +++ b/apps/presentationeditor/main/resources/less/toolbar.less @@ -26,7 +26,7 @@ .toolbar-mask { position: absolute; - top: 0; + top: 32px; left: 48px; right: 45px; height: 100%; diff --git a/apps/spreadsheeteditor/main/app/controller/Viewport.js b/apps/spreadsheeteditor/main/app/controller/Viewport.js index f8cb631149..bb8bed570d 100644 --- a/apps/spreadsheeteditor/main/app/controller/Viewport.js +++ b/apps/spreadsheeteditor/main/app/controller/Viewport.js @@ -74,7 +74,7 @@ define([ toolbar.setExtra('left', me.header.getPanel('left', config)); }, 'view:compact' : function (toolbar, state) { - me.viewport.vlayout.panels[0].height = state ? 40 : 40+67; + me.viewport.vlayout.panels[0].height = state ? 32 : 32+67; } }, 'Common.Views.Header': { diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less index 4656c8602c..7a30611d65 100644 --- a/apps/spreadsheeteditor/main/resources/less/toolbar.less +++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less @@ -45,7 +45,7 @@ .toolbar-mask { position: absolute; - top: 0; + top: 32px; left: 48px; right: 45px; height: 100%;