From bda2dd78737801d923f10ccff05a500c61d85006 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sat, 6 Mar 2021 00:52:06 +0300 Subject: [PATCH 1/3] [all] some changes for components stylesheet --- apps/common/main/lib/component/Window.js | 2 +- .../img/toolbar/1x/huge/.css.handlebars | 5 ++ .../main/resources/less/asc-mixins.less | 6 ++ apps/common/main/resources/less/buttons.less | 18 ++++++ .../resources/less/colors-table-dark.less | 3 + .../resources/less/colors-table-ie-fix.less | 2 + .../main/resources/less/colors-table.less | 5 ++ .../main/resources/less/combo-dataview.less | 5 ++ .../main/resources/less/dropdown-menu.less | 27 +++++---- apps/common/main/resources/less/header.less | 3 +- apps/common/main/resources/less/input.less | 1 + apps/common/main/resources/less/listview.less | 4 +- apps/common/main/resources/less/toolbar.less | 5 ++ apps/common/main/resources/less/window.less | 6 -- .../main/app/view/DropcapSettingsAdvanced.js | 12 ++-- .../main/app/view/TableSettingsAdvanced.js | 20 +++--- .../img/right-panels/LargeBorders.png | Bin 513 -> 0 bytes .../img/right-panels/LargeBorders@2x.png | Bin 693 -> 0 bytes .../img/right-panels/RightPanelBigBtns.png | Bin 382 -> 0 bytes .../img/right-panels/RightPanelBigBtns@2x.png | Bin 611 -> 0 bytes .../right-panels/right_panel_wrap_btns.png | Bin 1826 -> 0 bytes .../right-panels/right_panel_wrap_btns@2x.png | Bin 3777 -> 0 bytes .../right-panels/right_panel_wrap_icons.png | Bin 1070 -> 0 bytes .../right_panel_wrap_icons@2x.png | Bin 2202 -> 0 bytes .../main/resources/less/rightmenu.less | 57 ------------------ .../main/resources/less/toolbar.less | 2 +- .../main/app/view/Spellcheck.js | 2 +- .../main/app/view/Toolbar.js | 2 +- .../resources/less/advanced-settings.less | 4 +- 29 files changed, 92 insertions(+), 99 deletions(-) delete mode 100644 apps/documenteditor/main/resources/img/right-panels/LargeBorders.png delete mode 100644 apps/documenteditor/main/resources/img/right-panels/LargeBorders@2x.png delete mode 100644 apps/documenteditor/main/resources/img/right-panels/RightPanelBigBtns.png delete mode 100644 apps/documenteditor/main/resources/img/right-panels/RightPanelBigBtns@2x.png delete mode 100644 apps/documenteditor/main/resources/img/right-panels/right_panel_wrap_btns.png delete mode 100644 apps/documenteditor/main/resources/img/right-panels/right_panel_wrap_btns@2x.png delete mode 100644 apps/documenteditor/main/resources/img/right-panels/right_panel_wrap_icons.png delete mode 100644 apps/documenteditor/main/resources/img/right-panels/right_panel_wrap_icons@2x.png diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js index 55b52c4ed..ec1175730 100644 --- a/apps/common/main/lib/component/Window.js +++ b/apps/common/main/lib/component/Window.js @@ -455,7 +455,7 @@ define([ if (!options.width) options.width = 'auto'; var template = '
' + - '<% if (typeof iconCls !== "undefined") { %>
<% } %>' + + '<% if (typeof iconCls !== "undefined") { %>
<% } %>' + '
style="padding-left:10px;" <% } %>><%= msg %>' + '<% if (dontshow) { %>
<% } %>' + '
' + diff --git a/apps/common/main/resources/img/toolbar/1x/huge/.css.handlebars b/apps/common/main/resources/img/toolbar/1x/huge/.css.handlebars index c1f895dd9..58fd2acc4 100644 --- a/apps/common/main/resources/img/toolbar/1x/huge/.css.handlebars +++ b/apps/common/main/resources/img/toolbar/1x/huge/.css.handlebars @@ -1,5 +1,10 @@ {{#spritesheet}} .btn { + .options__icon.options__icon-huge { + background-position-x: 0; + background-position-x: var(--button-huge-normal-icon-offset-x,0); + } + &.active, &:active { &:not(:disabled):not(.disabled) { .options__icon.options__icon-huge { diff --git a/apps/common/main/resources/less/asc-mixins.less b/apps/common/main/resources/less/asc-mixins.less index 295bea008..b25a205bf 100644 --- a/apps/common/main/resources/less/asc-mixins.less +++ b/apps/common/main/resources/less/asc-mixins.less @@ -211,6 +211,12 @@ } } +.img-commonctrl { + &.img-colored { + filter: none; + } +} + @common-controls-width: 100px; .img-commonctrl, .dropdown-menu li .checked:before, .input-error:before, .input-warning:before, diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index b513eba07..8e4c9776e 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -170,6 +170,12 @@ } } + &:not(:disabled) { + .icon { + opacity: @button-icon-opacity; + } + } + &:active:not(.disabled), &.active:not(.disabled) { .caret-up, .caret-down { @@ -301,6 +307,12 @@ .border-radius(1px); background-color: transparent; + .masked & { + &:disabled { + opacity: 1; + } + } + .btn.small; &.bg-white { @@ -885,6 +897,12 @@ vertical-align: middle; width: 52px; padding: 5px; + + fill: @icon-normal; + + .btn& { + opacity: 1; + } } &:hover, diff --git a/apps/common/main/resources/less/colors-table-dark.less b/apps/common/main/resources/less/colors-table-dark.less index 15159908d..3a4d63ae5 100644 --- a/apps/common/main/resources/less/colors-table-dark.less +++ b/apps/common/main/resources/less/colors-table-dark.less @@ -101,12 +101,15 @@ --button-huge-active-icon-offset-x: -40px; --button-xhuge-normal-icon-offset-x: -28px; --button-xhuge-active-icon-offset-x: -28px; + //--button-xhuge-normal-icon-offset-x: -37px; + //--button-xhuge-active-icon-offset-x: -37px; --modal-window-mask-opacity: 0.6; --image-border-types-filter: invert(100%) brightness(4); --image-border-types-filter-selected: invert(100%) brightness(4); --component-normal-icon-filter: invert(100%); --component-disabled-opacity: .3; + --button-icon-opacity: .8; --menu-icon-item-checked-offset-x: -20px; } diff --git a/apps/common/main/resources/less/colors-table-ie-fix.less b/apps/common/main/resources/less/colors-table-ie-fix.less index 4891f7817..a4a941270 100644 --- a/apps/common/main/resources/less/colors-table-ie-fix.less +++ b/apps/common/main/resources/less/colors-table-ie-fix.less @@ -52,6 +52,8 @@ @button-header-active-icon-offset-x-ie: -20px; @scaled-one-px-value-ie: 1px; +@component-disabled-opacity-ie: .4; + .ie { .toolbar__icon.toolbar__icon-big { @big-icon-background-image-ie: ~"url(@{app-image-const-path}/iconsbig.png)"; diff --git a/apps/common/main/resources/less/colors-table.less b/apps/common/main/resources/less/colors-table.less index dd743c5cd..89f5ce90c 100644 --- a/apps/common/main/resources/less/colors-table.less +++ b/apps/common/main/resources/less/colors-table.less @@ -121,6 +121,7 @@ --image-border-types-filter-selected: none; --component-normal-icon-filter: none; --component-disabled-opacity: .4; + //--button-icon-opacity: 1; } // Background @@ -182,14 +183,18 @@ @button-small-active-icon-offset-x: var(--button-small-active-icon-offset-x,0); @button-large-normal-icon-offset-x: var(--button-large-normal-icon-offset-x, 0); @button-large-active-icon-offset-x: var(--button-large-active-icon-offset-x, 0); +@button-huge-normal-icon-offset-x: var(--button-huge-normal-icon-offset-x, 0); @button-xhuge-normal-icon-offset-x: var(--button-xhuge-normal-icon-offset-x, 0); @button-xhuge-active-icon-offset-x: var(--button-xhuge-active-icon-offset-x, 0); +//@button-huge-normal-icon-offset-x: var(--button-huge-normal-icon-offset-x, 0); +//@button-huge-active-icon-offset-x: var(--button-huge-active-icon-offset-x, 0); @button-header-normal-icon-offset-x: var(--button-header-normal-icon-offset-x, -20px); @button-header-active-icon-offset-x: var(--button-header-active-icon-offset-x, -20px); @component-normal-icon-filer: var(--component-normal-icon-filter); @component-disabled-opacity: var(--component-disabled-opacity, .4); +@button-icon-opacity: var(--button-icon-opacity, 1); @menu-icon-item-checked-offset-x: var(--menu-icon-item-checked-offset-x, 0); diff --git a/apps/common/main/resources/less/combo-dataview.less b/apps/common/main/resources/less/combo-dataview.less index d3cc6d36a..3bc08d1db 100644 --- a/apps/common/main/resources/less/combo-dataview.less +++ b/apps/common/main/resources/less/combo-dataview.less @@ -308,6 +308,11 @@ } } } + + .combo-wrap-item.options__icon { + background-position-x: 0; + background-position-x: @button-huge-normal-icon-offset-x; + } } .combo-pivot-template { diff --git a/apps/common/main/resources/less/dropdown-menu.less b/apps/common/main/resources/less/dropdown-menu.less index 325b28de9..9d60d8493 100644 --- a/apps/common/main/resources/less/dropdown-menu.less +++ b/apps/common/main/resources/less/dropdown-menu.less @@ -1,11 +1,3 @@ -.dropdown-menu > .disabled > a { - cursor: default; - - color: @text-normal-ie; - color: @text-normal; - - opacity: @component-disabled-opacity; -} .dropdown-menu { background-color: @background-normal-ie; @@ -47,9 +39,6 @@ &:focus, &.focus { outline: 0; - } - - &.focus { color: @text-normal-pressed-ie; color: @text-normal-pressed; background-color: @highlight-button-hover-ie; @@ -115,6 +104,22 @@ } } + > .disabled { + > a { + cursor: default; + + color: @text-normal-ie; + color: @text-normal; + + opacity: @component-disabled-opacity; + + &:hover, &:focus { + color: @text-normal-ie; + color: @text-normal; + } + } + } + &.shifted-right { li { & > a { diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index a7995b8a8..24b6e5d01 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -371,7 +371,8 @@ &:active { &:not(.disabled) { - background-color: rgba(0,0,0,0.2); + background-color: @highlight-header-button-pressed-ie; + background-color: @highlight-header-button-pressed; } } diff --git a/apps/common/main/resources/less/input.less b/apps/common/main/resources/less/input.less index 9a7bc2b06..6944e57a5 100644 --- a/apps/common/main/resources/less/input.less +++ b/apps/common/main/resources/less/input.less @@ -46,6 +46,7 @@ width: 16px; height: 16px; background-position: @input-error-offset-x @input-error-offset-y; + filter: none; } } diff --git a/apps/common/main/resources/less/listview.less b/apps/common/main/resources/less/listview.less index 8757d2a25..6aace8386 100644 --- a/apps/common/main/resources/less/listview.less +++ b/apps/common/main/resources/less/listview.less @@ -24,8 +24,8 @@ } &:not(.no-focus):focus { - border-color: @border-preview-select-ie; - border-color: @border-preview-select; + border-color: @border-control-focus-ie; + border-color: @border-control-focus; } & > .item { diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 1fd780939..80e9df178 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -406,6 +406,7 @@ // TODO: move to appropriate module .btn-header, .btn-users { &:not(:active) .icon--inverse { + background-position-x: 0; background-position-x: @button-small-normal-icon-offset-x; } @@ -429,6 +430,10 @@ background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; + .icon--inverse { + background-position-x: @button-small-active-icon-offset-x; + } + svg.icon { fill: @icon-toolbar-header-ie; fill: @icon-toolbar-header; diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less index 87745f2ce..89ad03f21 100644 --- a/apps/common/main/resources/less/window.less +++ b/apps/common/main/resources/less/window.less @@ -313,12 +313,6 @@ } } } - - .img-commonctrl { - &.img-no-theme-filter { - filter: none; - } - } } .modal-dlg { diff --git a/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js b/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js index 1dec27f11..e524be875 100644 --- a/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js @@ -369,8 +369,8 @@ define([ this.btnFrameNone = new Common.UI.Button({ parentEl: $('#frame-advanced-button-none'), - cls : 'btn huge btn-options', - iconCls : 'icon-right-panel btn-frame-none', + cls : 'btn huge-1 btn-options', + iconCls : 'options__icon options__icon-huge none', enableToggle: true, toggleGroup : 'frameAdvGroup', allowDepress: false, @@ -385,8 +385,8 @@ define([ this.btnFrameInline = new Common.UI.Button({ parentEl: $('#frame-advanced-button-inline'), - cls : 'btn huge btn-options', - iconCls : 'icon-right-panel btn-frame-inline', + cls : 'btn huge-1 btn-options', + iconCls : 'options__icon options__icon-huge table-align-center', enableToggle: true, toggleGroup : 'frameAdvGroup', allowDepress: false, @@ -401,8 +401,8 @@ define([ this.btnFrameFlow = new Common.UI.Button({ parentEl: $('#frame-advanced-button-flow'), - cls : 'btn huge btn-options', - iconCls : 'icon-right-panel btn-frame-flow', + cls : 'btn huge-1 btn-options', + iconCls : 'options__icon options__icon-huge table-flow', enableToggle: true, toggleGroup : 'frameAdvGroup', allowDepress: false, diff --git a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js index d7d13475a..4bf8600a4 100644 --- a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js @@ -508,8 +508,8 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.btnWrapNone = new Common.UI.Button({ parentEl: $('#tableadv-button-wrap-none'), - cls: 'btn-options huge', - iconCls: 'icon-right-panel btn-wrap-none', + cls: 'btn-options huge-1', + iconCls: 'options__icon options__icon-huge table-align-center', posId: c_tableWrap.TABLE_WRAP_NONE, hint: this.textWrapNoneTooltip, enableToggle: true, @@ -520,8 +520,8 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.btnWrapParallel = new Common.UI.Button({ parentEl: $('#tableadv-button-wrap-parallel'), - cls: 'btn-options huge', - iconCls: 'icon-right-panel btn-wrap-parallel', + cls: 'btn-options huge-1', + iconCls: 'options__icon options__icon-huge table-flow', posId: c_tableWrap.TABLE_WRAP_PARALLEL, hint: this.textWrapParallelTooltip, enableToggle: true, @@ -532,8 +532,8 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.btnAlignLeft = new Common.UI.Button({ parentEl: $('#tableadv-button-align-left'), - cls: 'btn-options huge', - iconCls: 'icon-right-panel btn-table-align-left', + cls: 'btn-options huge-1', + iconCls: 'options__icon options__icon-huge table-align-left', posId: c_tableAlign.TABLE_ALIGN_LEFT, hint: this.textLeftTooltip, enableToggle: true, @@ -551,8 +551,8 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.btnAlignCenter = new Common.UI.Button({ parentEl: $('#tableadv-button-align-center'), - cls: 'btn-options huge', - iconCls: 'icon-right-panel btn-table-align-center', + cls: 'btn-options huge-1', + iconCls: 'options__icon options__icon-huge table-align-center', posId: c_tableAlign.TABLE_ALIGN_CENTER, hint: this.textCenterTooltip, enableToggle: true, @@ -570,8 +570,8 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat this.btnAlignRight = new Common.UI.Button({ parentEl: $('#tableadv-button-align-right'), - cls: 'btn-options huge', - iconCls: 'icon-right-panel btn-table-align-right', + cls: 'btn-options huge-1', + iconCls: 'options__icon options__icon-huge table-align-right', posId: c_tableAlign.TABLE_ALIGN_RIGHT, hint: this.textRightTooltip, enableToggle: true, diff --git a/apps/documenteditor/main/resources/img/right-panels/LargeBorders.png b/apps/documenteditor/main/resources/img/right-panels/LargeBorders.png deleted file mode 100644 index d5db3a84a6a4cc0945b02e5e703aedaa42ca6a35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 513 zcmV+c0{;DpP)w%#r{A0iH=jK~#8N?VACLgFp}j*Q^gv z{D88JQdynokiTeod9e(!euz1}@}DeGFQ@xAnY zDXnuKXBR{){VsZFsyt{Cz&Z5$9Wmp;Y7hnZJho%;#kMIP)nU`it+s-rx1- zTM*}4lt1IjUo)--0000FP)t-s0000( zLqq@n|3pMY|NsBulwQ^V000AYQchCw%#r{A0#ZptK~#8N?c9NB!!Qtr(X5aa zynDzn9D9a`Rr8%jM?1 zKLB{9bFiez`St7k@qgrUxxDqf%jI%U&;&zc#_j0*hZr+P>x!k;W z1OWaAU7yS4{wHN*`sZ?IP8t9JPtbC?+`Jd$a=CeL1_0b7CYQ^fXPGZ&6LKRXm%B-< z699N#Z;6+%P0r(W=8v;`xm+$c??t&>Zr+;$fCk@-l*{E#am(d$r?_hYfF1R^8_RpX z?Z)zj{I#rO`H;VsZ7dyfdHtuZaN>ejZEau{6l#)t|aX z6KCS&CeHVu0l*VZ=DjGF%guX#0N@n&xE*EP*Y|wfj-AM3+cHefV_T4UYzuDZa=HBXJ8C0SpUdU-f8PrLfK%MDW*+OkTrQWJ_o`ej zH}CxcfK%MNvApNYZY*EO$G7aRjwUW+>5$9oKXp|TXX4~0&MEHp0KiRRu{Fv(wnp>w zSTc{LK`yWU)U}v66DK!uZW03kPta}#KHV()DL?E7JLU4jhWt~0*pSc6>nHA~@7>7A zTit%|2^s*L;&wA|Yzs4wZDE&O9*=>U$7A5Uynf<-`reI<-0k;HalZh7Cuq4`E|<&Y bo}ht0eV}MopQK^k00000NkvXXu0mjfcs*SI diff --git a/apps/documenteditor/main/resources/img/right-panels/RightPanelBigBtns.png b/apps/documenteditor/main/resources/img/right-panels/RightPanelBigBtns.png deleted file mode 100644 index 32d68b64de872273658109102e1a33b717978578..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 382 zcmeAS@N?(olHy`uVBq!ia0vp^UJMM3dsvu(tZpa0Pe4j2z$e5NNV~YW{Qv*o)zuY9 zIy*bdMw?^=0?$Jix-OLCo9lsq z?50{y5WVJiJ$L0a<$kN;%gW`8KN)zLOvJ_VR+L+Q`n7fYcm8j( zD}svLRYSwO{&KX|Zq)y_c7BBIQmuI+zXiE|C&j9ttaI^i? z{rQ1kXRKem$aYP`jl(M@IKNvVa_K^Nk8`|I^7qOGK{M8x-oO6G`rQBc-|Od8{+`6| YHFd|^#Szi}fI-IK>FVdQ&MBb@0J4^*`2YX_ diff --git a/apps/documenteditor/main/resources/img/right-panels/RightPanelBigBtns@2x.png b/apps/documenteditor/main/resources/img/right-panels/RightPanelBigBtns@2x.png deleted file mode 100644 index 0c67ea63f7127fd0e2786cd3fb79522423c4e3fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 611 zcmeAS@N?(olHy`uVBq!ia0vp^Qy3VSD_EF;tm`#*nt_yhfKP}kkpBPwzl)0tkaTu- z29mC>t`N49lM|2)kxG%Rm<3eIT@vIM%y9qx`}ly@^-=heXTE394#aBcl9>sAZzddZH@0;KEOD2Hd{Z*=i?b6suDm$-5*}vM89x}I_qxF+ZAXKr&^{DGno|CfQ z>IRm+FkZ!HJI$%`Elh4o_S)>VDkry!fs6$U{?rmbm0iBJ*MHKJD6rGPR@O}Ae!6w{ zwPWg@MQai6*mtV+*8k33*Ssbzv3X}7a7=gkBV+BO`_~mGeB%N7S)QwP(%!rG^1>#m zoV=F)+IaQP{J$};@>j3en>IE2`DU%Pd12Wre^@t1&YTKDx(gp|HooC{HtRnq=+u@6 zx@+}D0WDjh_N;hS=To6olD;{mZl2)*XHRY3I9)5o(Nz1qyz|NfsUg9~LpFy6S)bMV t7n}RlT;l)#Q|AQy7Y59Z%~pNM?|V#8IK6z)IbafC@O1TaS?83{1OScC5x@Wd diff --git a/apps/documenteditor/main/resources/img/right-panels/right_panel_wrap_btns.png b/apps/documenteditor/main/resources/img/right-panels/right_panel_wrap_btns.png deleted file mode 100644 index dc76ad62731d7e309917eac05684308bfe84067b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1826 zcmZ8hc{tnI8jdBgH5f*1ZMcMVXwhq}E!0wx2v-@`QcLw(qn0AJFh!}hYNxiLZRj;7 zv~(ycDM7W7Sk%4+VUK4SW<%3V2`U_e@{_${Q|lspOu})*dl&J zAv2-ROLPd4PUUE{-zibm4gD@fDo8@6FxK+!l{~Rv*X)F%Uu743k10HHCK^L_Ry}Z@ zxfi8hujT%h(ed!9GhG#r+ewT>zgaogd3K}?*YR)|M#H8SxmCT!K+jRaraG1CkCO&C zlgIahty+rV_cuGflZlf4ISYRm)Zj{l@82<}q}~QsT?-BAsGz34K=+{aJ3_b?L$`^Yf(u+K_`8kW z>79idd&i8+W;9HimUzg^DTeVj#x5hRinR-;4Ky&r(3jw0Hy$XXH|Xi&OFXSejX>*o zy~>+IR7bP(feLbpQ!dHj+j>6B^SrgTDTbQ*@+gnIg#JBL{sOaS`D``PX5pk{#QV?i zcH_Q}yZta!W(ZBJQqH`q0#&X#GnRy{7oU$|AMu^aRn$fGUh%({6iA7xi5q;?zG1k% zX4jdma_G+IJ>*tUlviX=*`rUc8Hk_2vbYbyk4LJ*Y9fK#epItBhB2n`{OCa^`w#OF zb;`VSCV?Jg)-TUP98vi*Fg*yqA*THb0HV&5IVdxKCn1!&2N4b?YVgc4eEY1y7JG^j zkc0wgLtGTy@E}PAP(+>Df3~m=P^mK#z!pUw9;0lJe34R^UT91+VFK;Mnf|LLvKdUU z527pc0E4_ICuq$YvSp74z<8H>8!4Cg?CkyA>p7WNWuCd4GC(*C6v+r`o3A$_=RPzx zFu_7MrW3%OL?2H*%EPm+w&##1A5B^?F~(4U!H1b2QWI(a^&S%s7P9K31-qO3jSaDK z;{WCRM$OvSWG~Nz1C3A!sd##Wp*W#EzPUO~4LGH(`Cw={I2^m`4ZZtztOMmq9vLcx zs0++^F>L;yIaXfg_(BybdJ#!CroJq%n7I6AD@2MTagk@^2>$7FBM`91Jz=p1_eZ;uS>Z+2j@MqP#olvka2-l|AASiacP875KI z^=4)G_Lm!^<0Z0DjqXH!k>NX}#UW3!8m3n?dc*to%1xyb+2}@h+fVXN0j?)x#tQ0} zV74&>djAL&sdO46Qq|a21{?6gU%~w^;Yk5$>sQ?)?mJV|ULD)z&jDn0T!!l9eA~4`|kBPOVy-i(6-CT*7bCiHu5nf2wTzexYZJl|e_(k5G-&F3MUF`F(uZaz#5w?A!26ap#2 zCQIc&dXnd-3xR=9#WG;LX zSh%>av$5JMp3N1BMjWeN=GChSc%7pXoP}3C$mf|yac!?oA#Kz#g71y59g?WkPeNpw z9d00#6MbWC3%EnkiSe9{rS;Y0b7jfGTiU5R=?f0k!bj$?IFqi<{I~e2Oo8(>Ex>8E zZoS}Bek^fyc3z9N^`!(=)Q@*inB;~p-NIAjOK#phF~LIEtP$4SELS{iIPvS;jpF9c z!0qKYzE=Wa@l5qtnyM^orZ1;fazGPwmqags8@!z9vO|;yOO@Z(!ASXMH)%c@65q%T zy)(s+|Lpt%ota}*J6C(J6!BGi|CvjfuA5&e90hYj0bY$sB!l=@=OG+b3L{;#Udy-H zib#u4E7}XW4s+|{$IM09oFQZH?~LvKIFTW9-v3yAtT!#Fk5rCbUXDN4q(XUb-PZa& zdcDpHHnYTNPO45^OTlf1`|H-{8`)MpAS+oG{qXoiD5;Md-TBMA-b}KVc}A7X_#nEw zrJ;Qk%2Hx*9#is8FB44hW60!q)y-bR*Gi03$xyWePls`ia&%C5JEP~Y1%KvmUlNYB zgU4ENN0LWJ#+!VmELMvP6&d7+lxeC&vF%Ur|50`zXg?kz`2Y1+-F~HBObPkG0?1Rp S5EI~8gHTRb$F|eK*?$1|425q1 diff --git a/apps/documenteditor/main/resources/img/right-panels/right_panel_wrap_btns@2x.png b/apps/documenteditor/main/resources/img/right-panels/right_panel_wrap_btns@2x.png deleted file mode 100644 index 15231e50025a6504c4b665a9a9413f8316c7d337..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3777 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 diff --git a/apps/documenteditor/main/resources/img/right-panels/right_panel_wrap_icons.png b/apps/documenteditor/main/resources/img/right-panels/right_panel_wrap_icons.png deleted file mode 100644 index 0c5cab5c4c9c5d0ebdec5893ffc3cd356013bf40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1070 zcmV+}1kwA6P)7{&J>f_n^);7$~`hu7VsI5FJa-QC?C>TdA_*W&K(@G;orX1~ql|K{56qb>&vzudEW%$0??`4Ygu}7O&m-hY+t&u!k#)Bjj8|E&JKSHr=NFGo2cK z^l-R>TFx!7dDnuuyor^u-apfIv2ysCxvW(Y$k91+P~a1o%MDl`T_Nk^dYH?n%)ce) zI@~Txn4^XBi0N-|InKu0ypZwXM{wz1=D+h|63pcfY>joWF18LoGMC8}ha3cQ5a1k` z55{8$Y>%fKXXjAOo9S@7EMblo&LidwLqiU+`$G#|%>B3%)|j0u4mk+q zAV3$MfDw5DU0n0#J34>TOLnAtw0Isd^XzcO5LVAC_uU3;h@m(d*WwpgbMQ-;9vxO~ zSn2j3>F!{6WHdAQtWgA6@npxs*jTV+@Zm%uv6 zrC7S+k%L4I0$lF4`wCBCJic((ub`VZ-$6Am>xetF;ArtYVoo;H(#H<7L#(g6ep2Dh z`!lSTTX9XuE$;fS=&A_hppb(H@43we;PQ|G{!dzb^X5C~R-_&CZIL?M4y~U@jQ`W_ zEp~FqE$;fj!kc#%EXmJU0h?nJtl*xVITe8%By#ZJVpx(VZ-u49gOZw$3AFyrEnA*{nF3W&M)b_@bLPfahQ_XC{*~U@-IjI$GR{)a8!!9D4e!|jmoh%@hS_qTT*KIa+!%K)36OlH`? zI6JTW&)b02@ii>uH|*_ZdxxtQ@-WJzjkZ3;zuO>$K3AC>a;SNQQ1i;6=4~G#^rXw7 o<`qKCD~B9vULk}KLI@%L0{<bRbiLPsb| zo+p<)u@+Ni$Zay2CS!A%TjaPr8$D0|JfAR(U-N>`4faS;HZ6y)aYcnT*s!F5vy=mF#_!D~14RopRuoMI5} zeUoncVGmzcl{k^WP-|?aEVzV=9qV|+WT{Af{@DA*UnZt`_5^dR@2sT^w2(8qJEw%jI_BwNTvMrlE+jg%G@woWo!2N{wj}{Ay zx>=%YaSeA_QD^I#rX}XoFvW&Zrxo2CG=%wOwd^9H2}~6ZH^ubK*dG>Jif^ET<42~u zx6PQFmrv6;wH=egFEInPOx}2eI}Q6FWTlMscTcqhU3&-`sTFa{xI@L%7pNon)%}a_ zRHNZMAbi%C(tN5xWaz75I+ohnpO$o+gdDlU*~`l~;K^vuC0p3+==*GHGY{m@W9|n; zsTvN4os#UEVmjXh)KkqY4n$$CLJ)yf0mF|G#zQtG@hwiU+1rXsmVSfytaC+o z2inJ_F=<*kf?E#aBG~DKP39M}X2UOK0?M?fD@$jn$R!+dtf0>T_EEQ||C2>57>oTf zX>;SVgsfTZ#nQQ8QCy|`V7NA4(ZvSR-dyF7#VIsW!nYVe@hh4A>;AXY$B0>A@_f3R zt1t|xwvu9I?h$=Pi*I@Tmzv&P8^5+Fi6<_0Z52W*ZUWBViQMh2Z3e+hu}0S^a$Ul5 zeQJ!56HUDlx9<3X2zLCe9hKy_Xs=T}xElk)1Kbs`D9+lPB*lda+57tLK`d>24`^qFq{ z?-L+;Ggz>#wN*wi3HcQD^MuJW;p7V4MVN5h2F23pD%ct8H_U~lMd$qkIr3<=)7B30 zXQ;>GlZ3^#24Td^BAN$lo~PEq=y^FoMG&f-1TIWtq1F`mm*$fwKAu2nT4lV6icY{o z)rXp0{25vs;Qi8etL#K|M%5U3P9?r7OUz)#u9W+)^yl0AY@+l`R_x3Zo*?RAclOj9 zpl9`DtV)jz0vEPgT#0sDOH7!hU8%flU|r0mTE9lGfsJ32kpDy>gfP~gXp)X_3cL7? zWyc$}{T*8_I5?;MI`MwU(E@?i9Fu04f^KJrT6Y zPZzgZh@U5S)%aJi2R90>Pcy?Tp5Gq})fIZxoB4!#e8;nk`@VXN4S#0!^)2q@mZrG+ z8T(sf&u6c-7+|ET^Baw-&MCrM(Lrrh=ml+v2-lX0c&_4~mNoj(7r)i+n}J3;azr1( zOrNA&3~K6We*c2IU;pYMjNUp!yaYt?Au(OHD2Y?UhXq1Y;wBJ?eEz*xvrHF_>zA!L z6yydiBxH>iJvg<3QMxq$*$CjIySuZf1#Fy#<}Xzxk%pH(>W+6!t>uhiCaY>as&%M^ z)IO!^#&R3r@k^P81%%XdKUqqXL-Ax*Dozee`Fwr(Fc}Te>0vN6w(y5jd zy_wQXX2fn39X+)nE z%vX$I;P>!}qH;Na?!mndw?53cNN#?TE>B=l*$d|R$zRdIadD~~{k0p5-T{N+0O)1c ziDK$5iltl-3?NbFe^YJ5h|APv_e)St5d4M4D{v1Hxh@Y5 zhxcvpLPA>d8F>Yc(|*=n1zF_oM|Ub%It+t2*1%2H+T7KHTv3o62?raDo*05l<@v7G zXigi%6o*c=*M~AwW8os)v&=i3u@AWJNAo+IwS34#WcIalL$vUbO2mip@2xFgF>x7G|&O)y%xJsC^4)JpxOobwiP) zFH4ok?Y7CJNvSCD+5_h-y{aDCovHuriS&&A8}A(d>IM)7O&6sS*eHor4FWYe zJ5F;P<(>7b@Lm4d2Tdt_RiFjCWA{m}}4 zEIP+{d1}lh*HVN7Wf~TOJPPIih%#I|f2}`1UO^s{=CPW_>KOG&r^zZ|kTD$iG$qvJ z7D(b_qGD{kjE&@bnff--pL5p-DwBVb4sHcUaltiv<%= scope.txtDictionaryLanguage %>', '
', '', '
' diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 193bf123d..b020bb5e8 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1315,7 +1315,7 @@ define([ me.mnuCustomScale = new Common.UI.MenuItem({ template: _.template([ - '
', 'data-stopPropagation="true"', '<% } %>', '>', diff --git a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less index 42eebbcdb..a0abb7a2a 100644 --- a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less +++ b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less @@ -54,8 +54,8 @@ .selected { .listitem-icon { - background-position-x: -20px; - --bgX: -20px; + background-position-x: 0; + background-position-x: @button-small-normal-icon-offset-x; } } From 71592eb4be27e0049530c010e175298f229de179 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sat, 6 Mar 2021 00:53:29 +0300 Subject: [PATCH 2/3] [common] fixed misspelling --- apps/common/main/resources/less/asc-mixins.less | 4 ++-- apps/common/main/resources/less/colors-table.less | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/common/main/resources/less/asc-mixins.less b/apps/common/main/resources/less/asc-mixins.less index b25a205bf..87872228a 100644 --- a/apps/common/main/resources/less/asc-mixins.less +++ b/apps/common/main/resources/less/asc-mixins.less @@ -218,13 +218,13 @@ } @common-controls-width: 100px; -.img-commonctrl, +.img-commonctrl, .dropdown-menu li .checked:before, .input-error:before, .input-warning:before, .btn-toolbar .icon.img-commonctrl, .list-item div.checked:before { background-image: if(@icon-src-base64, data-uri(%("%s",'@{common-image-path}/@{common-controls}')), ~"url(@{common-image-const-path}/@{common-controls})"); background-repeat: no-repeat; - filter: @component-normal-icon-filer; + filter: @component-normal-icon-filter; @1d5ximage: replace(@common-controls, '\.png$', '@1.5x.png'); @2ximage: replace(@common-controls, '\.png$', '@2x.png'); diff --git a/apps/common/main/resources/less/colors-table.less b/apps/common/main/resources/less/colors-table.less index 89f5ce90c..5bff0dfd2 100644 --- a/apps/common/main/resources/less/colors-table.less +++ b/apps/common/main/resources/less/colors-table.less @@ -192,7 +192,7 @@ @button-header-normal-icon-offset-x: var(--button-header-normal-icon-offset-x, -20px); @button-header-active-icon-offset-x: var(--button-header-active-icon-offset-x, -20px); -@component-normal-icon-filer: var(--component-normal-icon-filter); +@component-normal-icon-filter: var(--component-normal-icon-filter); @component-disabled-opacity: var(--component-disabled-opacity, .4); @button-icon-opacity: var(--button-icon-opacity, 1); From 0dde4f283ab972a2b4748840a9cf5b6f4f763627 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sat, 6 Mar 2021 00:54:30 +0300 Subject: [PATCH 3/3] [common] changed scaling condition --- apps/common/main/lib/util/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js index 949e7185c..d277e4df4 100644 --- a/apps/common/main/lib/util/utils.js +++ b/apps/common/main/lib/util/utils.js @@ -140,7 +140,7 @@ Common.Utils = _.extend(new(function() { if ( scale.devicePixelRatio < 1.5 ) { $root.removeClass('pixel-ratio__1_5 pixel-ratio__2'); } else - if ( !(scale.devicePixelRatio < 1.5) && !(scale.devicePixelRatio > 2) ) { + if ( !(scale.devicePixelRatio < 1.5) && scale.devicePixelRatio < 2 ) { $root.removeClass('pixel-ratio__2'); $root.addClass('pixel-ratio__1_5'); } else {