diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 78d99621c..2af3895bc 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -148,6 +148,9 @@ reviewDisplay: 'original', // original for viewer, markup for editor trackChanges: undefined // true/false - open editor with track changes mode on/off, }, + font: { + size: 11px; + }, layout: { // hide elements, but don't disable feature toolbar: { file: { // menu file diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js index 2d3cd9586..41a7a1ccc 100644 --- a/apps/common/main/lib/component/Button.js +++ b/apps/common/main/lib/component/Button.js @@ -237,7 +237,7 @@ define([ var getWidthOfCaption = function (txt) { 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.position = "absolute"; el.style.top = '-1000px'; diff --git a/apps/common/main/lib/component/ThemeColorPalette.js b/apps/common/main/lib/component/ThemeColorPalette.js index 1af6e825b..be48719c0 100644 --- a/apps/common/main/lib/component/ThemeColorPalette.js +++ b/apps/common/main/lib/component/ThemeColorPalette.js @@ -85,14 +85,14 @@ define([ ' ' + '' + '<% } else if (me.isCaption(item)) { %>' + - '
<%=item%>
' + + '
<%=item%>
' + '<% } %>' + '<% }); %>' + '' + '<% if (me.options.dynamiccolors!==undefined) { %>' + '
' + '
' + - '
<%=me.textRecentColors%>
' + + '
<%=me.textRecentColors%>
' + '<% for (var i=0; i' + '' + ' ' + diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js index 5b2d2f430..838e6581c 100644 --- a/apps/common/main/lib/component/Window.js +++ b/apps/common/main/lib/component/Window.js @@ -500,7 +500,7 @@ define([ body.height(parseInt(text_cnt.css('height')) + parseInt(footer.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'}); } diff --git a/apps/common/main/resources/less/about.less b/apps/common/main/resources/less/about.less index 2984110ca..0a7f4349f 100644 --- a/apps/common/main/resources/less/about.less +++ b/apps/common/main/resources/less/about.less @@ -19,6 +19,7 @@ .asc-about-header { margin: 0 30px; font: 12px Tahoma; + .font-size-medium(); letter-spacing: 1px; color: @text-normal-ie; color: @text-normal; @@ -44,6 +45,7 @@ &.asc-about-desc-name, &.asc-about-lic { font: 12px Tahoma; + .font-size-medium(); color: @text-normal-ie; color: @text-normal; } @@ -62,6 +64,7 @@ a { font: 12px Tahoma; + .font-size-medium(); color: @text-normal-ie; color: @text-normal; } diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 350f1130c..310f80c68 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -94,6 +94,10 @@ } } + .caption { + .font-size-normal(); + } + &.icon-top { display: inline-flex; flex-direction: column; @@ -483,6 +487,7 @@ display: block; position: relative; .border-radius(0); + .font-size-normal(); .font-weight-bold(); background-color: transparent; @@ -804,6 +809,7 @@ border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; .border-radius(@border-radius-small); + .font-size-normal(); &.auto { width: auto; @@ -1070,6 +1076,7 @@ // ------------------------ .dlg-btn { + .font-size-normal(); .font-weight-bold(); width: 86px; color: @text-normal-ie; diff --git a/apps/common/main/resources/less/calendar.less b/apps/common/main/resources/less/calendar.less index 6926539d7..54ea69255 100644 --- a/apps/common/main/resources/less/calendar.less +++ b/apps/common/main/resources/less/calendar.less @@ -83,7 +83,8 @@ width: 100%; margin: 4px 6px 3px 6px; text-align: center; - font-size: 11px; + //font-size: 11px; + .font-size-normal(); label { padding: 2px 10px 0; @@ -125,7 +126,8 @@ display: flex; justify-content: center; align-items: center; - font-size: 13px; + //font-size: 13px; + .font-size-large(); } .number-day { diff --git a/apps/common/main/resources/less/chat.less b/apps/common/main/resources/less/chat.less index 566e58cab..e313f85e1 100644 --- a/apps/common/main/resources/less/chat.less +++ b/apps/common/main/resources/less/chat.less @@ -25,7 +25,8 @@ #chat-title { label { padding: 18px 20px; - font-size: @font-size-large; + //font-size: @font-size-large; + .font-size-large(); } } @@ -63,7 +64,8 @@ } .name { - font-size: 12px; + //font-size: 12px; + .font-size-medium(); .font-weight-bold(); display: block; padding: 0 10px 0 0; @@ -80,7 +82,8 @@ top: 70px; right: 0; bottom: 110px; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); ul { margin: 0; @@ -105,7 +108,8 @@ .user-name { color: @text-normal-ie; color: @text-normal; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); .font-weight-bold(); overflow: hidden; text-overflow: ellipsis; @@ -151,7 +155,8 @@ margin-bottom: 5px; border: 1px solid @border-regular-control-ie; border: 1px solid @border-regular-control; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); &:focus { border-color: @border-control-focus-ie; diff --git a/apps/common/main/resources/less/combo-border-size.less b/apps/common/main/resources/less/combo-border-size.less index 669b67f60..f3aed67e2 100644 --- a/apps/common/main/resources/less/combo-border-size.less +++ b/apps/common/main/resources/less/combo-border-size.less @@ -19,7 +19,8 @@ span { display: inline-block; margin-top: 3px; - font-size: 11px; + //font-size: 11px; + .font-size-normal(); height: 17px; } diff --git a/apps/common/main/resources/less/combo-dataview.less b/apps/common/main/resources/less/combo-dataview.less index 745b348ae..846298ce1 100644 --- a/apps/common/main/resources/less/combo-dataview.less +++ b/apps/common/main/resources/less/combo-dataview.less @@ -483,7 +483,8 @@ .caption{ line-height: 12px; - font-size: 11px; + //font-size: 11px; + .font-size-normal(); text-overflow: ellipsis; overflow: hidden; width: 100%; diff --git a/apps/common/main/resources/less/combobox.less b/apps/common/main/resources/less/combobox.less index 60a69f1fa..d2c284c20 100644 --- a/apps/common/main/resources/less/combobox.less +++ b/apps/common/main/resources/less/combobox.less @@ -8,7 +8,6 @@ &.input-group-nr > .btn { height: @input-height-base; padding: @padding-base-vertical @padding-base-horizontal; - font-size: @font-size-base; line-height: @line-height-base; -o-transition: none; @@ -22,6 +21,7 @@ &.input-group-nr > .form-control { padding-right: 7px + 2 * @padding-base-horizontal; + .font-size-normal(); } .form-control { @@ -29,6 +29,7 @@ position: static; z-index: auto; float: none; + .font-size-normal(); .image { -webkit-filter: @img-border-type-filter; diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less index c911a59e1..97f8f6435 100644 --- a/apps/common/main/resources/less/comments.less +++ b/apps/common/main/resources/less/comments.less @@ -19,7 +19,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; } @@ -71,6 +72,7 @@ color: @text-normal-ie; color: @text-normal; font: 12px arial; + .font-size-medium(); line-height: normal; border-bottom: @scaled-one-px-value-ie dotted @text-normal-ie; border-bottom: @scaled-one-px-value dotted @text-normal; @@ -93,7 +95,8 @@ } textarea { - font-size: 12px; + //font-size: 12px; + .font-size-medium(); width: 100%; resize: none; margin-bottom: 5px; @@ -121,6 +124,7 @@ width: 100%; height: 100%; font: 12px arial; + .font-size-medium(); line-height: normal; position: relative; overflow: hidden; @@ -167,7 +171,8 @@ .user-name { color: @text-normal-ie; color: @text-normal; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); .font-weight-bold(); overflow: hidden; text-overflow: ellipsis; @@ -205,10 +210,11 @@ } .user-date { - font-size: 11px; + //font-size: 11px; + .font-size-normal(); white-space: nowrap; padding: 0; - height: 12px; + //height: 12px; overflow: hidden; text-overflow: ellipsis; cursor: default; @@ -463,7 +469,8 @@ min-width: 100px; text-align: center; cursor: pointer; - font-size: 11px; + //font-size: 11px; + .font-size-normal(); font-family: @font-family-base; } diff --git a/apps/common/main/resources/less/dimension-picker.less b/apps/common/main/resources/less/dimension-picker.less index f6f736c53..0913efe41 100644 --- a/apps/common/main/resources/less/dimension-picker.less +++ b/apps/common/main/resources/less/dimension-picker.less @@ -38,6 +38,7 @@ } .dimension-picker-status { - font-size: 12px; + //font-size: 12px; + .font-size-medium(); text-align: center; } \ No newline at end of file diff --git a/apps/common/main/resources/less/dropdown-menu.less b/apps/common/main/resources/less/dropdown-menu.less index ae214c7ae..6a922c31c 100644 --- a/apps/common/main/resources/less/dropdown-menu.less +++ b/apps/common/main/resources/less/dropdown-menu.less @@ -1,5 +1,6 @@ .dropdown-menu { + .font-size-normal(); background-color: @background-normal-ie; background-color: @background-normal; border-color: @border-regular-control-ie; diff --git a/apps/common/main/resources/less/extended-color-picker.less b/apps/common/main/resources/less/extended-color-picker.less index 92b809b6e..ae7a286fd 100644 --- a/apps/common/main/resources/less/extended-color-picker.less +++ b/apps/common/main/resources/less/extended-color-picker.less @@ -14,7 +14,8 @@ label { font-weight: normal; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); margin-bottom: 0; vertical-align: middle; @@ -30,7 +31,8 @@ input { font-weight: normal; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); background-color: @background-normal; } diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 999193ce3..fdd32d667 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -285,7 +285,8 @@ .caption { cursor: pointer; - font-size: 9px; + //font-size: 9px; + .font-size-tiny(); margin-left: -18px; width: 16px; text-align: center; @@ -395,7 +396,8 @@ padding: 14px; width: 285px; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); z-index: 1042; @@ -445,7 +447,8 @@ .user-name { color: @text-normal-ie; color: @text-normal; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); .font-weight-bold(); white-space: nowrap; cursor: default; @@ -511,7 +514,8 @@ text-overflow: ellipsis; overflow: hidden; text-align: center; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); line-height: 24px; padding: 1px 5px; background-color: transparent; diff --git a/apps/common/main/resources/less/hint-manager.less b/apps/common/main/resources/less/hint-manager.less index ef0541000..23fdf4549 100644 --- a/apps/common/main/resources/less/hint-manager.less +++ b/apps/common/main/resources/less/hint-manager.less @@ -9,7 +9,8 @@ background-color: @background-alt-key-hint-ie; background-color: @background-alt-key-hint; color: @text-alt-key-hint; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); line-height: 18px; padding: 0 4px; box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); diff --git a/apps/common/main/resources/less/history.less b/apps/common/main/resources/less/history.less index 87bbf144a..ed72ef3ac 100644 --- a/apps/common/main/resources/less/history.less +++ b/apps/common/main/resources/less/history.less @@ -19,7 +19,8 @@ margin-top: 15px; padding-top: 4px; padding-left: 20px; - font-size: 13px; + //font-size: 13px; + .font-size-large(); cursor: pointer; &:hover { @@ -44,7 +45,8 @@ margin-top: 8px; padding-top: 4px; padding-left: 20px; - font-size: 13px; + //font-size: 13px; + .font-size-large(); cursor: pointer; &:hover { @@ -65,7 +67,8 @@ width: 100%; .box-shadow(none); margin: 0; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); &:hover:not(.selected), &.over { @@ -98,7 +101,8 @@ .user-date { display: inline-block; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); .font-weight-bold(); margin-right: 12px; white-space: nowrap; @@ -127,7 +131,8 @@ width: 100%; white-space: nowrap; overflow: hidden; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); .font-weight-bold(); cursor: pointer; text-overflow: ellipsis; diff --git a/apps/common/main/resources/less/input.less b/apps/common/main/resources/less/input.less index f0478c568..8412036eb 100644 --- a/apps/common/main/resources/less/input.less +++ b/apps/common/main/resources/less/input.less @@ -4,6 +4,7 @@ color: @text-normal-ie; color: @text-normal; .user-select(text); + .font-size-normal(); border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; diff --git a/apps/common/main/resources/less/loadmask.less b/apps/common/main/resources/less/loadmask.less index 19d53f109..0b46ec359 100644 --- a/apps/common/main/resources/less/loadmask.less +++ b/apps/common/main/resources/less/loadmask.less @@ -47,7 +47,8 @@ } .asc-loadmask-title { - .fontsize(@font-size-large); + //.fontsize(@font-size-large); + .font-size-large(); margin: 0 8px 0 12px; white-space: pre-wrap; } diff --git a/apps/common/main/resources/less/plugins.less b/apps/common/main/resources/less/plugins.less index 607d738d8..c091ef68d 100644 --- a/apps/common/main/resources/less/plugins.less +++ b/apps/common/main/resources/less/plugins.less @@ -93,7 +93,8 @@ width: 100%; margin-top: 2px; padding-right: 20px; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); .font-weight-bold(); overflow: hidden; text-overflow: ellipsis; diff --git a/apps/common/main/resources/less/review-changes.less b/apps/common/main/resources/less/review-changes.less index 9361d71b8..ff6a94554 100644 --- a/apps/common/main/resources/less/review-changes.less +++ b/apps/common/main/resources/less/review-changes.less @@ -12,7 +12,8 @@ #id-review-button-reject { span.caption { vertical-align: middle; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); margin: 0 6px; } } diff --git a/apps/common/main/resources/less/searchdialog.less b/apps/common/main/resources/less/searchdialog.less index e96e720ef..5c1a93868 100644 --- a/apps/common/main/resources/less/searchdialog.less +++ b/apps/common/main/resources/less/searchdialog.less @@ -125,7 +125,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; } diff --git a/apps/common/main/resources/less/synchronize-tip.less b/apps/common/main/resources/less/synchronize-tip.less index 2e3297484..5e36eefe3 100644 --- a/apps/common/main/resources/less/synchronize-tip.less +++ b/apps/common/main/resources/less/synchronize-tip.less @@ -449,7 +449,8 @@ } .box-shadow(0 4px 15px -2px rgba(0, 0, 0, 0.5)); - font-size: 11px; + //font-size: 11px; + .font-size-normal(); } .asc-synchronizetip .tip-arrow:before { diff --git a/apps/common/main/resources/less/theme-colorpalette.less b/apps/common/main/resources/less/theme-colorpalette.less index 3c71fba63..f49260b6d 100644 --- a/apps/common/main/resources/less/theme-colorpalette.less +++ b/apps/common/main/resources/less/theme-colorpalette.less @@ -65,5 +65,11 @@ border:solid @scaled-one-px-value @border-color-shading; } } + + .palette-color-caption { + width:100%; + float:left; + .font-size-normal(); + } } diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index c98122d75..4d5f30d44 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -32,7 +32,8 @@ .box-tabs { height: @height-tabs; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); display: flex; align-items: stretch; @@ -100,7 +101,8 @@ padding: 0 12px; text-decoration: none; cursor: default; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); text-align: center; color: @text-toolbar-header-ie; color: @text-toolbar-header; diff --git a/apps/common/main/resources/less/tooltip.less b/apps/common/main/resources/less/tooltip.less index 45d4ae489..e4053ff3c 100644 --- a/apps/common/main/resources/less/tooltip.less +++ b/apps/common/main/resources/less/tooltip.less @@ -39,7 +39,8 @@ } .tooltip-inner { - font-size: 11px; + //font-size: 11px; + .font-size-normal(); background-color: @background-normal-ie; background-color: @background-normal; color: @text-normal-ie; diff --git a/apps/common/main/resources/less/variables.less b/apps/common/main/resources/less/variables.less index 0660a8c87..493b53bc0 100644 --- a/apps/common/main/resources/less/variables.less +++ b/apps/common/main/resources/less/variables.less @@ -62,6 +62,9 @@ @font-family-tahoma: tahoma, arial, verdana, sans-serif; @font-family-base: @font-family-sans-serif; +@font-size-base-app: 11px; +@font-size-base-app: var(--font-size-base-app-custom, 11px); + @font-size-base: 11px; @font-size-large: 13px; @font-size-small: 9px; diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less index 5ba0d02e7..ee9789881 100644 --- a/apps/common/main/resources/less/window.less +++ b/apps/common/main/resources/less/window.less @@ -99,7 +99,8 @@ color: @text-normal-ie; color: @text-normal; text-align: center; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); font-weight: 700; letter-spacing: 0.01em; vertical-align: bottom; @@ -219,7 +220,8 @@ padding-left: 60px; span { - font-size: 12px; + //font-size: 12px; + .font-size-medium(); white-space: nowrap; a { @@ -335,6 +337,9 @@ display: inline-block; } } + label { + .font-size-normal(); + } } .footer { diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 48cb93025..4c03060e1 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -380,6 +380,10 @@ 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())); diff --git a/apps/documenteditor/main/app/view/ViewTab.js b/apps/documenteditor/main/app/view/ViewTab.js index 8f1d05ee0..731e46131 100644 --- a/apps/documenteditor/main/app/view/ViewTab.js +++ b/apps/documenteditor/main/app/view/ViewTab.js @@ -57,15 +57,15 @@ define([ '' + '
' + '
' + - '' + + '' + '
' + '' + '
' + '
' + - '' + + '' + '
' + '
' + - '' + + '' + '
' + '
' + '
' + diff --git a/apps/documenteditor/main/resources/less/app.less b/apps/documenteditor/main/resources/less/app.less index 1e428264b..ff2f72638 100644 --- a/apps/documenteditor/main/resources/less/app.less +++ b/apps/documenteditor/main/resources/less/app.less @@ -191,16 +191,24 @@ @huge-icon-background-image: var(--huge-icon-background-image); } +.font-size-tiny { + .fontsize(calc(@font-size-base-app - 2px)); // 9px +} + .font-size-small { - .fontsize(@font-size-small); + .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(calc(@font-size-base-app + 1px)); // 12px } .font-size-large { - .fontsize(@font-size-large); + .fontsize(calc(@font-size-base-app + 2px)); // 13px } // Skeleton of document diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less index eab2e5353..2b7586a6b 100644 --- a/apps/documenteditor/main/resources/less/filemenu.less +++ b/apps/documenteditor/main/resources/less/filemenu.less @@ -47,7 +47,8 @@ &:extend(.dropdown-menu > li > a); padding-top: 4px; cursor: pointer; - font-size: 13px; + //font-size: 13px; + .font-size-large(); &:hover { text-decoration: none; @@ -207,7 +208,7 @@ } &.subgroup-name label{ - font-size: 11px; + .font-size-normal(); .font-weight-bold(); } @@ -221,7 +222,8 @@ width: 30%; label { .font-weight-bold(); - font-size: 12px; + //font-size: 12px; + .font-size-medium(); } } @@ -296,7 +298,8 @@ .title { width: 104px; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); line-height: 14px; height: 28px; margin: 8px 8px 12px 8px; @@ -333,7 +336,8 @@ .recent-wrap { padding: 5px 10px; cursor: pointer; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); &:hover, &.over { @@ -391,7 +395,8 @@ width: 100%; .box-shadow(none); margin: 0; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); float: none; &:not(.header-name) { @@ -416,7 +421,8 @@ .header-name { padding: 16px 2px 4px 10px; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); } } } @@ -472,7 +478,8 @@ } label, span { - font-size: 12px; + //font-size: 12px; + .font-size-medium(); } .tool { @@ -516,7 +523,8 @@ #panel-protect { label { - font-size: 12px; + //font-size: 12px; + .font-size-medium(); } #file-menu-panel & { diff --git a/apps/documenteditor/main/resources/less/navigation.less b/apps/documenteditor/main/resources/less/navigation.less index 9fd80ddb9..a08e73c8c 100644 --- a/apps/documenteditor/main/resources/less/navigation.less +++ b/apps/documenteditor/main/resources/less/navigation.less @@ -14,7 +14,8 @@ border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie; 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; } @@ -24,7 +25,8 @@ padding-top: 45px; height: 100%; overflow: hidden; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); .treeview { padding: 8px 0; @@ -47,7 +49,8 @@ font-size: 10px; } &.medium{ - font-size: 12px; + //font-size: 12px; + .font-size-medium(); .name { padding: 4px 0; } diff --git a/apps/documenteditor/main/resources/less/statusbar.less b/apps/documenteditor/main/resources/less/statusbar.less index b59016d5d..8d06da7ba 100644 --- a/apps/documenteditor/main/resources/less/statusbar.less +++ b/apps/documenteditor/main/resources/less/statusbar.less @@ -122,7 +122,8 @@ margin-left: 137px; margin-bottom: 2px; width: 285px; - font-size: 12px; + //font-size: 12px; + .font-size-medium(); > label { white-space: normal; diff --git a/apps/documenteditor/main/resources/less/thumbnails.less b/apps/documenteditor/main/resources/less/thumbnails.less index 41bea7b02..e0b1adf70 100644 --- a/apps/documenteditor/main/resources/less/thumbnails.less +++ b/apps/documenteditor/main/resources/less/thumbnails.less @@ -18,7 +18,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; } @@ -34,7 +35,8 @@ #thumbnails-size { label { - font-size: 11px; + //font-size: 11px; + .font-size-normal(); font-weight: normal; margin: 0; padding-left: 12px; diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index e7f419c33..bbdb00c6c 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -203,3 +203,7 @@ } } } + +#slot-lbl-zoom { + .font-size-normal(); +} \ No newline at end of file