From abb20fa37170c5d900fd889f860ddb86e59e5f3f Mon Sep 17 00:00:00 2001 From: OVSharova Date: Tue, 25 Jan 2022 15:37:13 +0300 Subject: [PATCH 1/3] Fix Bug 50043 --- apps/common/forms/resources/less/common.less | 1 + apps/common/main/resources/less/about.less | 1 + apps/common/main/resources/less/buttons.less | 2 ++ apps/common/main/resources/less/chat.less | 2 ++ apps/common/main/resources/less/comments.less | 2 ++ apps/common/main/resources/less/history.less | 2 ++ apps/common/main/resources/less/window.less | 1 + 7 files changed, 11 insertions(+) diff --git a/apps/common/forms/resources/less/common.less b/apps/common/forms/resources/less/common.less index 1e61888f3..2c839391c 100644 --- a/apps/common/forms/resources/less/common.less +++ b/apps/common/forms/resources/less/common.less @@ -578,6 +578,7 @@ &.header { font-weight: bold; + letter-spacing: 0.01em; } } diff --git a/apps/common/main/resources/less/about.less b/apps/common/main/resources/less/about.less index 781f05365..f88e7b4d7 100644 --- a/apps/common/main/resources/less/about.less +++ b/apps/common/main/resources/less/about.less @@ -34,6 +34,7 @@ .asc-about-companyname { font: bold 15px Tahoma; + letter-spacing: 0.01em; 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 23f43f89b..06b105eca 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -478,6 +478,7 @@ .border-radius(0); background-color: transparent; font-weight: bold; + letter-spacing: 0.01em; &:hover:not(.disabled), .over:not(.disabled) { @@ -1047,6 +1048,7 @@ .dlg-btn { font-weight: bold; + letter-spacing: 0.01em; width: 86px; color: @text-normal-ie; color: @text-normal; diff --git a/apps/common/main/resources/less/chat.less b/apps/common/main/resources/less/chat.less index 47656839b..22329434e 100644 --- a/apps/common/main/resources/less/chat.less +++ b/apps/common/main/resources/less/chat.less @@ -66,6 +66,7 @@ font-size: 12px; font-weight: bold; display: block; + letter-spacing: 0.01em; padding: 0 10px 0 0; white-space: nowrap; text-overflow: ellipsis; @@ -107,6 +108,7 @@ color: @text-normal; font-size: 12px; font-weight: bold; + letter-spacing: 0.01em; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less index 2a42718e1..54074667a 100644 --- a/apps/common/main/resources/less/comments.less +++ b/apps/common/main/resources/less/comments.less @@ -21,6 +21,7 @@ label { font-size: 12px; font-weight: bold; + letter-spacing: 0.01em; margin-top: 2px; } } @@ -153,6 +154,7 @@ color: @text-normal; font-size: 12px; font-weight: bold; + letter-spacing: 0.01em; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; diff --git a/apps/common/main/resources/less/history.less b/apps/common/main/resources/less/history.less index 0976d636f..303d14fa0 100644 --- a/apps/common/main/resources/less/history.less +++ b/apps/common/main/resources/less/history.less @@ -100,6 +100,7 @@ display: inline-block; font-size: 12px; font-weight: bold; + letter-spacing: 0.01em; margin-right: 12px; white-space: nowrap; overflow: hidden; @@ -129,6 +130,7 @@ overflow: hidden; font-size: 12px; font-weight: bold; + letter-spacing: 0.01em; cursor: pointer; text-overflow: ellipsis; padding-right: 35px; diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less index ee6e29a2b..2269d6c98 100644 --- a/apps/common/main/resources/less/window.less +++ b/apps/common/main/resources/less/window.less @@ -101,6 +101,7 @@ text-align: center; font-size: 12px; font-weight: 700; + letter-spacing: 0.01em; vertical-align: bottom; line-height: 26px; From 0e3645489058ad4dea4a507a503efb6b68903591 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Wed, 26 Jan 2022 18:00:09 +0300 Subject: [PATCH 2/3] Fix Bug 50043 --- apps/common/forms/resources/less/common.less | 1 - apps/common/main/resources/less/about.less | 4 ++-- apps/common/main/resources/less/buttons.less | 6 ++---- apps/common/main/resources/less/chat.less | 8 +++----- apps/common/main/resources/less/combo-dataview.less | 2 +- apps/common/main/resources/less/comments.less | 8 +++----- apps/common/main/resources/less/common.less | 4 ++-- apps/common/main/resources/less/dataview.less | 2 +- apps/common/main/resources/less/header.less | 9 +++++++-- apps/common/main/resources/less/history.less | 6 ++---- apps/common/main/resources/less/opendialog.less | 2 +- apps/common/main/resources/less/plugins.less | 4 ++-- apps/common/main/resources/less/tabbar.less | 2 +- apps/common/main/resources/less/window.less | 2 +- apps/documenteditor/main/resources/less/filemenu.less | 8 ++++---- .../documenteditor/main/resources/less/navigation.less | 2 +- .../documenteditor/main/resources/less/thumbnails.less | 2 +- .../main/resources/less/advanced-settings.less | 2 +- .../main/resources/less/animation.less | 2 +- .../main/resources/less/leftmenu.less | 8 ++++---- .../main/resources/less/advanced-settings.less | 2 +- .../main/resources/less/filterdialog.less | 2 +- .../main/resources/less/formuladialog.less | 2 +- .../main/resources/less/leftmenu.less | 10 +++++----- .../main/resources/less/statusbar.less | 4 ++-- 25 files changed, 50 insertions(+), 54 deletions(-) diff --git a/apps/common/forms/resources/less/common.less b/apps/common/forms/resources/less/common.less index 2c839391c..1e61888f3 100644 --- a/apps/common/forms/resources/less/common.less +++ b/apps/common/forms/resources/less/common.less @@ -578,7 +578,6 @@ &.header { font-weight: bold; - letter-spacing: 0.01em; } } diff --git a/apps/common/main/resources/less/about.less b/apps/common/main/resources/less/about.less index f88e7b4d7..aaf507baf 100644 --- a/apps/common/main/resources/less/about.less +++ b/apps/common/main/resources/less/about.less @@ -22,7 +22,7 @@ letter-spacing: 1px; color: @text-normal-ie; color: @text-normal; - font-weight: bold; + .font-weight-bold(); white-space: nowrap; } @@ -55,7 +55,7 @@ } &.asc-about-lic { - font-weight: bold; + .font-weight-bold(); } } diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 06b105eca..5134404f9 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -477,8 +477,7 @@ position: relative; .border-radius(0); background-color: transparent; - font-weight: bold; - letter-spacing: 0.01em; + .font-weight-bold(); &:hover:not(.disabled), .over:not(.disabled) { @@ -1047,8 +1046,7 @@ // ------------------------ .dlg-btn { - font-weight: bold; - letter-spacing: 0.01em; + .font-weight-bold(); width: 86px; color: @text-normal-ie; color: @text-normal; diff --git a/apps/common/main/resources/less/chat.less b/apps/common/main/resources/less/chat.less index 22329434e..566e58cab 100644 --- a/apps/common/main/resources/less/chat.less +++ b/apps/common/main/resources/less/chat.less @@ -64,9 +64,8 @@ .name { font-size: 12px; - font-weight: bold; + .font-weight-bold(); display: block; - letter-spacing: 0.01em; padding: 0 10px 0 0; white-space: nowrap; text-overflow: ellipsis; @@ -97,7 +96,7 @@ word-wrap: break-word; .user { - font-weight: bold; + .font-weight-bold(); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -107,8 +106,7 @@ color: @text-normal-ie; color: @text-normal; font-size: 12px; - font-weight: bold; - letter-spacing: 0.01em; + .font-weight-bold(); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; diff --git a/apps/common/main/resources/less/combo-dataview.less b/apps/common/main/resources/less/combo-dataview.less index 368da7ea4..645eb51cb 100644 --- a/apps/common/main/resources/less/combo-dataview.less +++ b/apps/common/main/resources/less/combo-dataview.less @@ -402,7 +402,7 @@ .menu-picker-container { .group-description { padding: 3px 0 3px 10px; - font-weight: bold; + .font-weight-bold(); } .group-items-container .item { diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less index 54074667a..dd05eb9a1 100644 --- a/apps/common/main/resources/less/comments.less +++ b/apps/common/main/resources/less/comments.less @@ -20,8 +20,7 @@ label { font-size: 12px; - font-weight: bold; - letter-spacing: 0.01em; + .font-weight-bold(); margin-top: 2px; } } @@ -153,8 +152,7 @@ color: @text-normal-ie; color: @text-normal; font-size: 12px; - font-weight: bold; - letter-spacing: 0.01em; + .font-weight-bold(); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -340,7 +338,7 @@ margin-right:0; line-height: 14px; font-size: 14px; - font-weight: bold; + .font-weight-bold(); color: @text-normal-ie; color: @text-normal; opacity: 0.7; diff --git a/apps/common/main/resources/less/common.less b/apps/common/main/resources/less/common.less index 2a292dbb7..15f2deb5b 100644 --- a/apps/common/main/resources/less/common.less +++ b/apps/common/main/resources/less/common.less @@ -113,7 +113,7 @@ label { .box-inner-shadow(0 @scaled-one-px-value 0 @border-toolbar); .status-label { - font-weight: bold; + .font-weight-bold(); color: @text-normal-ie; color: @text-normal; white-space: nowrap; @@ -183,7 +183,7 @@ label { } &.header { - font-weight: bold; + .font-weight-bold(); } } diff --git a/apps/common/main/resources/less/dataview.less b/apps/common/main/resources/less/dataview.less index 19189ea31..14c376c4d 100644 --- a/apps/common/main/resources/less/dataview.less +++ b/apps/common/main/resources/less/dataview.less @@ -79,7 +79,7 @@ .header-name { padding: 10px 2px 12px 4px; - font-weight: bold; + .font-weight-bold(); cursor: default; } diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 9bed1c0f7..99e240028 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -284,7 +284,7 @@ color: @text-normal-ie; color: @text-normal; font-size: 12px; - font-weight: bold; + .font-weight-bold(); white-space: nowrap; cursor: default; @@ -293,7 +293,7 @@ text-overflow: ellipsis; vertical-align: middle; max-width: 200px; - font-weight: bold; + .font-weight-bold(); } } } @@ -475,3 +475,8 @@ } } } + +.font-weight-bold{ + font-weight: bold; + letter-spacing: 0.01em; +} diff --git a/apps/common/main/resources/less/history.less b/apps/common/main/resources/less/history.less index 303d14fa0..87bbf144a 100644 --- a/apps/common/main/resources/less/history.less +++ b/apps/common/main/resources/less/history.less @@ -99,8 +99,7 @@ .user-date { display: inline-block; font-size: 12px; - font-weight: bold; - letter-spacing: 0.01em; + .font-weight-bold(); margin-right: 12px; white-space: nowrap; overflow: hidden; @@ -129,8 +128,7 @@ white-space: nowrap; overflow: hidden; font-size: 12px; - font-weight: bold; - letter-spacing: 0.01em; + .font-weight-bold(); cursor: pointer; text-overflow: ellipsis; padding-right: 35px; diff --git a/apps/common/main/resources/less/opendialog.less b/apps/common/main/resources/less/opendialog.less index 4172a765e..9517eeb77 100644 --- a/apps/common/main/resources/less/opendialog.less +++ b/apps/common/main/resources/less/opendialog.less @@ -33,7 +33,7 @@ } &.header { - font-weight: bold; + .font-weight-bold(); } } diff --git a/apps/common/main/resources/less/plugins.less b/apps/common/main/resources/less/plugins.less index 7e29f0bf2..bc9d154fd 100644 --- a/apps/common/main/resources/less/plugins.less +++ b/apps/common/main/resources/less/plugins.less @@ -8,7 +8,7 @@ height: 20px; left: 0; top: 0; - font-weight: bold; + .font-weight-bold(); margin-top: 10px; margin-left: 12px; @@ -91,7 +91,7 @@ label { width: 100%; padding-right: 20px; - font-weight: bold; + .font-weight-bold(); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; diff --git a/apps/common/main/resources/less/tabbar.less b/apps/common/main/resources/less/tabbar.less index 20ef6a73f..c29317ef2 100644 --- a/apps/common/main/resources/less/tabbar.less +++ b/apps/common/main/resources/less/tabbar.less @@ -36,7 +36,7 @@ &::after { content: attr(title); - font-weight: bold; + .font-weight-bold(); display: block; } diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less index 2269d6c98..af232b9f6 100644 --- a/apps/common/main/resources/less/window.less +++ b/apps/common/main/resources/less/window.less @@ -123,7 +123,7 @@ margin-right:0; line-height: 14px; font-size: 14px; - font-weight: bold; + .font-weight-bold(); color: @text-normal-ie; color: @text-normal; opacity: 0.7; diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less index f742ab3b3..903120417 100644 --- a/apps/documenteditor/main/resources/less/filemenu.less +++ b/apps/documenteditor/main/resources/less/filemenu.less @@ -134,7 +134,7 @@ width: 30%; label { - font-weight: bold; + .font-weight-bold(); font-size: 12px; } } @@ -157,7 +157,7 @@ font-size: 10pt; color: @text-normal-ie; color: @text-normal; - font-weight: bold; + .font-weight-bold(); padding: 0 0 10px 10px; white-space: nowrap; } @@ -344,7 +344,7 @@ width: 30%; label { - font-weight: bold; + .font-weight-bold(); } } @@ -428,7 +428,7 @@ label { } .header { - font-weight: bold; + .font-weight-bold(); margin: 30px 0 10px; } diff --git a/apps/documenteditor/main/resources/less/navigation.less b/apps/documenteditor/main/resources/less/navigation.less index 0a3726fad..026c76f0c 100644 --- a/apps/documenteditor/main/resources/less/navigation.less +++ b/apps/documenteditor/main/resources/less/navigation.less @@ -9,7 +9,7 @@ left: 0; top: 0; width: 100%; - font-weight: bold; + .font-weight-bold(); padding: 10px 12px; border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie; border-bottom: @scaled-one-px-value solid @border-toolbar; diff --git a/apps/documenteditor/main/resources/less/thumbnails.less b/apps/documenteditor/main/resources/less/thumbnails.less index 582e5830c..41bea7b02 100644 --- a/apps/documenteditor/main/resources/less/thumbnails.less +++ b/apps/documenteditor/main/resources/less/thumbnails.less @@ -19,7 +19,7 @@ label { font-size: 12px; - font-weight: bold; + .font-weight-bold(); margin-top: 2px; } diff --git a/apps/presentationeditor/main/resources/less/advanced-settings.less b/apps/presentationeditor/main/resources/less/advanced-settings.less index 828fd2bfe..b7be1be09 100644 --- a/apps/presentationeditor/main/resources/less/advanced-settings.less +++ b/apps/presentationeditor/main/resources/less/advanced-settings.less @@ -32,7 +32,7 @@ .div-category { padding: 0 15px; text-align: right; - font-weight: bold; + .font-weight-bold(); font-size: 11px; } } diff --git a/apps/presentationeditor/main/resources/less/animation.less b/apps/presentationeditor/main/resources/less/animation.less index 1beca9c3b..2c8cb5021 100644 --- a/apps/presentationeditor/main/resources/less/animation.less +++ b/apps/presentationeditor/main/resources/less/animation.less @@ -12,7 +12,7 @@ .group-description { padding: 3px 0 3px 10px; - font-weight: bold; + .font-weight-bold(); } .grouped-data .group-items-container { diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less index 7adf9ab21..d459bc211 100644 --- a/apps/presentationeditor/main/resources/less/leftmenu.less +++ b/apps/presentationeditor/main/resources/less/leftmenu.less @@ -171,7 +171,7 @@ width: 30%; label { - font-weight: bold; + .font-weight-bold(); font-size: 12px; } } @@ -194,7 +194,7 @@ font-size: 10pt; color: @text-normal-ie; color: @text-normal; - font-weight: bold; + .font-weight-bold(); padding: 0 0 10px 10px; white-space: nowrap; } @@ -377,7 +377,7 @@ width: 30%; label { - font-weight: bold; + .font-weight-bold(); } } @@ -439,7 +439,7 @@ padding: 30px 30px; .header { - font-weight: bold; + .font-weight-bold(); margin: 30px 0 10px; } diff --git a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less index 61a1ee11f..f8e64e3d2 100644 --- a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less +++ b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less @@ -32,7 +32,7 @@ .div-category { padding: 0 0 0 10px; text-align: right; - font-weight: bold; + .font-weight-bold(); font-size: 11px; white-space: nowrap; } diff --git a/apps/spreadsheeteditor/main/resources/less/filterdialog.less b/apps/spreadsheeteditor/main/resources/less/filterdialog.less index f0cba4209..4f4d4f7f0 100644 --- a/apps/spreadsheeteditor/main/resources/less/filterdialog.less +++ b/apps/spreadsheeteditor/main/resources/less/filterdialog.less @@ -68,7 +68,7 @@ } &.header { - font-weight: bold; + .font-weight-bold(); } } diff --git a/apps/spreadsheeteditor/main/resources/less/formuladialog.less b/apps/spreadsheeteditor/main/resources/less/formuladialog.less index 5fb38c22d..2d0559c49 100644 --- a/apps/spreadsheeteditor/main/resources/less/formuladialog.less +++ b/apps/spreadsheeteditor/main/resources/less/formuladialog.less @@ -39,7 +39,7 @@ } &.header { - font-weight: bold; + .font-weight-bold(); } word-wrap: break-word; diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index bbd690c39..40a74439b 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -215,7 +215,7 @@ width: 30%; label { - font-weight: bold; + .font-weight-bold(); font-size: 12px; } } @@ -262,7 +262,7 @@ font-size: 10pt; color: @text-normal-ie; color: @text-normal; - font-weight: bold; + .font-weight-bold(); padding: 0 0 10px 10px; white-space: nowrap; } @@ -445,7 +445,7 @@ width: 30%; label { - font-weight: bold; + .font-weight-bold(); } } @@ -507,7 +507,7 @@ padding: 30px 30px; .header { - font-weight: bold; + .font-weight-bold(); margin: 30px 0 10px; } @@ -619,7 +619,7 @@ height: 20px; margin-left: 10px; label { - font-weight: bold; + .font-weight-bold(); } #print-count-page, #print-number-page { margin-left: 4px; diff --git a/apps/spreadsheeteditor/main/resources/less/statusbar.less b/apps/spreadsheeteditor/main/resources/less/statusbar.less index 6e19df2bf..86e9f9842 100644 --- a/apps/spreadsheeteditor/main/resources/less/statusbar.less +++ b/apps/spreadsheeteditor/main/resources/less/statusbar.less @@ -238,7 +238,7 @@ box-shadow: 0px 4px 0 #49795d inset; border-top-width: 0; padding-top: 1px; - font-weight: bold; + .font-weight-bold(); } } @@ -368,7 +368,7 @@ display: flex; justify-content: flex-start; .status-label { - font-weight: bold; + .font-weight-bold(); color: @text-normal; margin-top: 5px; width: 100%; From a98d599096f85e344f9992b0d33e00799866e789 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Thu, 27 Jan 2022 14:36:04 +0300 Subject: [PATCH 3/3] Fix Bug 50043 --- apps/common/main/resources/less/asc-mixins.less | 5 +++++ apps/common/main/resources/less/buttons.less | 3 ++- apps/common/main/resources/less/header.less | 5 +---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/apps/common/main/resources/less/asc-mixins.less b/apps/common/main/resources/less/asc-mixins.less index 980503c55..bac76454f 100644 --- a/apps/common/main/resources/less/asc-mixins.less +++ b/apps/common/main/resources/less/asc-mixins.less @@ -81,6 +81,11 @@ button.disabled > .@{icon-class} {background-position: -3*@icon-size -@index*@icon-size;} } +.font-weight-bold{ + font-weight: bold; + letter-spacing: 0.01em; +} + /** */ :root { diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 5134404f9..b718c3a27 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -476,8 +476,9 @@ display: block; position: relative; .border-radius(0); - background-color: transparent; .font-weight-bold(); + background-color: transparent; + &:hover:not(.disabled), .over:not(.disabled) { diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 99e240028..db1633f71 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -476,7 +476,4 @@ } } -.font-weight-bold{ - font-weight: bold; - letter-spacing: 0.01em; -} +