pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-26 21:16:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2332 from ONLYOFFICE/feature/for-bug-61910

Browse Source 
Feature/for bug 61910
This commit is contained in:
maxkadushkin
2023-04-11 11:45:32 +03:00
committed by GitHub
parent 46d1f41ece 662376683a
commit 01e2fc1b7b
3 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/common/main/lib/component/Button.js
View File

@ -275,7 +275,7 @@ define([
dataHint : '',
dataHintDirection: '',
dataHintOffset: '0, 0',
scaling : false,
scaling : true,
},
template: _.template([
@ -344,9 +344,6 @@ define([
me.render();
} else if (me.options.parentEl)
me.render(me.options.parentEl);
// TODO: for review scaling feature only. remove after
me.options.scaling = true;
},
getCaptionWithBreaks: function (caption) {

24
apps/common/main/resources/less/bigscaling.less
View File

@ -16,4 +16,28 @@
svg.icon:not(.uni-scale):not(.pixel-ratio__2_5 *) {
display: none;
}
}
.btn-category {
&:active,
&.active {
&:not(.disabled) {
svg.icon {
fill: @icon-normal-pressed-ie;
fill: @icon-normal-pressed;
//.btn& {
// opacity: 1;
//}
}
}
}
svg.icon {
fill: @icon-normal-ie;
fill: @icon-normal;
.btn& {
//opacity: 1;
}
}
}

8
apps/documenteditor/main/app/view/LeftMenu.js
View File

@ -90,6 +90,7 @@ define([
el: $markup.elementById('#left-btn-searchbar'),
hint: this.tipSearch,
disabled: true,
iconCls: 'btn-menu-search',
enableToggle: true,
toggleGroup: 'leftMenuGroup'
});
@ -101,6 +102,7 @@ define([
hint: this.tipAbout,
enableToggle: true,
disabled: true,
iconCls: 'btn-menu-about',
toggleGroup: 'leftMenuGroup'
});
this.btnAbout.on('toggle', this.onBtnMenuToggle.bind(this));
@ -109,6 +111,7 @@ define([
action: 'support',
el: $markup.elementById('#left-btn-support'),
hint: this.tipSupport,
iconCls: 'btn-menu-support',
disabled: true
});
@ -118,6 +121,7 @@ define([
hint: this.tipComments + Common.Utils.String.platformKey('Ctrl+Shift+H'),
enableToggle: true,
disabled: true,
iconCls: 'btn-menu-comments',
toggleGroup: 'leftMenuGroup'
});
this.btnComments.on('click', this.onBtnMenuClick.bind(this));
@ -128,6 +132,7 @@ define([
hint: this.tipChat + Common.Utils.String.platformKey('Alt+Q', ' (' + (Common.Utils.isMac ? Common.Utils.String.textCtrl + '+' : '') + '{0})'),
enableToggle: true,
disabled: true,
iconCls: 'btn-menu-chat',
toggleGroup: 'leftMenuGroup'
});
this.btnChat.on('click', this.onBtnMenuClick.bind(this));
@ -142,6 +147,7 @@ define([
hint: this.tipPlugins,
enableToggle: true,
disabled: true,
iconCls: 'btn-menu-plugin',
toggleGroup: 'leftMenuGroup'
});
this.btnPlugins.hide();
@ -152,6 +158,7 @@ define([
hint: this.tipOutline,
enableToggle: true,
disabled: true,
iconCls: 'btn-menu-navigation',
toggleGroup: 'leftMenuGroup'
});
this.btnNavigation.on('click', this.onBtnMenuClick.bind(this));
@ -164,6 +171,7 @@ define([
hint: this.tipPageThumbnails,
enableToggle: true,
disabled: true,
iconCls: 'btn-menu-thumbs',
toggleGroup: 'leftMenuGroup'
});
this.btnThumbnails.hide();