Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #2044 from ONLYOFFICE/feature/custom-font-size

Browse source 
Feature/custom font size
This commit is contained in:
Julia Radzhabova 2022-12-22 11:50:56 +03:00 committed by GitHub
parent 9d83b3d594 41aece8c9b
commit cb24eaac66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
59 changed files with 289 additions and 143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/api/documents/api.js
View file

@ -195,6 +195,7 @@
}, },
font: { font: {
name: "Arial", name: "Arial",
size: "11px";
}, },
chat: true, chat: true,
comments: true, comments: true,

8
apps/common/forms/resources/less/common.less
View file

@ -698,6 +698,14 @@
.fontsize(@font-size-large); .fontsize(@font-size-large);
} }
.font-size-medium {
.fontsize(@font-size-medium);
}
.font-size-huge {
.fontsize(@font-size-huge);
}
.search-bar { .search-bar {
z-index: 50; z-index: 50;
} }

2
apps/common/main/lib/component/Button.js
View file

@ -237,7 +237,7 @@ define([
var getWidthOfCaption = function (txt) { var getWidthOfCaption = function (txt) {
var el = document.createElement('span'); var el = document.createElement('span');
el.style.fontSize = '11px'; el.style.fontSize = document.documentElement.style.getPropertyValue("--font-size-base-app-custom") || '11px';
el.style.fontFamily = 'Arial, Helvetica, "Helvetica Neue", sans-serif'; el.style.fontFamily = 'Arial, Helvetica, "Helvetica Neue", sans-serif';
el.style.position = "absolute"; el.style.position = "absolute";
el.style.top = '-1000px'; el.style.top = '-1000px';

4
apps/common/main/lib/component/ThemeColorPalette.js
View file

@ -85,14 +85,14 @@ define([
'<em><span style="background:#<%=item.color%>;" unselectable="on">&#160;</span></em>' + '<em><span style="background:#<%=item.color%>;" unselectable="on">&#160;</span></em>' +
'</a>' + '</a>' +
'<% } else if (me.isCaption(item)) { %>' + '<% } else if (me.isCaption(item)) { %>' +
'<div class="palette-color-caption" style="width:100%;float:left;font-size: 11px;"><%=item%></div>' + '<div class="palette-color-caption"><%=item%></div>' +
'<% } %>' + '<% } %>' +
'<% }); %>' + '<% }); %>' +
'</div>' + '</div>' +
'<% if (me.options.dynamiccolors!==undefined) { %>' + '<% if (me.options.dynamiccolors!==undefined) { %>' +
'<div class="palette-color-dynamiccolors" style="padding: 4px 0 0 12px">' + '<div class="palette-color-dynamiccolors" style="padding: 4px 0 0 12px">' +
'<div class="palette-color-spacer" style="width:100%;height:8px;float:left;"></div>' + '<div class="palette-color-spacer" style="width:100%;height:8px;float:left;"></div>' +
'<div class="palette-color-caption" style="width:100%;float:left;font-size: 11px;"><%=me.textRecentColors%></div>' + '<div class="palette-color-caption"><%=me.textRecentColors%></div>' +
'<% for (var i=0; i<me.options.dynamiccolors; i++) { %>' + '<% for (var i=0; i<me.options.dynamiccolors; i++) { %>' +
'<a class="color-dynamic-<%=i%> dynamic-empty-color <%= me.emptyColorsClass %>" color="" idx="<%=idx++%>">' + '<a class="color-dynamic-<%=i%> dynamic-empty-color <%= me.emptyColorsClass %>" color="" idx="<%=idx++%>">' +
'<em><span unselectable="on">&#160;</span></em></a>' + '<em><span unselectable="on">&#160;</span></em></a>' +

2
apps/common/main/lib/component/Window.js
View file

@ -520,7 +520,7 @@ define([
body.height(parseInt(text_cnt.css('height')) + parseInt(footer.css('height'))); body.height(parseInt(text_cnt.css('height')) + parseInt(footer.css('height')));
window.setHeight(parseInt(body.css('height')) + parseInt(header.css('height'))); window.setHeight(parseInt(body.css('height')) + parseInt(header.css('height')));
} }
if (text.height() < icon_height-10) if (text.height() < icon_height/2)
text.css({'vertical-align': 'baseline', 'line-height': icon_height+'px'}); text.css({'vertical-align': 'baseline', 'line-height': icon_height+'px'});
} }

3
apps/common/main/lib/view/ReviewPopover.js
View file

@ -513,6 +513,7 @@ define([
this.emailMenu = new Common.UI.Menu({ this.emailMenu = new Common.UI.Menu({
maxHeight: 200, maxHeight: 200,
cyclic: false, cyclic: false,
cls: 'font-size-medium',
items: [] items: []
}).on('render:after', function(mnu) { }).on('render:after', function(mnu) {
this.scroller = new Common.UI.Scroller({ this.scroller = new Common.UI.Scroller({
@ -1254,7 +1255,7 @@ define([
return (item.email && 0 === item.email.toLowerCase().indexOf(str) || item.name && 0 === item.name.toLowerCase().indexOf(str)) 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;"><%= 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>' + '<div style="overflow: hidden; text-overflow: ellipsis; max-width: 195px; color: #909090;"><%= Common.Utils.String.htmlEncode(options.value) %></div>' +
'</a>'), '</a>'),

3
apps/common/main/resources/less/about.less
View file

@ -19,6 +19,7 @@
.asc-about-header { .asc-about-header {
margin: 0 30px; margin: 0 30px;
font: 12px Tahoma; font: 12px Tahoma;
.font-size-medium();
letter-spacing: 1px; letter-spacing: 1px;
color: @text-normal-ie; color: @text-normal-ie;
color: @text-normal; color: @text-normal;
@ -44,6 +45,7 @@
&.asc-about-desc-name, &.asc-about-desc-name,
&.asc-about-lic { &.asc-about-lic {
font: 12px Tahoma; font: 12px Tahoma;
.font-size-medium();
color: @text-normal-ie; color: @text-normal-ie;
color: @text-normal; color: @text-normal;
} }
@ -62,6 +64,7 @@
a { a {
font: 12px Tahoma; font: 12px Tahoma;
.font-size-medium();
color: @text-normal-ie; color: @text-normal-ie;
color: @text-normal; color: @text-normal;
} }

7
apps/common/main/resources/less/buttons.less
View file

@ -94,6 +94,10 @@
} }
} }
.caption {
.font-size-normal();
}
&.icon-top { &.icon-top {
display: inline-flex; display: inline-flex;
flex-direction: column; flex-direction: column;
@ -483,6 +487,7 @@
display: block; display: block;
position: relative; position: relative;
.border-radius(0); .border-radius(0);
.font-size-normal();
.font-weight-bold(); .font-weight-bold();
background-color: transparent; background-color: transparent;
@ -804,6 +809,7 @@
border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;
.border-radius(@border-radius-small); .border-radius(@border-radius-small);
.font-size-normal();
&.auto { &.auto {
width: auto; width: auto;
@ -1070,6 +1076,7 @@
// ------------------------ // ------------------------
.dlg-btn { .dlg-btn {
.font-size-normal();
.font-weight-bold(); .font-weight-bold();
width: 86px; width: 86px;
color: @text-normal-ie; color: @text-normal-ie;

4
apps/common/main/resources/less/calendar.less
View file

@ -83,7 +83,7 @@
width: 100%; width: 100%;
margin: 4px 6px 3px 6px; margin: 4px 6px 3px 6px;
text-align: center; text-align: center;
font-size: 11px; .font-size-normal();
label { label {
padding: 2px 10px 0; padding: 2px 10px 0;
@ -125,7 +125,7 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
font-size: 13px; .font-size-large();
} }
.number-day { .number-day {

10
apps/common/main/resources/less/chat.less
View file

@ -25,7 +25,7 @@
#chat-title { #chat-title {
label { label {
padding: 18px 20px; padding: 18px 20px;
font-size: @font-size-large; .font-size-large();
} }
} }
@ -63,7 +63,7 @@
} }
.name { .name {
font-size: 12px; .font-size-medium();
.font-weight-bold(); .font-weight-bold();
display: block; display: block;
padding: 0 10px 0 0; padding: 0 10px 0 0;
@ -80,7 +80,7 @@
top: 70px; top: 70px;
right: 0; right: 0;
bottom: 110px; bottom: 110px;
font-size: 12px; .font-size-medium();
ul { ul {
margin: 0; margin: 0;
@ -105,7 +105,7 @@
.user-name { .user-name {
color: @text-normal-ie; color: @text-normal-ie;
color: @text-normal; color: @text-normal;
font-size: 12px; .font-size-medium();
.font-weight-bold(); .font-weight-bold();
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -151,7 +151,7 @@
margin-bottom: 5px; margin-bottom: 5px;
border: 1px solid @border-regular-control-ie; border: 1px solid @border-regular-control-ie;
border: 1px solid @border-regular-control; border: 1px solid @border-regular-control;
font-size: 12px; .font-size-medium();
&:focus { &:focus {
border-color: @border-control-focus-ie; border-color: @border-control-focus-ie;

2
apps/common/main/resources/less/combo-border-size.less
View file

@ -19,7 +19,7 @@
span { span {
display: inline-block; display: inline-block;
margin-top: 3px; margin-top: 3px;
font-size: 11px; .font-size-normal();
height: 17px; height: 17px;
} }

1
apps/common/main/resources/less/combo-dataview.less
View file

@ -483,7 +483,6 @@
.caption{ .caption{
line-height: 12px; line-height: 12px;
font-size: 11px;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
width: 100%; width: 100%;

3
apps/common/main/resources/less/combobox.less
View file

@ -8,7 +8,6 @@
&.input-group-nr > .btn { &.input-group-nr > .btn {
height: @input-height-base; height: @input-height-base;
padding: @padding-base-vertical @padding-base-horizontal; padding: @padding-base-vertical @padding-base-horizontal;
font-size: @font-size-base;
line-height: @line-height-base; line-height: @line-height-base;
-o-transition: none; -o-transition: none;
@ -22,6 +21,7 @@
&.input-group-nr > .form-control { &.input-group-nr > .form-control {
padding-right: 7px + 2 * @padding-base-horizontal; padding-right: 7px + 2 * @padding-base-horizontal;
.font-size-normal();
} }
.form-control { .form-control {
@ -29,6 +29,7 @@
position: static; position: static;
z-index: auto; z-index: auto;
float: none; float: none;
.font-size-normal();
.image { .image {
-webkit-filter: @img-border-type-filter; -webkit-filter: @img-border-type-filter;

19
apps/common/main/resources/less/comments.less
View file

@ -19,7 +19,7 @@
border-bottom: @scaled-one-px-value solid @border-toolbar; border-bottom: @scaled-one-px-value solid @border-toolbar;
label { label {
font-size: 12px; .font-size-medium();
.font-weight-bold(); .font-weight-bold();
margin-top: 2px; margin-top: 2px;
} }
@ -70,7 +70,7 @@
label { label {
color: @text-normal-ie; color: @text-normal-ie;
color: @text-normal; color: @text-normal;
font-size: 12px; .font-size-medium();
line-height: normal; line-height: normal;
border-bottom: @scaled-one-px-value-ie dotted @text-normal-ie; border-bottom: @scaled-one-px-value-ie dotted @text-normal-ie;
border-bottom: @scaled-one-px-value dotted @text-normal; border-bottom: @scaled-one-px-value dotted @text-normal;
@ -93,7 +93,7 @@
} }
textarea { textarea {
font-size: 12px; .font-size-medium();
width: 100%; width: 100%;
resize: none; resize: none;
margin-bottom: 5px; margin-bottom: 5px;
@ -120,7 +120,7 @@
.dataview-ct { .dataview-ct {
width: 100%; width: 100%;
height: 100%; height: 100%;
font-size: 12px; .font-size-medium();
line-height: normal; line-height: normal;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
@ -167,7 +167,7 @@
.user-name { .user-name {
color: @text-normal-ie; color: @text-normal-ie;
color: @text-normal; color: @text-normal;
font-size: 12px; .font-size-medium();
.font-weight-bold(); .font-weight-bold();
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -197,7 +197,8 @@
background-color: #ee3525; background-color: #ee3525;
padding: 3px 10px; padding: 3px 10px;
color: #ffffff; color: #ffffff;
font: 11px arial; //font: 11px arial;
.font-size-normal();
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -205,10 +206,10 @@
} }
.user-date { .user-date {
font-size: 11px; .font-size-normal();
white-space: nowrap; white-space: nowrap;
padding: 0; padding: 0;
height: 12px; //height: 12px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
cursor: default; cursor: default;
@ -463,7 +464,7 @@
min-width: 100px; min-width: 100px;
text-align: center; text-align: center;
cursor: pointer; cursor: pointer;
font-size: 11px; .font-size-normal();
font-family: @font-family-base; font-family: @font-family-base;
} }

5
apps/common/main/resources/less/dataview.less
View file

@ -1,4 +1,5 @@
.dataview { .dataview {
font-size: 11px; // must be const value
&.inner { &.inner {
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -48,6 +49,10 @@
} }
} }
.group-description {
.font-size-normal();
}
.group-items-container { .group-items-container {
overflow: hidden; overflow: hidden;
margin-bottom: 5px; margin-bottom: 5px;

2
apps/common/main/resources/less/dimension-picker.less
View file

@ -60,6 +60,6 @@
} }
.dimension-picker-status { .dimension-picker-status {
font-size: 12px; .font-size-medium();
text-align: center; text-align: center;
} }

1
apps/common/main/resources/less/dropdown-menu.less
View file

@ -37,6 +37,7 @@
cursor: pointer; cursor: pointer;
color: @text-normal-ie; color: @text-normal-ie;
color: @text-normal; color: @text-normal;
.font-size-normal();
&:focus, &.focus { &:focus, &.focus {
outline: 0; outline: 0;

4
apps/common/main/resources/less/extended-color-picker.less
View file

@ -14,7 +14,7 @@
label { label {
font-weight: normal; font-weight: normal;
font-size: 12px; .font-size-medium();
margin-bottom: 0; margin-bottom: 0;
vertical-align: middle; vertical-align: middle;
@ -30,7 +30,7 @@
input { input {
font-weight: normal; font-weight: normal;
font-size: 12px; .font-size-medium();
background-color: @background-normal; background-color: @background-normal;
} }

8
apps/common/main/resources/less/header.less
View file

@ -285,7 +285,7 @@
.caption { .caption {
cursor: pointer; cursor: pointer;
font-size: 9px; .font-size-tiny();
margin-left: -18px; margin-left: -18px;
width: 16px; width: 16px;
text-align: center; text-align: center;
@ -395,7 +395,7 @@
padding: 14px; padding: 14px;
width: 285px; width: 285px;
font-size: 12px; .font-size-medium();
z-index: 1042; z-index: 1042;
@ -445,7 +445,7 @@
.user-name { .user-name {
color: @text-normal-ie; color: @text-normal-ie;
color: @text-normal; color: @text-normal;
font-size: 12px; .font-size-medium();
.font-weight-bold(); .font-weight-bold();
white-space: nowrap; white-space: nowrap;
cursor: default; cursor: default;
@ -511,7 +511,7 @@
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
text-align: center; text-align: center;
font-size: 12px; .font-size-medium();
line-height: 24px; line-height: 24px;
padding: 1px 5px; padding: 1px 5px;
background-color: transparent; background-color: transparent;

2
apps/common/main/resources/less/hint-manager.less
View file

@ -9,7 +9,7 @@
background-color: @background-alt-key-hint-ie; background-color: @background-alt-key-hint-ie;
background-color: @background-alt-key-hint; background-color: @background-alt-key-hint;
color: @text-alt-key-hint; color: @text-alt-key-hint;
font-size: 12px; .font-size-medium();
line-height: 18px; line-height: 18px;
padding: 0 4px; padding: 0 4px;
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);

10
apps/common/main/resources/less/history.less
View file

@ -19,7 +19,7 @@
margin-top: 15px; margin-top: 15px;
padding-top: 4px; padding-top: 4px;
padding-left: 20px; padding-left: 20px;
font-size: 13px; .font-size-large();
cursor: pointer; cursor: pointer;
&:hover { &:hover {
@ -44,7 +44,7 @@
margin-top: 8px; margin-top: 8px;
padding-top: 4px; padding-top: 4px;
padding-left: 20px; padding-left: 20px;
font-size: 13px; .font-size-large();
cursor: pointer; cursor: pointer;
&:hover { &:hover {
@ -65,7 +65,7 @@
width: 100%; width: 100%;
.box-shadow(none); .box-shadow(none);
margin: 0; margin: 0;
font-size: 12px; .font-size-medium();
&:hover:not(.selected), &:hover:not(.selected),
&.over { &.over {
@ -98,7 +98,7 @@
.user-date { .user-date {
display: inline-block; display: inline-block;
font-size: 12px; .font-size-medium();
.font-weight-bold(); .font-weight-bold();
margin-right: 12px; margin-right: 12px;
white-space: nowrap; white-space: nowrap;
@ -127,7 +127,7 @@
width: 100%; width: 100%;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
font-size: 12px; .font-size-medium();
.font-weight-bold(); .font-weight-bold();
cursor: pointer; cursor: pointer;
text-overflow: ellipsis; text-overflow: ellipsis;

1
apps/common/main/resources/less/input.less
View file

@ -4,6 +4,7 @@
color: @text-normal-ie; color: @text-normal-ie;
color: @text-normal; color: @text-normal;
.user-select(text); .user-select(text);
.font-size-normal();
border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control; border: @scaled-one-px-value solid @border-regular-control;

5
apps/common/main/resources/less/loadmask.less
View file

@ -47,7 +47,8 @@
} }
.asc-loadmask-title { .asc-loadmask-title {
.fontsize(@font-size-large); //.fontsize(@font-size-large);
.font-size-large();
margin: 0 8px 0 12px; margin: 0 8px 0 12px;
white-space: pre-wrap; white-space: pre-wrap;
} }
@ -99,7 +100,7 @@
} }
.text { .text {
font-size: 14px; .font-size-huge();
} }
} }
} }

2
apps/common/main/resources/less/plugins.less
View file

@ -93,7 +93,7 @@
width: 100%; width: 100%;
margin-top: 2px; margin-top: 2px;
padding-right: 20px; padding-right: 20px;
font-size: 12px; .font-size-medium();
.font-weight-bold(); .font-weight-bold();
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

2
apps/common/main/resources/less/review-changes.less
View file

@ -12,7 +12,7 @@
#id-review-button-reject { #id-review-button-reject {
span.caption { span.caption {
vertical-align: middle; vertical-align: middle;
font-size: 12px; .font-size-medium();
margin: 0 6px; margin: 0 6px;
} }
} }

2
apps/common/main/resources/less/searchdialog.less
View file

@ -125,7 +125,7 @@
border-bottom: @scaled-one-px-value solid @border-toolbar; border-bottom: @scaled-one-px-value solid @border-toolbar;
label { label {
font-size: 12px; .font-size-medium();
.font-weight-bold(); .font-weight-bold();
margin-top: 2px; margin-top: 2px;
} }

2
apps/common/main/resources/less/spinner.less
View file

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

2
apps/common/main/resources/less/synchronize-tip.less
View file

@ -449,7 +449,7 @@
} }
.box-shadow(0 4px 15px -2px rgba(0, 0, 0, 0.5)); .box-shadow(0 4px 15px -2px rgba(0, 0, 0, 0.5));
font-size: 11px; .font-size-normal();
} }
.asc-synchronizetip .tip-arrow:before { .asc-synchronizetip .tip-arrow:before {

6
apps/common/main/resources/less/theme-colorpalette.less
View file

@ -65,5 +65,11 @@
border:solid @scaled-one-px-value @border-color-shading; border:solid @scaled-one-px-value @border-color-shading;
} }
} }
.palette-color-caption {
width:100%;
float:left;
.font-size-normal();
}
} }

4
apps/common/main/resources/less/toolbar.less
View file

@ -32,7 +32,7 @@
.box-tabs { .box-tabs {
height: @height-tabs; height: @height-tabs;
font-size: 12px; .font-size-medium();
display: flex; display: flex;
align-items: stretch; align-items: stretch;
@ -100,7 +100,7 @@
padding: 0 12px; padding: 0 12px;
text-decoration: none; text-decoration: none;
cursor: default; cursor: default;
font-size: 12px; .font-size-medium();
text-align: center; text-align: center;
color: @text-toolbar-header-ie; color: @text-toolbar-header-ie;
color: @text-toolbar-header; color: @text-toolbar-header;

6
apps/common/main/resources/less/tooltip.less
View file

@ -39,7 +39,7 @@
} }
.tooltip-inner { .tooltip-inner {
font-size: 11px; .font-size-normal();
background-color: @background-normal-ie; background-color: @background-normal-ie;
background-color: @background-normal; background-color: @background-normal;
color: @text-normal-ie; color: @text-normal-ie;
@ -58,6 +58,10 @@
.link-tooltip .tooltip-inner { .link-tooltip .tooltip-inner {
max-width: 500px; max-width: 500px;
.review-date {
.font-size-small();
opacity: 0.7;
}
} }
.auto-tooltip .tooltip-inner { .auto-tooltip .tooltip-inner {

9
apps/common/main/resources/less/variables.less
View file

@ -62,9 +62,14 @@
@font-family-tahoma: tahoma, arial, verdana, sans-serif; @font-family-tahoma: tahoma, arial, verdana, sans-serif;
@font-family-base: var(--font-family-base-custom, @font-family-sans-serif), @font-family-sans-serif; @font-family-base: var(--font-family-base-custom, @font-family-sans-serif), @font-family-sans-serif;
@font-size-base: 11px; @font-size-base-app: 11px;
@font-size-large: 13px; @font-size-base-app: var(--font-size-base-app-custom, 11px);
@font-size-small: 9px; @font-size-small: 9px;
@font-size-base: 11px;
@font-size-medium: 12px;
@font-size-large: 13px;
@font-size-huge: 14px;
@font-size-h1: floor(@font-size-base * 2.6); @font-size-h1: floor(@font-size-base * 2.6);
@font-size-h2: floor(@font-size-base * 2.15); @font-size-h2: floor(@font-size-base * 2.15);

7
apps/common/main/resources/less/window.less
View file

@ -99,7 +99,7 @@
color: @text-normal-ie; color: @text-normal-ie;
color: @text-normal; color: @text-normal;
text-align: center; text-align: center;
font-size: 12px; .font-size-medium();
font-weight: 700; font-weight: 700;
letter-spacing: 0.01em; letter-spacing: 0.01em;
vertical-align: bottom; vertical-align: bottom;
@ -219,7 +219,7 @@
padding-left: 60px; padding-left: 60px;
span { span {
font-size: 12px; .font-size-medium();
white-space: nowrap; white-space: nowrap;
a { a {
@ -335,6 +335,9 @@
display: inline-block; display: inline-block;
} }
} }
label {
.font-size-normal();
}
} }
.footer { .footer {

2
apps/documenteditor/main/app/controller/DocumentHolder.js
View file

@ -1018,7 +1018,7 @@ define([
changes = changes[0]; changes = changes[0];
if (changes) { if (changes) {
ToolTip = '<b>'+ Common.Utils.String.htmlEncode(AscCommon.UserInfoParser.getParsedName(changes.get('username'))) +' </b>'; 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'); ToolTip += changes.get('changetext');
if (ToolTip.length>1000) if (ToolTip.length>1000)
ToolTip = ToolTip.substr(0, 1000) + '...'; ToolTip = ToolTip.substr(0, 1000) + '...';

7
apps/documenteditor/main/app/controller/Main.js
View file

@ -391,6 +391,11 @@ define([
} }
document.documentElement.style.setProperty("--font-family-base-custom", arr.join(',')); document.documentElement.style.setProperty("--font-family-base-custom", arr.join(','));
} }
if (this.appOptions.customization.font.size) {
var size = parseInt(this.appOptions.customization.font.size);
!isNaN(size) && document.documentElement.style.setProperty("--font-size-base-app-custom", size + "px");
}
} }
this.editorConfig.user = this.editorConfig.user =
@ -1432,7 +1437,7 @@ define([
} }
} else if (!this.appOptions.isDesktopApp && !this.appOptions.canBrandingExt && } 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.name)) { this.editorConfig.customization.font && (this.editorConfig.customization.font.size || this.editorConfig.customization.font.name))) {
Common.UI.warning({ Common.UI.warning({
title: this.textPaidFeature, title: this.textPaidFeature,
msg : this.textCustomLoader, msg : this.textCustomLoader,

6
apps/documenteditor/main/app/view/ViewTab.js
View file

@ -57,15 +57,15 @@ define([
'<span class="btn-slot" id="slot-field-zoom" style="flex-grow: 1;"></span>' + '<span class="btn-slot" id="slot-field-zoom" style="flex-grow: 1;"></span>' +
'</div>' + '</div>' +
'<div class="elset" style="text-align: center;">' + '<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>' + '</div>' +
'<div class="group small">' + '<div class="group small">' +
'<div class="elset">' + '<div class="elset">' +
'<span class="btn-slot text" id="slot-btn-ftp" style="font-size: 11px;text-align: center;"></span>' + '<span class="btn-slot text" id="slot-btn-ftp" style="text-align: center;"></span>' +
'</div>' + '</div>' +
'<div class="elset">' + '<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>' + '</div>' +
'<div class="separator long"></div>' + '<div class="separator long"></div>' +

28
apps/documenteditor/main/resources/less/app.less
View file

@ -191,16 +191,38 @@
@huge-icon-background-image: var(--huge-icon-background-image); @huge-icon-background-image: var(--huge-icon-background-image);
} }
.font-size-tiny {
.fontsize(9px); // 9px
.fontsize(calc(@font-size-base-app - 2px)); // 9px
}
.font-size-small { .font-size-small {
.fontsize(@font-size-small); .fontsize(10px); // 10px
.fontsize(calc(@font-size-base-app - 1px)); // 10px
} }
.font-size-normal { .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 { .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
}
.font-size-very-huge {
.fontsize(16px); // 16px
.fontsize(calc(@font-size-base-app + 5px)); // 16px
} }
// Skeleton of document // Skeleton of document

39
apps/documenteditor/main/resources/less/filemenu.less
View file

@ -47,7 +47,7 @@
&:extend(.dropdown-menu > li > a); &:extend(.dropdown-menu > li > a);
padding-top: 4px; padding-top: 4px;
cursor: pointer; cursor: pointer;
font-size: 13px; .font-size-large();
&:hover { &:hover {
text-decoration: none; text-decoration: none;
@ -92,7 +92,7 @@
margin: 30px 0 0 10px; margin: 30px 0 0 10px;
.header { .header {
font-size: 16px; .font-size-very-huge();
margin-bottom: 20px; margin-bottom: 20px;
} }
@ -228,21 +228,24 @@
#panel-settings { #panel-settings {
.header { .header {
margin: 30px 0 16px 30px; margin: 30px 0 16px 30px;
font-size: 16px; .font-size-very-huge();
} }
table { table {
width: auto !important; width: auto !important;
tr { tr {
td { td {
label{
.font-size-normal();
}
padding: 6px 10px; padding: 6px 10px;
&.group-name label { &.group-name label {
font-size: 14px; .font-size-huge();
.font-weight-bold(); .font-weight-bold();
} }
&.subgroup-name label{ &.subgroup-name label{
font-size: 11px;
.font-weight-bold(); .font-weight-bold();
} }
@ -256,7 +259,7 @@
width: 30%; width: 30%;
label { label {
.font-weight-bold(); .font-weight-bold();
font-size: 12px; .font-size-medium();
} }
} }
@ -279,7 +282,7 @@
#panel-createnew { #panel-createnew {
.header { .header {
font-size: 16px; .font-size-very-huge();
padding: 0 0 0 10px; padding: 0 0 0 10px;
white-space: nowrap; white-space: nowrap;
margin-top: 30px; margin-top: 30px;
@ -314,7 +317,7 @@
.title { .title {
width: 104px; width: 104px;
font-size: 12px; .font-size-medium();
line-height: 14px; line-height: 14px;
height: 28px; height: 28px;
margin: 8px 8px 12px 8px; margin: 8px 8px 12px 8px;
@ -348,7 +351,7 @@
.header { .header {
margin: 30px 0 20px 10px; margin: 30px 0 20px 10px;
font-size: 16px; .font-size-very-huge();
} }
.item { .item {
@ -360,7 +363,7 @@
.recent-wrap { .recent-wrap {
padding: 5px 10px; padding: 5px 10px;
cursor: pointer; cursor: pointer;
font-size: 12px; .font-size-medium();
&:hover, &:hover,
&.over { &.over {
@ -418,7 +421,7 @@
width: 100%; width: 100%;
.box-shadow(none); .box-shadow(none);
margin: 0; margin: 0;
font-size: 12px; .font-size-medium();
float: none; float: none;
&:not(.header-name) { &:not(.header-name) {
@ -443,7 +446,7 @@
.header-name { .header-name {
padding: 16px 2px 4px 10px; padding: 16px 2px 4px 10px;
font-size: 12px; .font-size-medium();
} }
} }
} }
@ -455,14 +458,14 @@
.header { .header {
margin: 30px 0 20px 0; margin: 30px 0 20px 0;
font-size: 16px; .font-size-very-huge();
} }
} }
#panel-info { #panel-info {
.header { .header {
margin: 30px 0 20px 30px; margin: 30px 0 20px 30px;
font-size: 16px; .font-size-very-huge();
} }
} }
@ -511,7 +514,7 @@
} }
label, span { label, span {
font-size: 12px; .font-size-medium();
} }
.tool { .tool {
@ -555,7 +558,7 @@
#panel-protect { #panel-protect {
label { label {
font-size: 12px; .font-size-medium();
} }
#file-menu-panel & { #file-menu-panel & {
@ -594,7 +597,7 @@
} }
#id-fms-lbl-protect-header { #id-fms-lbl-protect-header {
font-size: 16px; .font-size-very-huge();
} }
.btn-text-default.auto { .btn-text-default.auto {
@ -607,7 +610,7 @@
#panel-print { #panel-print {
padding: 0; padding: 0;
.main-header { .main-header {
font-size: 16px; .font-size-very-huge();
margin: 18px 0 20px 0; margin: 18px 0 20px 0;
} }
#id-print-settings { #id-print-settings {

10
apps/documenteditor/main/resources/less/navigation.less
View file

@ -14,7 +14,7 @@
border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie; border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-bottom: @scaled-one-px-value solid @border-toolbar; border-bottom: @scaled-one-px-value solid @border-toolbar;
label { label {
font-size: 12px; .font-size-medium();
.font-weight-bold(); .font-weight-bold();
margin-top: 2px; margin-top: 2px;
} }
@ -24,7 +24,7 @@
padding-top: 45px; padding-top: 45px;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
font-size: 12px; .font-size-medium();
.treeview { .treeview {
padding: 8px 0; padding: 8px 0;
@ -44,16 +44,16 @@
} }
} }
&.small{ &.small{
font-size: 10px; .font-size-small();
} }
&.medium{ &.medium{
font-size: 12px; .font-size-medium();
.name { .name {
padding: 4px 0; padding: 4px 0;
} }
} }
&.large{ &.large{
font-size: 14px; .font-size-huge();
} }
.name.not-header { .name.not-header {
font-style: italic; font-style: italic;

2
apps/documenteditor/main/resources/less/statusbar.less
View file

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

4
apps/documenteditor/main/resources/less/thumbnails.less
View file

@ -18,7 +18,7 @@
border-bottom: @scaled-one-px-value solid @border-toolbar; border-bottom: @scaled-one-px-value solid @border-toolbar;
label { label {
font-size: 12px; .font-size-medium();
.font-weight-bold(); .font-weight-bold();
margin-top: 2px; margin-top: 2px;
} }
@ -34,7 +34,7 @@
#thumbnails-size { #thumbnails-size {
label { label {
font-size: 11px; .font-size-normal();
font-weight: normal; font-weight: normal;
margin: 0; margin: 0;
padding-left: 12px; padding-left: 12px;

2
apps/documenteditor/main/resources/less/toolbar.less
View file

@ -204,4 +204,4 @@
display: none !important; display: none !important;
} }
} }
} }

6
apps/presentationeditor/main/app/controller/Main.js
View file

@ -350,6 +350,10 @@ define([
} }
document.documentElement.style.setProperty("--font-family-base-custom", arr.join(',')); document.documentElement.style.setProperty("--font-family-base-custom", arr.join(','));
} }
if (this.appOptions.customization.font.size) {
var size = parseInt(this.appOptions.customization.font.size);
!isNaN(size) && document.documentElement.style.setProperty("--font-size-base-app-custom", size + "px");
}
} }
this.editorConfig.user = this.editorConfig.user =
@ -1054,7 +1058,7 @@ define([
} }
} else if (!this.appOptions.isDesktopApp && !this.appOptions.canBrandingExt && } 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.name)) { this.editorConfig.customization.font && (this.editorConfig.customization.font.size || this.editorConfig.customization.font.name))) {
Common.UI.warning({ Common.UI.warning({
title: this.textPaidFeature, title: this.textPaidFeature,
msg : this.textCustomLoader, msg : this.textCustomLoader,

6
apps/presentationeditor/main/app/view/ViewTab.js
View file

@ -53,15 +53,15 @@ define([
'<span class="btn-slot" id="slot-field-zoom" style="flex-grow: 1;"></span>' + '<span class="btn-slot" id="slot-field-zoom" style="flex-grow: 1;"></span>' +
'</div>' + '</div>' +
'<div class="elset" style="text-align: center;">' + '<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>' + '</div>' +
'<div class="group small">' + '<div class="group small">' +
'<div class="elset">' + '<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>' +
'<div class="elset">' + '<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>' + '</div>' +
'<div class="separator long"></div>' + '<div class="separator long"></div>' +

2
apps/presentationeditor/main/resources/less/advanced-settings.less
View file

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

28
apps/presentationeditor/main/resources/less/app.less
View file

@ -147,16 +147,38 @@
@import "sprites/iconssmall@1.75x"; @import "sprites/iconssmall@1.75x";
@import "sprites/iconsbig@1.75x"; @import "sprites/iconsbig@1.75x";
.font-size-tiny {
.fontsize(9px); // 9px
.fontsize(calc(@font-size-base-app - 2px)); // 9px
}
.font-size-small { .font-size-small {
.fontsize(@font-size-small); .fontsize(10px); // 10px
.fontsize(calc(@font-size-base-app - 1px)); // 10px
} }
.font-size-normal { .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 { .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
}
.font-size-very-huge {
.fontsize(16px); // 16px
.fontsize(calc(@font-size-base-app + 5px)); // 16px
} }
.slidenum-div { .slidenum-div {

3
apps/presentationeditor/main/resources/less/document-preview.less
View file

@ -19,7 +19,8 @@
} }
#preview-label-slides { #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-ie;
color: @text-normal; color: @text-normal;
text-shadow: none; text-shadow: none;

37
apps/presentationeditor/main/resources/less/leftmenu.less
View file

@ -158,7 +158,7 @@
&:extend(.dropdown-menu > li > a); &:extend(.dropdown-menu > li > a);
padding-top: 4px; padding-top: 4px;
cursor: pointer; cursor: pointer;
font-size: 13px; .font-size-large();
&:hover { &:hover {
text-decoration: none; text-decoration: none;
@ -200,7 +200,7 @@
margin: 30px 0 0 10px; margin: 30px 0 0 10px;
.header { .header {
font-size: 16px; .font-size-very-huge();
margin-bottom: 20px; margin-bottom: 20px;
} }
@ -235,7 +235,7 @@
#panel-settings { #panel-settings {
.header { .header {
margin: 30px 0 16px 30px; margin: 30px 0 16px 30px;
font-size: 16px; .font-size-very-huge();
} }
table { table {
@ -243,15 +243,18 @@
tr { tr {
td { td {
label{
.font-size-normal();
}
padding: 6px 10px; padding: 6px 10px;
width: auto !important; width: auto !important;
&.group-name label { &.group-name label {
font-size: 14px; .font-size-huge();
.font-weight-bold(); .font-weight-bold();
} }
&.subgroup-name label{ &.subgroup-name label{
font-size: 11px;
.font-weight-bold(); .font-weight-bold();
} }
@ -264,7 +267,7 @@
label { label {
.font-weight-bold(); .font-weight-bold();
font-size: 12px; .font-size-medium();
} }
} }
@ -285,7 +288,7 @@
#panel-createnew { #panel-createnew {
.header { .header {
font-size: 16px; .font-size-very-huge();
padding: 0 0 0 10px; padding: 0 0 0 10px;
white-space: nowrap; white-space: nowrap;
margin-top: 30px; margin-top: 30px;
@ -320,7 +323,7 @@
.title { .title {
width: 104px; width: 104px;
font-size: 12px; .font-size-medium();
line-height: 14px; line-height: 14px;
height: 28px; height: 28px;
margin: 8px 8px 12px 8px; margin: 8px 8px 12px 8px;
@ -353,7 +356,7 @@
.header { .header {
margin: 30px 0 20px 10px; margin: 30px 0 20px 10px;
font-size: 16px; .font-size-very-huge();
} }
.dataview { .dataview {
@ -367,7 +370,7 @@
.recent-wrap { .recent-wrap {
padding: 5px 10px; padding: 5px 10px;
cursor: pointer; cursor: pointer;
font-size: 12px; .font-size-medium();
&:hover, &:hover,
&.over { &.over {
@ -425,7 +428,7 @@
width: 100%; width: 100%;
.box-shadow(none); .box-shadow(none);
margin: 0; margin: 0;
font-size: 12px; .font-size-medium();
float: none; float: none;
&:not(.header-name) { &:not(.header-name) {
@ -459,14 +462,14 @@
.header { .header {
margin: 30px 0 20px 0; margin: 30px 0 20px 0;
font-size: 16px; .font-size-very-huge();
} }
} }
#panel-info { #panel-info {
.header { .header {
margin: 30px 0 20px 30px; margin: 30px 0 20px 30px;
font-size: 16px; .font-size-very-huge();
} }
} }
@ -516,7 +519,7 @@
} }
label, span { label, span {
font-size: 12px; .font-size-medium();
} }
.tool { .tool {
@ -540,7 +543,7 @@
padding: 30px 30px; padding: 30px 30px;
label { label {
font-size: 12px; .font-size-medium();
} }
.header { .header {
@ -575,7 +578,7 @@
} }
#id-fms-lbl-protect-header { #id-fms-lbl-protect-header {
font-size: 16px; .font-size-very-huge();
} }
.btn-text-default.auto { .btn-text-default.auto {
@ -587,7 +590,7 @@
#panel-print { #panel-print {
padding: 0; padding: 0;
.main-header { .main-header {
font-size: 16px; .font-size-very-huge();
margin: 18px 0 20px 0; margin: 18px 0 20px 0;
} }
#print-preview-empty { #print-preview-empty {

2
apps/presentationeditor/main/resources/less/statusbar.less
View file

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

6
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -388,6 +388,10 @@ define([
} }
document.documentElement.style.setProperty("--font-family-base-custom", arr.join(',')); document.documentElement.style.setProperty("--font-family-base-custom", arr.join(','));
} }
if (this.appOptions.customization.font.size) {
var size = parseInt(this.appOptions.customization.font.size);
!isNaN(size) && document.documentElement.style.setProperty("--font-size-base-app-custom", size + "px");
}
} }
this.editorConfig.user = this.editorConfig.user =
@ -1139,7 +1143,7 @@ define([
} }
} else if (!this.appOptions.isDesktopApp && !this.appOptions.canBrandingExt && !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge || this.appOptions.isEditOle) && } 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.name)) { this.editorConfig.customization.font && (this.editorConfig.customization.font.size || this.editorConfig.customization.font.name))) {
Common.UI.warning({ Common.UI.warning({
title: this.textPaidFeature, title: this.textPaidFeature,
msg : this.textCustomLoader, msg : this.textCustomLoader,

2
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -1910,7 +1910,7 @@ define([
me.mnuCustomScale = new Common.UI.MenuItem({ me.mnuCustomScale = new Common.UI.MenuItem({
template: _.template([ template: _.template([
'<div class="checkable custom-scale" style="padding: 5px 5px 5px 20px;font-weight: normal;line-height: 1.42857143;font-size: 11px;height: 32px;"', '<div class="checkable custom-scale font-size-normal" style="padding: 5px 5px 5px 20px;font-weight: normal;height: 32px;"',
'<% if(!_.isUndefined(options.stopPropagation)) { %>', '<% if(!_.isUndefined(options.stopPropagation)) { %>',
'data-stopPropagation="true"', 'data-stopPropagation="true"',
'<% } %>', '>', '<% } %>', '>',

2
apps/spreadsheeteditor/main/app/view/ViewTab.js
View file

@ -64,7 +64,7 @@ define([
'<span class="btn-slot" id="slot-field-zoom" style="flex-grow: 1;"></span>' + '<span class="btn-slot" id="slot-field-zoom" style="flex-grow: 1;"></span>' +
'</div>' + '</div>' +
'<div class="elset" style="text-align: center;">' + '<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>' + '</div>' +
'<div class="separator long"></div>' + '<div class="separator long"></div>' +

2
apps/spreadsheeteditor/main/resources/less/advanced-settings.less
View file

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

28
apps/spreadsheeteditor/main/resources/less/app.less
View file

@ -149,16 +149,38 @@
@import "sprites/iconssmall@1.75x"; @import "sprites/iconssmall@1.75x";
@import "sprites/iconsbig@1.75x"; @import "sprites/iconsbig@1.75x";
.font-size-tiny {
.fontsize(9px); // 9px
.fontsize(calc(@font-size-base-app - 2px)); // 9px
}
.font-size-small { .font-size-small {
.fontsize(@font-size-small); .fontsize(10px); // 10px
.fontsize(calc(@font-size-base-app - 1px)); // 10px
} }
.font-size-normal { .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 { .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
}
.font-size-very-huge {
.fontsize(16px); // 16px
.fontsize(calc(@font-size-base-app + 5px)); // 16px
} }
// Skeleton of workbook // Skeleton of workbook

2
apps/spreadsheeteditor/main/resources/less/celleditor.less
View file

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

45
apps/spreadsheeteditor/main/resources/less/leftmenu.less
View file

@ -149,7 +149,7 @@
&:extend(.dropdown-menu > li > a); &:extend(.dropdown-menu > li > a);
padding-top: 4px; padding-top: 4px;
cursor: pointer; cursor: pointer;
font-size: 13px; .font-size-large();
&:hover { &:hover {
text-decoration: none; text-decoration: none;
@ -191,7 +191,7 @@
margin: 30px 0 0 10px; margin: 30px 0 0 10px;
.header { .header {
font-size: 16px; .font-size-very-huge();
margin-bottom: 20px; margin-bottom: 20px;
} }
@ -223,7 +223,7 @@
.header { .header {
margin: 30px 0 20px 30px; margin: 30px 0 20px 30px;
font-size: 16px; .font-size-very-huge();
} }
} }
@ -234,7 +234,7 @@
.header { .header {
margin: 30px 0 16px 30px; margin: 30px 0 16px 30px;
font-size: 16px; .font-size-very-huge();
} }
#id-settings-menu { #id-settings-menu {
@ -248,7 +248,7 @@
width: 100%; width: 100%;
.box-shadow(none); .box-shadow(none);
margin: 0; margin: 0;
font-size: 12px; .font-size-medium();
.settings-item-wrap { .settings-item-wrap {
padding: 4px 2px 4px 20px; padding: 4px 2px 4px 20px;
@ -284,15 +284,18 @@
width: auto !important; width: auto !important;
tr { tr {
td { td {
label{
.font-size-normal();
}
//padding: 5px 10px; //padding: 5px 10px;
padding: 6px 10px; padding: 6px 10px;
&.group-name label { &.group-name label {
font-size: 14px; .font-size-huge();
.font-weight-bold(); .font-weight-bold();
} }
&.subgroup-name label{ &.subgroup-name label{
font-size: 11px;
.font-weight-bold(); .font-weight-bold();
} }
@ -306,7 +309,7 @@
label { label {
.font-weight-bold(); .font-weight-bold();
font-size: 12px; .font-size-medium();
} }
} }
@ -351,7 +354,7 @@
#panel-createnew { #panel-createnew {
.header { .header {
font-size: 16px; .font-size-very-huge();
padding: 0 0 0 10px; padding: 0 0 0 10px;
white-space: nowrap; white-space: nowrap;
margin-top: 30px; margin-top: 30px;
@ -386,7 +389,7 @@
.title { .title {
width: 104px; width: 104px;
font-size: 12px; .font-size-medium();
line-height: 14px; line-height: 14px;
height: 28px; height: 28px;
margin: 8px 8px 12px 8px; margin: 8px 8px 12px 8px;
@ -419,7 +422,7 @@
.header { .header {
margin: 30px 0 20px 10px; margin: 30px 0 20px 10px;
font-size: 16px; .font-size-very-huge();
} }
.dataview { .dataview {
@ -433,7 +436,7 @@
.recent-wrap { .recent-wrap {
padding: 5px 10px; padding: 5px 10px;
cursor: pointer; cursor: pointer;
font-size: 12px; .font-size-medium();
&:hover, &:hover,
&.over { &.over {
@ -491,7 +494,7 @@
width: 100%; width: 100%;
.box-shadow(none); .box-shadow(none);
margin: 0; margin: 0;
font-size: 12px; .font-size-medium();
float: none; float: none;
&:not(.header-name) { &:not(.header-name) {
@ -525,7 +528,7 @@
.header { .header {
margin: 30px 0 20px 0; margin: 30px 0 20px 0;
font-size: 16px; .font-size-very-huge();
} }
} }
@ -575,7 +578,7 @@
} }
label, span { label, span {
font-size: 12px; .font-size-medium();
} }
.tool { .tool {
@ -599,7 +602,7 @@
padding: 30px 30px; padding: 30px 30px;
label { label {
font-size: 12px; .font-size-medium();
} }
.header { .header {
@ -634,7 +637,7 @@
} }
#id-fms-lbl-protect-header { #id-fms-lbl-protect-header {
font-size: 16px; .font-size-very-huge();
} }
.btn-text-default.auto { .btn-text-default.auto {
@ -645,7 +648,7 @@
#panel-print { #panel-print {
.main-header { .main-header {
font-size: 16px; .font-size-very-huge();
margin: 18px 0 20px 0; margin: 18px 0 20px 0;
} }
padding: 0; padding: 0;
@ -681,6 +684,12 @@
flex-direction: column; flex-direction: column;
border-right: @scaled-one-px-value-ie solid @border-toolbar-ie; border-right: @scaled-one-px-value-ie solid @border-toolbar-ie;
border-right: @scaled-one-px-value solid @border-toolbar; border-right: @scaled-one-px-value solid @border-toolbar;
label {
.font-size-normal();
&.header {
font-weight: 700;
}
}
.pages { .pages {
label, #print-spin-pages-from { label, #print-spin-pages-from {
margin-right: 6px; margin-right: 6px;

7
apps/spreadsheeteditor/main/resources/less/spellcheck.less
View file

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

2
apps/spreadsheeteditor/main/resources/less/statusbar.less
View file

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

3
apps/spreadsheeteditor/main/resources/less/toolbar.less
View file

@ -213,5 +213,4 @@
.box-shadow(inset 0 0 0 @scaled-two-px-value @border-preview-select) !important; .box-shadow(inset 0 0 0 @scaled-two-px-value @border-preview-select) !important;
} }
} }
} }