[PE][SSE] Set custom font size

This commit is contained in:
Julia Radzhabova 2022-11-11 00:16:53 +03:00
parent a6470bf74e
commit ed025149b0
26 changed files with 141 additions and 59 deletions

View file

@ -490,6 +490,7 @@ define([
this.emailMenu = new Common.UI.Menu({
maxHeight: 200,
cyclic: false,
cls: 'font-size-medium',
items: []
}).on('render:after', function(mnu) {
this.scroller = new Common.UI.Scroller({
@ -1229,7 +1230,7 @@ define([
return (item.email && 0 === item.email.toLowerCase().indexOf(str) || item.name && 0 === item.name.toLowerCase().indexOf(str))
});
}
var tpl = _.template('<a id="<%= id %>" tabindex="-1" type="menuitem" style="font-size: 12px;">' +
var tpl = _.template('<a id="<%= id %>" tabindex="-1" type="menuitem">' +
'<div style="overflow: hidden; text-overflow: ellipsis; max-width: 195px;"><%= Common.Utils.String.htmlEncode(caption) %></div>' +
'<div style="overflow: hidden; text-overflow: ellipsis; max-width: 195px; color: #909090;"><%= Common.Utils.String.htmlEncode(options.value) %></div>' +
'</a>'),

View file

@ -202,7 +202,8 @@
background-color: #ee3525;
padding: 3px 10px;
color: #ffffff;
font: 11px arial;
//font: 11px arial;
.font-size-normal();
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;

View file

@ -45,7 +45,7 @@
border-top: @scaled-one-px-value solid transparent;
border-bottom: @scaled-one-px-value-ie solid transparent;
border-bottom: @scaled-one-px-value solid transparent;
font-size: 11px; // must be const value
i {
display: inline-block;
width: 4px;

View file

@ -59,6 +59,10 @@
.link-tooltip .tooltip-inner {
max-width: 500px;
.review-date {
.font-size-small();
opacity: 0.7;
}
}
.auto-tooltip .tooltip-inner {

View file

@ -1017,7 +1017,7 @@ define([
changes = changes[0];
if (changes) {
ToolTip = '<b>'+ Common.Utils.String.htmlEncode(AscCommon.UserInfoParser.getParsedName(changes.get('username'))) +' </b>';
ToolTip += '<span style="font-size:10px; opacity: 0.7;">'+ changes.get('date') +'</span><br>';
ToolTip += '<span class="review-date">'+ changes.get('date') +'</span><br>';
ToolTip += changes.get('changetext');
if (ToolTip.length>1000)
ToolTip = ToolTip.substr(0, 1000) + '...';

View file

@ -380,15 +380,15 @@ define([
Common.Utils.InternalSettings.set("guest-username", value);
Common.Utils.InternalSettings.set("save-guest-username", !!value);
}
if (this.appOptions.customization.font) {
this.appOptions.customization.font.size && document.documentElement.style.setProperty("--font-size-base-app-custom", this.appOptions.customization.font.size);
}
this.editorConfig.user =
this.appOptions.user = Common.Utils.fillUserInfo(this.editorConfig.user, this.editorConfig.lang, value ? (value + ' (' + this.appOptions.guestName + ')' ) : this.textAnonymous,
Common.localStorage.getItem("guest-id") || ('uid-' + Date.now()));
this.appOptions.user.anonymous && Common.localStorage.setItem("guest-id", this.appOptions.user.id);
if (this.appOptions.customization.font) {
this.appOptions.customization.font.size && document.documentElement.style.setProperty("--font-size-base-app-custom", this.appOptions.customization.font.size);
}
this.appOptions.isDesktopApp = this.editorConfig.targetApp == 'desktop' || Common.Controllers.Desktop.isActive();
this.appOptions.canCreateNew = this.editorConfig.canRequestCreateNew || !_.isEmpty(this.editorConfig.createUrl) || this.editorConfig.templates && this.editorConfig.templates.length;
this.appOptions.canOpenRecent = this.editorConfig.recent !== undefined && !this.appOptions.isDesktopApp;

View file

@ -57,7 +57,7 @@ define([
'<span class="btn-slot" id="slot-field-zoom" style="flex-grow: 1;"></span>' +
'</div>' +
'<div class="elset" style="text-align: center;">' +
'<span class="btn-slot text" id="slot-lbl-zoom" style="text-align: center;margin-top: 4px;"></span>' +
'<span class="btn-slot text font-size-normal" id="slot-lbl-zoom" style="text-align: center;margin-top: 4px;"></span>' +
'</div>' +
'</div>' +
'<div class="group small">' +

View file

@ -46,7 +46,8 @@
}
}
&.small{
font-size: 10px;
//font-size: 10px;
.font-size-small();
}
&.medium{
//font-size: 12px;

View file

@ -130,7 +130,8 @@
border-radius: 0;
padding: 3px 10px;
color: #ffffff;
font: 11px arial;
//font: 11px arial;
.font-size-normal();
white-space: nowrap;
letter-spacing: 1px;
overflow: hidden;
@ -202,8 +203,4 @@
display: none !important;
}
}
}
#slot-lbl-zoom {
.font-size-normal();
}

View file

@ -344,6 +344,10 @@ define([
Common.localStorage.getItem("guest-id") || ('uid-' + Date.now()));
this.appOptions.user.anonymous && Common.localStorage.setItem("guest-id", this.appOptions.user.id);
if (this.appOptions.customization.font) {
this.appOptions.customization.font.size && document.documentElement.style.setProperty("--font-size-base-app-custom", this.appOptions.customization.font.size);
}
this.appOptions.isDesktopApp = this.editorConfig.targetApp == 'desktop' || Common.Controllers.Desktop.isActive();
this.appOptions.canCreateNew = this.editorConfig.canRequestCreateNew || !_.isEmpty(this.editorConfig.createUrl) || this.editorConfig.templates && this.editorConfig.templates.length;
this.appOptions.canOpenRecent = this.editorConfig.recent !== undefined && !this.appOptions.isDesktopApp;
@ -1040,7 +1044,8 @@ define([
});
}
} else if (!this.appOptions.isDesktopApp && !this.appOptions.canBrandingExt &&
this.editorConfig && this.editorConfig.customization && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)) {
this.editorConfig && this.editorConfig.customization && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo ||
this.editorConfig.customization.font && this.editorConfig.customization.font.size)) {
Common.UI.warning({
title: this.textPaidFeature,
msg : this.textCustomLoader,

View file

@ -53,15 +53,15 @@ define([
'<span class="btn-slot" id="slot-field-zoom" style="flex-grow: 1;"></span>' +
'</div>' +
'<div class="elset" style="text-align: center;">' +
'<span class="btn-slot text" id="slot-lbl-zoom" style="font-size: 11px;text-align: center;margin-top: 4px;"></span>' +
'<span class="btn-slot text font-size-normal" id="slot-lbl-zoom" style="text-align: center;margin-top: 4px;"></span>' +
'</div>' +
'</div>' +
'<div class="group small">' +
'<div class="elset">' +
'<span class="btn-slot text" id="slot-btn-fts" style="font-size: 11px;text-align: center;"></span>' +
'<span class="btn-slot text" id="slot-btn-fts" style="text-align: center;"></span>' +
'</div>' +
'<div class="elset">' +
'<span class="btn-slot text" id="slot-btn-ftw" style="font-size: 11px;text-align: center;"></span>' +
'<span class="btn-slot text" id="slot-btn-ftw" style="text-align: center;"></span>' +
'</div>' +
'</div>' +
'<div class="separator long"></div>' +

View file

@ -3,7 +3,7 @@
padding: 0 15px;
text-align: right;
.font-weight-bold();
font-size: 11px;
.font-size-normal();
}
}

View file

@ -147,16 +147,33 @@
@import "sprites/iconssmall@1.75x";
@import "sprites/iconsbig@1.75x";
.font-size-tiny {
.fontsize(9px); // 9px
.fontsize(calc(@font-size-base-app - 2px)); // 9px
}
.font-size-small {
.fontsize(@font-size-small);
.fontsize(10px); // 10px
.fontsize(calc(@font-size-base-app - 1px)); // 10px
}
.font-size-normal {
.fontsize(@font-size-base);
.fontsize(@font-size-base-app); // 11px
}
.font-size-medium {
.fontsize(12px); // 12px
.fontsize(calc(@font-size-base-app + 1px)); // 12px
}
.font-size-large {
.fontsize(@font-size-large);
.fontsize(13px); // 13px
.fontsize(calc(@font-size-base-app + 2px)); // 13px
}
.font-size-huge {
.fontsize(14px); // 14px
.fontsize(calc(@font-size-base-app + 3px)); // 14px
}
.slidenum-div {

View file

@ -19,7 +19,8 @@
}
#preview-label-slides {
font: bold 11px Helvetica, Arial, Verdana, sans-serif;
//font: bold 11px Helvetica, Arial, Verdana, sans-serif;
.font-size-normal();
color: @text-normal-ie;
color: @text-normal;
text-shadow: none;

View file

@ -158,7 +158,8 @@
&:extend(.dropdown-menu > li > a);
padding-top: 4px;
cursor: pointer;
font-size: 13px;
//font-size: 13px;
.font-size-large();
&:hover {
text-decoration: none;
@ -216,15 +217,19 @@
tr {
td {
label{
.font-size-normal();
}
padding: 6px 10px;
width: auto !important;
&.group-name label {
font-size: 14px;
//font-size: 14px;
.font-size-huge();
.font-weight-bold();
}
&.subgroup-name label{
font-size: 11px;
.font-weight-bold();
}
@ -237,7 +242,7 @@
label {
.font-weight-bold();
font-size: 12px;
.font-size-medium();
}
}
@ -307,7 +312,7 @@
.title {
width: 104px;
font-size: 12px;
.font-size-medium();
line-height: 14px;
height: 28px;
margin: 8px 8px 12px 8px;
@ -345,7 +350,7 @@
.recent-wrap {
padding: 5px 10px;
cursor: pointer;
font-size: 12px;
.font-size-medium();
&:hover,
&.over {
@ -403,7 +408,8 @@
width: 100%;
.box-shadow(none);
margin: 0;
font-size: 12px;
//font-size: 12px;
.font-size-medium();
float: none;
&:not(.header-name) {
@ -482,7 +488,8 @@
}
label, span {
font-size: 12px;
//font-size: 12px;
.font-size-medium();
}
.tool {
@ -504,7 +511,8 @@
#panel-protect {
label {
font-size: 12px;
//font-size: 12px;
.font-size-medium();
}
padding: 30px 30px;

View file

@ -114,7 +114,8 @@
margin-left: 142px;
margin-bottom: 2px;
width: 285px;
font-size: 12px;
//font-size: 12px;
.font-size-medium();
> label {
white-space: normal;

View file

@ -83,7 +83,8 @@
border-radius: 0;
padding: 3px 10px;
color: #fff;
font: 11px arial;
//font: 11px arial;
.font-size-normal();
white-space: nowrap;
letter-spacing: 1px;
overflow: hidden;

View file

@ -382,6 +382,10 @@ define([
Common.localStorage.getItem("guest-id") || ('uid-' + Date.now()));
this.appOptions.user.anonymous && Common.localStorage.setItem("guest-id", this.appOptions.user.id);
if (this.appOptions.customization.font) {
this.appOptions.customization.font.size && document.documentElement.style.setProperty("--font-size-base-app-custom", this.appOptions.customization.font.size);
}
this.appOptions.isDesktopApp = this.editorConfig.targetApp == 'desktop' || Common.Controllers.Desktop.isActive();
this.appOptions.canCreateNew = this.editorConfig.canRequestCreateNew || !_.isEmpty(this.editorConfig.createUrl) || this.editorConfig.templates && this.editorConfig.templates.length;
this.appOptions.canOpenRecent = this.editorConfig.recent !== undefined && !this.appOptions.isDesktopApp;
@ -1125,7 +1129,8 @@ define([
});
}
} else if (!this.appOptions.isDesktopApp && !this.appOptions.canBrandingExt && !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge || this.appOptions.isEditOle) &&
this.editorConfig && this.editorConfig.customization && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)) {
this.editorConfig && this.editorConfig.customization && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo ||
this.editorConfig.customization.font && this.editorConfig.customization.font.size)) {
Common.UI.warning({
title: this.textPaidFeature,
msg : this.textCustomLoader,

View file

@ -64,7 +64,7 @@ define([
'<span class="btn-slot" id="slot-field-zoom" style="flex-grow: 1;"></span>' +
'</div>' +
'<div class="elset" style="text-align: center;">' +
'<span class="btn-slot text" id="slot-lbl-zoom" style="font-size: 11px;text-align: center;margin-top: 4px;"></span>' +
'<span class="btn-slot text font-size-normal" id="slot-lbl-zoom" style="text-align: center;margin-top: 4px;"></span>' +
'</div>' +
'</div>' +
'<div class="separator long"></div>' +

View file

@ -3,7 +3,7 @@
padding: 0 0 0 10px;
text-align: right;
.font-weight-bold();
font-size: 11px;
.font-size-normal();
white-space: nowrap;
}

View file

@ -149,16 +149,33 @@
@import "sprites/iconssmall@1.75x";
@import "sprites/iconsbig@1.75x";
.font-size-tiny {
.fontsize(9px); // 9px
.fontsize(calc(@font-size-base-app - 2px)); // 9px
}
.font-size-small {
.fontsize(@font-size-small);
.fontsize(10px); // 10px
.fontsize(calc(@font-size-base-app - 1px)); // 10px
}
.font-size-normal {
.fontsize(@font-size-base);
.fontsize(@font-size-base-app); // 11px
}
.font-size-medium {
.fontsize(12px); // 12px
.fontsize(calc(@font-size-base-app + 1px)); // 12px
}
.font-size-large {
.fontsize(@font-size-large);
.fontsize(13px); // 13px
.fontsize(calc(@font-size-base-app + 2px)); // 13px
}
.font-size-huge {
.fontsize(14px); // 14px
.fontsize(calc(@font-size-base-app + 3px)); // 14px
}
// Skeleton of workbook

View file

@ -105,7 +105,8 @@
resize: none;
min-height: 19px;
border: 0 none;
font-size: 12px;
//font-size: 12px;
.font-size-medium();
line-height: 18px;
padding-bottom: 0;

View file

@ -143,7 +143,8 @@
&:extend(.dropdown-menu > li > a);
padding-top: 4px;
cursor: pointer;
font-size: 13px;
//font-size: 13px;
.font-size-large();
&:hover {
text-decoration: none;
@ -210,7 +211,8 @@
width: 100%;
.box-shadow(none);
margin: 0;
font-size: 12px;
//font-size: 12px;
.font-size-medium();
.settings-item-wrap {
padding: 4px 2px 4px 20px;
@ -246,15 +248,19 @@
width: auto !important;
tr {
td {
label{
.font-size-normal();
}
//padding: 5px 10px;
padding: 6px 10px;
&.group-name label {
font-size: 14px;
//font-size: 14px;
.font-size-huge();
.font-weight-bold();
}
&.subgroup-name label{
font-size: 11px;
.font-weight-bold();
}
@ -268,7 +274,8 @@
label {
.font-weight-bold();
font-size: 12px;
.font-size-medium();
//font-size: 12px;
}
}
@ -362,7 +369,8 @@
.title {
width: 104px;
font-size: 12px;
//font-size: 12px;
.font-size-medium();
line-height: 14px;
height: 28px;
margin: 8px 8px 12px 8px;
@ -400,7 +408,8 @@
.recent-wrap {
padding: 5px 10px;
cursor: pointer;
font-size: 12px;
//font-size: 12px;
.font-size-medium();
&:hover,
&.over {
@ -458,7 +467,8 @@
width: 100%;
.box-shadow(none);
margin: 0;
font-size: 12px;
//font-size: 12px;
.font-size-medium();
float: none;
&:not(.header-name) {
@ -537,7 +547,8 @@
}
label, span {
font-size: 12px;
//font-size: 12px;
.font-size-medium();
}
.tool {
@ -559,7 +570,8 @@
#panel-protect {
label {
font-size: 12px;
//font-size: 12px;
.font-size-medium();
}
padding: 30px 30px;
@ -610,8 +622,11 @@
flex-direction: column;
border-right: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-right: @scaled-one-px-value solid @border-toolbar;
label.header {
font-weight: 700;
label {
.font-size-normal();
&.header {
font-weight: 700;
}
}
.footer {
.btn.primary {

View file

@ -15,7 +15,8 @@
border-bottom: @scaled-one-px-value solid @border-toolbar;
label {
font-size: 12px;
//font-size: 12px;
.font-size-medium();
.font-weight-bold();
margin-top: 2px;
}
@ -29,6 +30,10 @@
padding-top: 45px;
overflow: hidden;
label {
.font-size-normal();
}
.spellcheck-settings-inner {
position: relative;
width: 100%;
@ -86,6 +91,7 @@
#spellcheck-complete {
display: flex;
.font-size-normal();
}
.btn-resolve
{

View file

@ -63,7 +63,8 @@
margin-right: 160px;
margin-bottom: 2px;
width: 285px;
font-size: 12px;
//font-size: 12px;
.font-size-medium();
left: auto;
right: 0;

View file

@ -68,7 +68,8 @@
border-radius: 0;
padding: 3px 10px;
color: #ffffff;
font: 11px arial;
//font: 11px arial;
.font-size-normal();
pointer-events: none;
white-space: nowrap;
letter-spacing: 1px;
@ -210,5 +211,4 @@
.box-shadow(inset 0 0 0 @scaled-two-px-value @border-preview-select) !important;
}
}
}
}