diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index b5ea454af..3e23070ac 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -247,6 +247,7 @@ define([ '', '', '', + '', '', '', '', @@ -265,6 +266,7 @@ define([ '', '', '', + '', '', '', '', @@ -274,6 +276,7 @@ define([ '', '
', '', + '', '', '', '', @@ -285,13 +288,14 @@ define([ '', '', '
', - '','', + '','', '', '
', '', '', '
', '', + '', '', '', '', @@ -301,6 +305,7 @@ define([ '', '', '', + '', '', '', '', @@ -333,7 +338,8 @@ define([ '', '
', '', - '', + '', + '', '', '', '', @@ -435,8 +441,9 @@ define([ this.cmbZoom = new Common.UI.ComboBox({ el : $markup.findById('#fms-cmb-zoom'), - style : 'width: 160px;', + style : 'width: 128px;', editable : false, + menuCls : 'menu-aligned', cls : 'input-group-nr', menuStyle : 'max-height: 157px;', data : [ @@ -537,8 +544,9 @@ define([ ].join('')); this.cmbFontRender = new Common.UI.ComboBox({ el : $markup.find('#fms-cmb-font-render'), - style : 'width: 160px;', + style : 'width: 128px;', editable : false, + menuCls : 'menu-aligned', cls : 'input-group-nr', itemsTemplate: itemsTemplate, data : [ @@ -555,7 +563,8 @@ define([ this.cmbUnit = new Common.UI.ComboBox({ el : $markup.findById('#fms-cmb-unit'), - style : 'width: 160px;', + style : 'width: 128px;', + menuCls : 'menu-aligned', editable : false, cls : 'input-group-nr', data : [ @@ -570,7 +579,7 @@ define([ this.cmbMacros = new Common.UI.ComboBox({ el : $markup.findById('#fms-cmb-macros'), - style : 'width: 160px;', + style : 'width: 128px;', editable : false, menuCls : 'menu-aligned', cls : 'input-group-nr', @@ -605,8 +614,9 @@ define([ this.cmbTheme = new Common.UI.ComboBox({ el : $markup.findById('#fms-cmb-theme'), - style : 'width: 160px;', + style : 'width: 128px;', editable : false, + menuCls : 'menu-aligned', cls : 'input-group-nr', dataHint: '2', dataHintDirection: 'bottom', @@ -682,7 +692,7 @@ define([ $('tr.forcesave', this.el)[mode.canForcesave ? 'show' : 'hide'](); $('tr.editsave',this.el)[mode.isEdit || mode.canForcesave ? 'show' : 'hide'](); if (this.mode.isDesktopApp && this.mode.isOffline) { - this.chAutosave.setCaption(this.strAutoRecover); + this.chAutosave.setCaption(this.textAutoRecover); } /** coauthoring begin **/ $('tr.collaboration', this.el)[mode.canCoAuthoring || mode.canViewReview ? 'show' : 'hide'](); diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less index 74ea2ce10..25d9a7e25 100644 --- a/apps/documenteditor/main/resources/less/filemenu.less +++ b/apps/documenteditor/main/resources/less/filemenu.less @@ -127,13 +127,9 @@ tr { td { padding: 6px 10px; - &.group-name { - padding-top: 22px; - &.top{padding-top: 5px} - label { - font-size: 14px; - .font-weight-bold(); - } + &.group-name label { + font-size: 14px; + .font-weight-bold(); } &.subgroup-name label{ @@ -162,6 +158,12 @@ &.divider { height: 10px; } + &.divider-group { + height: 12px; + } + &.divider-subgroup{ + height: 4px; + } } } } diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index dff050db1..0781577a4 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -212,6 +212,7 @@ define([ '', '
', '', + '', '', '', '', @@ -232,6 +233,7 @@ define([ '', '
', '', + '', '', '', '', @@ -241,6 +243,7 @@ define([ '', '', '', + '', '', '', '', @@ -271,6 +274,7 @@ define([ '', '
', '', + '', '', '', '', @@ -315,7 +319,7 @@ define([ this.cmbZoom = new Common.UI.ComboBox({ el : $markup.findById('#fms-cmb-zoom'), - style : 'width: 160px;', + style : 'width: 128px;', editable : false, cls : 'input-group-nr', menuStyle : 'max-height: 157px;', @@ -398,7 +402,7 @@ define([ ].join('')); this.cmbFontRender = new Common.UI.ComboBox({ el : $markup.findById('#fms-cmb-font-render'), - style : 'width: 160px;', + style : 'width: 128px;', editable : false, cls : 'input-group-nr', itemsTemplate: itemsTemplate, @@ -416,7 +420,7 @@ define([ this.cmbUnit = new Common.UI.ComboBox({ el : $markup.findById('#fms-cmb-unit'), - style : 'width: 160px;', + style : 'width: 128px;', editable : false, cls : 'input-group-nr', data : [ @@ -431,7 +435,7 @@ define([ this.cmbMacros = new Common.UI.ComboBox({ el : $markup.findById('#fms-cmb-macros'), - style : 'width: 160px;', + style : 'width: 128px;', editable : false, menuCls : 'menu-aligned', cls : 'input-group-nr', @@ -469,7 +473,7 @@ define([ this.cmbTheme = new Common.UI.ComboBox({ el : $markup.findById('#fms-cmb-theme'), - style : 'width: 160px;', + style : 'width: 128px;', editable : false, cls : 'input-group-nr', dataHint : '2', diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less index c85fa6a6a..fb6dfbd60 100644 --- a/apps/presentationeditor/main/resources/less/leftmenu.less +++ b/apps/presentationeditor/main/resources/less/leftmenu.less @@ -166,13 +166,9 @@ td { padding: 6px 10px; width: auto !important; - &.group-name { - padding-top: 22px; - &.top{padding-top: 5px} - label { - font-size: 14px; - .font-weight-bold(); - } + &.group-name label { + font-size: 14px; + .font-weight-bold(); } &.subgroup-name label{ @@ -201,6 +197,9 @@ &.divider { height: 10px; } + &.divider-group { + height: 12px; + } } } } diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 5389f963c..80cbeaee3 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -202,6 +202,7 @@ define([ '', '
', '', + '', '', '', '', @@ -222,12 +223,14 @@ define([ '', '', '', + '', '', '
', '', '', '
', '', + '', '', '', '', @@ -257,6 +260,7 @@ define([ '
', '', '', + '', '', '', '', @@ -276,14 +280,15 @@ define([ '
', '', '', - '', + '', '
', '', '', - '', + '', '
', '', - '', + '', + '', '', '', '', @@ -297,10 +302,10 @@ define([ '', '', '', - '', + '', '
', '', - + '', '', '', '', @@ -378,8 +383,9 @@ define([ this.cmbZoom = new Common.UI.ComboBox({ el : $markup.findById('#fms-cmb-zoom'), - style : 'width: 160px;', + style : 'width: 128px;', editable : false, + menuCls : 'menu-aligned', cls : 'input-group-nr', menuStyle : 'max-height: 157px;', data : [ @@ -411,8 +417,9 @@ define([ ].join('')); this.cmbFontRender = new Common.UI.ComboBox({ el : $markup.findById('#fms-cmb-font-render'), - style : 'width: 160px;', + style : 'width: 128px;', editable : false, + menuCls : 'menu-aligned', cls : 'input-group-nr', itemsTemplate: itemsTemplate, data : [ @@ -449,8 +456,9 @@ define([ this.cmbUnit = new Common.UI.ComboBox({ el : $markup.findById('#fms-cmb-unit'), - style : 'width: 160px;', + style : 'width: 128px;', editable : false, + menuCls : 'menu-aligned', cls : 'input-group-nr', data : [ { value: Common.Utils.Metric.c_MetricUnits['cm'], displayValue: this.txtCm }, @@ -476,7 +484,7 @@ define([ this.cmbFuncLocale = new Common.UI.ComboBox({ el : $markup.findById('#fms-cmb-func-locale'), - style : 'width: 160px;', + style : 'width: 200px;', menuStyle: 'max-height: 185px;', editable : false, cls : 'input-group-nr', @@ -499,7 +507,7 @@ define([ this.cmbRegSettings = new Common.UI.ComboBox({ el : $markup.findById('#fms-cmb-reg-settings'), - style : 'width: 160px;', + style : 'width: 200px;', menuStyle: 'max-height: 185px;', editable : false, cls : 'input-group-nr', @@ -590,7 +598,7 @@ define([ this.cmbMacros = new Common.UI.ComboBox({ el : $markup.findById('#fms-cmb-macros'), - style : 'width: 160px;', + style : 'width: 128px;', editable : false, menuCls : 'menu-aligned', cls : 'input-group-nr', @@ -621,7 +629,7 @@ define([ this.cmbTheme = new Common.UI.ComboBox({ el : $markup.findById('#fms-cmb-theme'), - style : 'width: 160px;', + style : 'width: 128px;', editable : false, cls : 'input-group-nr', dataHint : '2', @@ -632,8 +640,9 @@ define([ this.cmbDictionaryLanguage = new Common.UI.ComboBox({ el: $markup.findById('#fms-cmb-dictionary-language'), cls: 'input-group-nr', - style: 'width: 267px;', + style: 'width: 200px;', editable: false, + menuCls : 'menu-aligned', menuStyle: 'min-width: 267px; max-height: 209px;', dataHint: '2', dataHintDirection: 'bottom', @@ -734,7 +743,7 @@ define([ if ( !Common.UI.Themes.available() ) { $('tr.themes, tr.themes + tr.divider', this.el).hide(); } - $('tr.spellcheck', this.el)[Common.UI.FeaturesManager.canChange('spellcheck') ? 'show' : 'hide'](); + $('tr.spellcheck', this.el)[Common.UI.FeaturesManager.canChange('spellcheck') && mode.isEdit ? 'show' : 'hide'](); }, setApi: function(api) { @@ -835,7 +844,7 @@ define([ this.cmbTheme.setValue(item ? item.get('value') : Common.UI.Themes.defaultThemeId()); } - if (Common.UI.FeaturesManager.canChange('spellcheck')) { + if (Common.UI.FeaturesManager.canChange('spellcheck') && this.mode.isEdit) { var arrLang = SSE.getController('Spellcheck').loadLanguages(), allLangs = arrLang[0], @@ -926,7 +935,7 @@ define([ Common.NotificationCenter.trigger('settings:unitschanged', this); } - if (Common.UI.FeaturesManager.canChange('spellcheck')) { + if (Common.UI.FeaturesManager.canChange('spellcheck') && this.mode.isEdit) { var value = this.chIgnoreUppercase.isChecked(); Common.localStorage.setBool("sse-spellcheck-ignore-uppercase-words", value); diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index 791bb1947..0e17e7bd9 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -211,13 +211,9 @@ td { //padding: 5px 10px; padding: 6px 10px; - &.group-name { - padding-top: 22px; - &.top{padding-top: 5px} - label { - font-size: 14px; - .font-weight-bold(); - } + &.group-name label { + font-size: 14px; + .font-weight-bold(); } &.subgroup-name label{ @@ -229,8 +225,6 @@ opacity: 0.45; } - - &.left { text-align: right; width: 30%; @@ -249,6 +243,9 @@ &.divider { height: 10px; } + &.divider-group { + height: 12px; + } } &.main {