From bdd326ea122958dbca0db7f3295585a9a625afea Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 14 Sep 2021 18:45:18 +0300 Subject: [PATCH] Fix Bug 52567 --- apps/common/main/resources/less/dropdown-menu.less | 5 +++++ apps/documenteditor/main/app/view/FileMenuPanels.js | 2 +- apps/presentationeditor/main/app/view/FileMenuPanels.js | 2 +- apps/spreadsheeteditor/main/app/view/FileMenuPanels.js | 4 ++-- apps/spreadsheeteditor/main/app/view/PrintSettings.js | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/apps/common/main/resources/less/dropdown-menu.less b/apps/common/main/resources/less/dropdown-menu.less index 7f51067d9..126fa40b1 100644 --- a/apps/common/main/resources/less/dropdown-menu.less +++ b/apps/common/main/resources/less/dropdown-menu.less @@ -103,6 +103,11 @@ border-radius: 2px; } } + + &.border-top { + border-top: @scaled-one-px-value-ie solid @border-divider-ie; + border-top: @scaled-one-px-value solid @border-divider; + } } > .disabled { diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index eb70fd98a..979a3aefb 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -448,7 +448,7 @@ define([ var itemsTemplate = _.template([ '<% _.each(items, function(item) { %>', - '
  • style="border-top: 1px solid #e5e5e5;margin-top: 5px;" <% } %> > class="checked" <% } %> ><%= scope.getDisplayValue(item) %>
  • ', + '
  • class="border-top" style="margin-top: 5px;" <% } %> > class="checked" <% } %> ><%= scope.getDisplayValue(item) %>
  • ', '<% }); %>' ].join('')); this.cmbFontRender = new Common.UI.ComboBox({ diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index c8fdf8c92..72c8db211 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -377,7 +377,7 @@ define([ var itemsTemplate = _.template([ '<% _.each(items, function(item) { %>', - '
  • style="border-top: 1px solid #e5e5e5;margin-top: 5px;" <% } %> > class="checked" <% } %> ><%= scope.getDisplayValue(item) %>
  • ', + '
  • class="border-top" style="margin-top: 5px;" <% } %> > class="checked" <% } %> ><%= scope.getDisplayValue(item) %>
  • ', '<% }); %>' ].join('')); this.cmbFontRender = new Common.UI.ComboBox({ diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 9441ee29d..1367681ec 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -446,7 +446,7 @@ define([ var itemsTemplate = _.template([ '<% _.each(items, function(item) { %>', - '
  • style="border-top: 1px solid #e5e5e5;margin-top: 5px;" <% } %> >', + '
  • class="border-top" style="margin-top: 5px;" <% } %> >', '<%= scope.getDisplayValue(item) %>', '
  • ', '<% }); %>' @@ -897,7 +897,7 @@ define([ var itemsTemplate = _.template([ '<% _.each(items, function(item) { %>', - '
  • style="border-top: 1px solid #e5e5e5;margin-top: 5px;" <% } %> > class="checked" <% } %> ><%= scope.getDisplayValue(item) %>
  • ', + '
  • class="border-top" style="margin-top: 5px;" <% } %> > class="checked" <% } %> ><%= scope.getDisplayValue(item) %>
  • ', '<% }); %>' ].join('')); this.cmbFontRender = new Common.UI.ComboBox({ diff --git a/apps/spreadsheeteditor/main/app/view/PrintSettings.js b/apps/spreadsheeteditor/main/app/view/PrintSettings.js index 5ce7c96eb..009779613 100644 --- a/apps/spreadsheeteditor/main/app/view/PrintSettings.js +++ b/apps/spreadsheeteditor/main/app/view/PrintSettings.js @@ -212,7 +212,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', var itemsTemplate = _.template([ '<% _.each(items, function(item) { %>', - '
  • style="border-top: 1px solid #e5e5e5;margin-top: 5px;" <% } %> >', + '
  • class="border-top" style="margin-top: 5px;" <% } %> >', '<%= scope.getDisplayValue(item) %>', '
  • ', '<% }); %>'