diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 192c351e1..7df74a918 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -188,7 +188,7 @@ define([ menu: undefined, template: _.template([ - '
', @@ -1052,7 +1052,7 @@ define([ }); this.btnApply.on('click', _.bind(this.applySettings, this)); - this.pnlInfo = $markup.findById('#fms-flex-info'); + this.pnlInfo = $markup.find('.flex-settings').addBack().filter('.flex-settings'); this.pnlApply = $markup.findById('#fms-flex-apply'); this.rendered = true; diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less index e80c36846..210380167 100644 --- a/apps/documenteditor/main/resources/less/filemenu.less +++ b/apps/documenteditor/main/resources/less/filemenu.less @@ -120,21 +120,26 @@ } } -#panel-settings { +.flex-settings { #file-menu-panel & { - padding: 0; - display: flex; - flex-direction: column; - } - - #fms-flex-settings { &.bordered { border-bottom: 1px solid @gray; } overflow: hidden; position: relative; } +} +#panel-settings, +#panel-info { + #file-menu-panel & { + padding: 0; + display: flex; + flex-direction: column; + } +} + +#panel-settings { table { width: 100%; @@ -315,23 +320,6 @@ } } -#panel-info { - #file-menu-panel & { - padding: 0; - display: flex; - flex-direction: column; - } - - #fms-flex-info { - &.bordered { - border-bottom: 1px solid @gray; - } - overflow: hidden; - position: relative; - } - -} - #panel-rights { #file-menu-panel & { padding: 0 30px; diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index d4d71d97a..4f96554f3 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -180,7 +180,7 @@ define([ menu: undefined, template: _.template([ - ' |
', @@ -395,7 +395,7 @@ define([ this.btnApply.on('click', _.bind(this.applySettings, this)); - this.pnlSettings = $markup.findById('#fms-flex-settings'); + this.pnlSettings = $markup.find('.flex-settings').addBack().filter('.flex-settings'); this.$el = $(node).html($markup); @@ -752,7 +752,7 @@ define([ this.rendered = false; this.template = _.template([ - ' |
', @@ -926,7 +926,7 @@ define([ }); this.btnApply.on('click', _.bind(this.applySettings, this)); - this.pnlInfo = $markup.findById('#fms-flex-info'); + this.pnlInfo = $markup.find('.flex-settings').addBack().filter('.flex-settings'); this.pnlApply = $markup.findById('#fms-flex-apply'); this.rendered = true; diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less index 7ce578c3e..65099d00f 100644 --- a/apps/presentationeditor/main/resources/less/leftmenu.less +++ b/apps/presentationeditor/main/resources/less/leftmenu.less @@ -189,19 +189,22 @@ } } - #panel-settings { + .flex-settings { + &.bordered { + border-bottom: 1px solid @gray; + } + overflow: hidden; + position: relative; + } + + #panel-settings, + #panel-info { padding: 0; display: flex; flex-direction: column; + } - #fms-flex-settings { - &.bordered { - border-bottom: 1px solid @gray; - } - overflow: hidden; - position: relative; - } - + #panel-settings { table { width: 100%; @@ -385,21 +388,6 @@ } } - #panel-info { - padding: 0; - display: flex; - flex-direction: column; - - #fms-flex-info { - &.bordered { - border-bottom: 1px solid @gray; - } - overflow: hidden; - position: relative; - } - - } - #panel-rights { padding: 0 30px; } |