From fa9fd8d971f03751a3e5d833a22b5e964935f873 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 29 Sep 2021 16:52:28 +0300 Subject: [PATCH] [Embedded] Change toolbar height --- apps/common/embed/resources/less/common.less | 8 ++++---- apps/common/forms/resources/less/common.less | 4 ++-- apps/documenteditor/embed/index.html | 2 +- apps/documenteditor/embed/index.html.deploy | 2 +- apps/documenteditor/forms/index.html | 2 +- apps/documenteditor/forms/index.html.deploy | 2 +- apps/presentationeditor/embed/index.html | 2 +- apps/presentationeditor/embed/index.html.deploy | 2 +- .../presentationeditor/embed/js/ApplicationController.js | 2 ++ .../embed/resources/less/application.less | 9 ++++++++- apps/spreadsheeteditor/embed/index.html | 2 +- apps/spreadsheeteditor/embed/index.html.deploy | 2 +- 12 files changed, 24 insertions(+), 15 deletions(-) diff --git a/apps/common/embed/resources/less/common.less b/apps/common/embed/resources/less/common.less index 9b525cacd..7cb786448 100644 --- a/apps/common/embed/resources/less/common.less +++ b/apps/common/embed/resources/less/common.less @@ -99,13 +99,13 @@ right: 0; &.top { - top: 48px; + top: 40px; bottom: 0; } &.bottom { top: 0; - bottom: 46px; + bottom: 38px; } } @@ -126,7 +126,7 @@ top: 0; left: 0; width: 100%; - height: 48px; + height: 40px; -webkit-box-shadow: inset 0 -1px 0 @toolbarBorderColor, inset 0 1px 0 @toolbarBorderShadowColor; //-moz-box-shadow: inset 0 -1px 0 @toolbarBorderColor, inset 0 1px 0 @toolbarBorderShadowColor; @@ -137,7 +137,7 @@ bottom: 0; left: 0; width: 100%; - height: 46px; + height: 38px; -webkit-box-shadow: inset 0 1px 0 @toolbarBorderColor, inset 0 2px 0 @toolbarBorderShadowColor; //-moz-box-shadow: inset 0 1px 0 @toolbarBorderColor, inset 0 2px 0 @toolbarBorderShadowColor; diff --git a/apps/common/forms/resources/less/common.less b/apps/common/forms/resources/less/common.less index 8557e3dcf..b892097e0 100644 --- a/apps/common/forms/resources/less/common.less +++ b/apps/common/forms/resources/less/common.less @@ -113,7 +113,7 @@ right: 0; &.top { - top: 48px; + top: 40px; bottom: 0; } @@ -140,7 +140,7 @@ top: 0; left: 0; width: 100%; - height: 48px; + height: 40px; .box-inner-shadow(0 -1px 0 @toolbarBorderColor); } diff --git a/apps/documenteditor/embed/index.html b/apps/documenteditor/embed/index.html index 396977aa8..32a421a62 100644 --- a/apps/documenteditor/embed/index.html +++ b/apps/documenteditor/embed/index.html @@ -29,7 +29,7 @@ .loadmask > .brendpanel { width: 100%; position: absolute; - height: 48px; + height: 40px; background-color: #F7F7F7; -webkit-box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA; box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA; diff --git a/apps/documenteditor/embed/index.html.deploy b/apps/documenteditor/embed/index.html.deploy index 22746b462..d06ee816a 100644 --- a/apps/documenteditor/embed/index.html.deploy +++ b/apps/documenteditor/embed/index.html.deploy @@ -27,7 +27,7 @@ .loadmask > .brendpanel { width: 100%; position: absolute; - height: 48px; + height: 40px; background-color: #F7F7F7; -webkit-box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA; box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA; diff --git a/apps/documenteditor/forms/index.html b/apps/documenteditor/forms/index.html index dbae5cffb..4fb826105 100644 --- a/apps/documenteditor/forms/index.html +++ b/apps/documenteditor/forms/index.html @@ -47,7 +47,7 @@ .loadmask > .brendpanel { width: 100%; position: absolute; - height: 48px; + height: 40px; background-color: #F7F7F7; background-color: var(--background-toolbar, #F7F7F7); -webkit-box-shadow: inset 0 -1px 0 #cbcbcb; diff --git a/apps/documenteditor/forms/index.html.deploy b/apps/documenteditor/forms/index.html.deploy index 4761b52e0..ddfc2d652 100644 --- a/apps/documenteditor/forms/index.html.deploy +++ b/apps/documenteditor/forms/index.html.deploy @@ -28,7 +28,7 @@ .loadmask > .brendpanel { width: 100%; position: absolute; - height: 48px; + height: 40px; background-color: #F7F7F7; background-color: var(--background-toolbar, #F7F7F7); -webkit-box-shadow: inset 0 -1px 0 #cbcbcb; diff --git a/apps/presentationeditor/embed/index.html b/apps/presentationeditor/embed/index.html index d8d1321cd..d94d7b765 100644 --- a/apps/presentationeditor/embed/index.html +++ b/apps/presentationeditor/embed/index.html @@ -29,7 +29,7 @@ .loadmask > .brendpanel { width: 100%; position: absolute; - height: 48px; + height: 40px; background-color: #F7F7F7; -webkit-box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA; box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA; diff --git a/apps/presentationeditor/embed/index.html.deploy b/apps/presentationeditor/embed/index.html.deploy index 5630c82da..6bfce4d25 100644 --- a/apps/presentationeditor/embed/index.html.deploy +++ b/apps/presentationeditor/embed/index.html.deploy @@ -27,7 +27,7 @@ .loadmask > .brendpanel { width: 100%; position: absolute; - height: 48px; + height: 40px; background-color: #F7F7F7; -webkit-box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA; box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA; diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index 0cc2bf93e..256fb4e11 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -76,11 +76,13 @@ PE.ApplicationController = new(function(){ if (embedConfig.toolbarDocked === 'bottom') { $('#toolbar').addClass('bottom'); $('#editor_sdk').addClass('bottom'); + $('#box-preview').addClass('bottom'); $('#box-tools').removeClass('dropdown').addClass('dropup'); ttOffset[1] = -40; } else { $('#toolbar').addClass('top'); $('#editor_sdk').addClass('top'); + $('#box-preview').addClass('top'); } config.canBackToFolder = (config.canBackToFolder!==false) && config.customization && config.customization.goback && diff --git a/apps/presentationeditor/embed/resources/less/application.less b/apps/presentationeditor/embed/resources/less/application.less index b07e12964..cf1ce6dc0 100644 --- a/apps/presentationeditor/embed/resources/less/application.less +++ b/apps/presentationeditor/embed/resources/less/application.less @@ -16,7 +16,14 @@ width:100%; height:100%; z-index: 10; - padding: 48px 0 0 0; + padding: 0; + + &.top { + padding-top: 40px; + } + &.bottom { + padding-bottom: 38px; + } } #id-preview { diff --git a/apps/spreadsheeteditor/embed/index.html b/apps/spreadsheeteditor/embed/index.html index 6d6903b16..12f2e0487 100644 --- a/apps/spreadsheeteditor/embed/index.html +++ b/apps/spreadsheeteditor/embed/index.html @@ -29,7 +29,7 @@ .loadmask > .brendpanel { width: 100%; position: absolute; - height: 48px; + height: 40px; background-color: #F7F7F7; -webkit-box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA; box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA; diff --git a/apps/spreadsheeteditor/embed/index.html.deploy b/apps/spreadsheeteditor/embed/index.html.deploy index 41ad961d1..59dd5d113 100644 --- a/apps/spreadsheeteditor/embed/index.html.deploy +++ b/apps/spreadsheeteditor/embed/index.html.deploy @@ -26,7 +26,7 @@ .loadmask > .brendpanel { width: 100%; position: absolute; - height: 48px; + height: 40px; background-color: #F7F7F7; -webkit-box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA; box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA;