From cdbd026effbe2fd92d4ec06aaed0a7a35496116d Mon Sep 17 00:00:00 2001 From: Dmitry-Ilyushechkin Date: Sun, 2 Feb 2025 14:01:11 +0300 Subject: [PATCH] Button styling fix and icon trasfer --- .../main/resources/less/toolbar.less | 48 ++++++++++++++++++ .../img/toolbar/1.25x/btn-border-style.png | Bin 198 -> 0 bytes .../img/toolbar/1.5x/btn-border-style.png | Bin 202 -> 0 bytes .../img/toolbar/1.75x/btn-border-style.png | Bin 204 -> 0 bytes .../img/toolbar/1x/btn-border-style.png | Bin 198 -> 0 bytes .../img/toolbar/2.5x/btn-border-style.svg | 3 -- .../img/toolbar/2x/btn-border-style.png | Bin 222 -> 0 bytes 7 files changed, 48 insertions(+), 3 deletions(-) delete mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/btn-border-style.png delete mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-border-style.png delete mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-border-style.png delete mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-border-style.png delete mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/2.5x/btn-border-style.svg delete mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-border-style.png diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index e5f253f668..c6c00fdc39 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -322,3 +322,51 @@ } } } + +#id-toolbar-menu-item-border-width, +#format-rules-borders-border-width { + .border-size-item { + display: flex; + justify-content: space-between; + align-items: center; + .border-size-text { + margin-right: 8px; + } + svg { + width: 60px; + height: 8px; + fill: var(--text-normal); + shape-rendering: crispEdges; + } + } +} + +#id-toolbar-mnu-item-border-color { + > span { + background-image: none; + width: 12px; + height: 12px; + margin: 2px 8px 0 -20px; + border-style: solid; + border-width: 3px; + border-color: #000; + + .rtl & { + margin: 2px -20px 0 8px; + } + } +} + +#id-toolbar-menu-auto-bordercolor { + .color-auto { + background-image: none; + width: 12px; + height: 12px; + margin: 1px 7px 0 1px; + background-color: #000; + + .rtl & { + margin: 1px 1px 0 7px; + } + } +} \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/btn-border-style.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.25x/btn-border-style.png deleted file mode 100644 index 9e9cc994dd5ef5f92475d6c94220c6d23eec4ae1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^MnEjd!3HFYLuy@s6lZ})WHAE+w=f7ZGR&GI0Tg5` z4sv&5Sa(k5C6L3C?&#~tz_78O`%fY(kRR>o;uuoF`1Xn;UxNaV%SFle_31}t&A2>F z%%1I!Rd30=<;Bpz|3fMM>!10@*;>_hcHC5YAX;8_M6vvF?Dd;{Z#Kt2-?*+=ap(Ox q@hQeeQS(;pj=G+?M2tb9nRjBdF8hRiKHWfT7(8A5T-G@yGywnxxj;|= diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-border-style.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-border-style.png deleted file mode 100644 index 8761a28ac683454170c250805e1633ed2a407aad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^Hb5-L!3HD?X4LuvDb50q$YKTtZeb8+WSBKa0w~B> z9OUlAu(f({leRdT zm}>pmK8N#VR}%{Z!@Wmd=C6NB9$(lhw4>vbC&Rxt=Pngp*j=QSnz`0HuF)}o~k6`fV&}C=6aoZAT6@#a%pUXO@geCx{K0~|! diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-border-style.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.75x/btn-border-style.png deleted file mode 100644 index 668079a88ce69a3223bd72a0d19c8df659754e63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^Za}Qe!3HEX#cOhb6lZ})WHAE+w=f7ZGR&GI0Tg5` z4sv&5Sa(k5C6L3C?&#~tz_78O`%fY(ke}%3;uuoF`1ZOXUxNY<>xFB-??*<)aI^?; zs{OimW7>wV&MXWJ^Cva`ll=WY$ErI*r#tRF2gA1NNnST+o;-N->B^Gj-nN%lU$1Sr xTf@l^XRy1b*s=EHr@6Inx4oLC&v2kW<^hi`yLs506F|!tJYD@<);T3K0RRYoMPvW~ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-border-style.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1x/btn-border-style.png deleted file mode 100644 index 469c84ca2009d36f4637243dcdb991f774e0b604..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<lcezgdp!|Je(= q>yK_K+-Br - - diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-border-style.png b/apps/spreadsheeteditor/main/resources/img/toolbar/2x/btn-border-style.png deleted file mode 100644 index f87b3e9e4f2511dad52db5b7d11f2e37e3fd6265..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^0YI$5!3HEV6KWZO6lZ})WHAGSm?{V}dIqU{017e| z2e~^jtUD+363Agmcl32+VA$Bt{U?zX$S?MEaSW+oe0#%??|=dagTtHu|L>H&yws8v zV12i@qcf4Q2dL;rwDbwf{PIw4;Gfz!qg{`~%9COx7#PfUFm!C!6}+k-+X^(9 N!PC{xWt~$(699iCOQQe)