From 8d54a7d1fb005b18117959b5760bb15047670d92 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 30 Mar 2021 13:23:23 +0300 Subject: [PATCH] [PE] Fix themes list --- .../main/app/controller/Toolbar.js | 4 ++-- apps/presentationeditor/main/app/view/Toolbar.js | 4 ++-- .../main/resources/less/toolbar.less | 12 +++++++++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 675e42688..518a6fc28 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -2280,13 +2280,13 @@ define([ uid : Common.UI.getId(), themeId : theme.get_Index(), tip : tip, - offsety : index * 38 + offsety : index * 40 })); arr2.push({ uid : Common.UI.getId(), themeId : theme.get_Index(), tip : tip, - offsety : index * 38 + offsety : index * 40 }); }); _.each(docThemes, function(theme) { diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index a4aec78b0..0e8572234 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -893,9 +893,9 @@ define([ me.listTheme = new Common.UI.ComboDataView({ cls: 'combo-styles', - itemWidth: 85, + itemWidth: 88, enableKeyEvents: true, - itemHeight: 38, + itemHeight: 40, lock: [_set.themeLock, _set.lostConnect, _set.noSlides], beforeOpenHandler: function (e) { var cmp = this, diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less index 5f5516b95..1915ce12b 100644 --- a/apps/presentationeditor/main/resources/less/toolbar.less +++ b/apps/presentationeditor/main/resources/less/toolbar.less @@ -104,12 +104,18 @@ } .item-theme { - width: 85px; - height: 38px; - .background-ximage('../../../../../../sdkjs/common/Images/themes_thumbnail.png', '../../../../../../sdkjs/common/Images/themes_thumbnail@2x.png', 85px); + width: 88px; + height: 40px; + .background-ximage-v2('../../../../../../sdkjs/common/Images/themes_thumbnail.png', 88px); background-size: cover } +.combo-styles { + .item { + padding: 2px; + } +} + #slot-btn-incfont, #slot-btn-decfont, #slot-btn-changecase { margin-left: 2px; } \ No newline at end of file