From 815f4a5e1a90af96ea193de2397c52000a337e58 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Mon, 28 Mar 2022 05:32:04 +0300 Subject: [PATCH 1/5] update btn-doc-format --- .../main/resources/img/doc-formats/csv.svg | 4 +- .../main/resources/img/doc-formats/docm.svg | 4 +- .../main/resources/img/doc-formats/docx.svg | 4 +- .../main/resources/img/doc-formats/docxf.svg | 4 +- .../main/resources/img/doc-formats/dotx.svg | 4 +- .../main/resources/img/doc-formats/epub.svg | 4 +- .../main/resources/img/doc-formats/fb2.svg | 4 +- .../main/resources/img/doc-formats/html.svg | 4 +- .../main/resources/img/doc-formats/jpg.svg | 4 +- .../main/resources/img/doc-formats/odp.svg | 4 +- .../main/resources/img/doc-formats/ods.svg | 3 +- .../main/resources/img/doc-formats/odt.svg | 4 +- .../main/resources/img/doc-formats/oform.svg | 4 +- .../main/resources/img/doc-formats/otp.svg | 4 +- .../main/resources/img/doc-formats/ots.svg | 3 +- .../main/resources/img/doc-formats/ott.svg | 4 +- .../main/resources/img/doc-formats/pdf.svg | 4 +- .../main/resources/img/doc-formats/pdfa.svg | 4 +- .../main/resources/img/doc-formats/png.svg | 4 +- .../main/resources/img/doc-formats/potx.svg | 4 +- .../main/resources/img/doc-formats/ppsx.svg | 4 +- .../main/resources/img/doc-formats/pptm.svg | 4 +- .../main/resources/img/doc-formats/pptx.svg | 4 +- .../main/resources/img/doc-formats/rtf.svg | 3 +- .../main/resources/img/doc-formats/txt.svg | 4 +- .../main/resources/img/doc-formats/xlsm.svg | 4 +- .../main/resources/img/doc-formats/xlsx.svg | 4 +- .../main/resources/img/doc-formats/xltx.svg | 4 +- .../main/app/view/FileMenuPanels.js | 12 ++--- .../main/resources/less/filemenu.less | 52 ++++++++++++++++++- .../main/app/view/FileMenuPanels.js | 12 ++--- .../main/resources/less/leftmenu.less | 40 +++++++++++++- .../main/app/view/FileMenuPanels.js | 12 ++--- .../main/resources/less/leftmenu.less | 34 +++++++++++- 34 files changed, 191 insertions(+), 80 deletions(-) diff --git a/apps/common/main/resources/img/doc-formats/csv.svg b/apps/common/main/resources/img/doc-formats/csv.svg index 41be9da1a6..fdd2fc1adf 100644 --- a/apps/common/main/resources/img/doc-formats/csv.svg +++ b/apps/common/main/resources/img/doc-formats/csv.svg @@ -1,5 +1,5 @@ - + @@ -30,5 +30,5 @@ - + diff --git a/apps/common/main/resources/img/doc-formats/docm.svg b/apps/common/main/resources/img/doc-formats/docm.svg index 6a17105c98..86e7c54dd3 100644 --- a/apps/common/main/resources/img/doc-formats/docm.svg +++ b/apps/common/main/resources/img/doc-formats/docm.svg @@ -1,10 +1,10 @@ - + - + diff --git a/apps/common/main/resources/img/doc-formats/docx.svg b/apps/common/main/resources/img/doc-formats/docx.svg index 12839165ed..f5416b33eb 100644 --- a/apps/common/main/resources/img/doc-formats/docx.svg +++ b/apps/common/main/resources/img/doc-formats/docx.svg @@ -1,8 +1,8 @@ - + - + diff --git a/apps/common/main/resources/img/doc-formats/docxf.svg b/apps/common/main/resources/img/doc-formats/docxf.svg index c5b1846c34..c7a21a112e 100644 --- a/apps/common/main/resources/img/doc-formats/docxf.svg +++ b/apps/common/main/resources/img/doc-formats/docxf.svg @@ -1,5 +1,5 @@ - + @@ -13,5 +13,5 @@ - + diff --git a/apps/common/main/resources/img/doc-formats/dotx.svg b/apps/common/main/resources/img/doc-formats/dotx.svg index b13d8c92fb..a47d3f4b9b 100644 --- a/apps/common/main/resources/img/doc-formats/dotx.svg +++ b/apps/common/main/resources/img/doc-formats/dotx.svg @@ -1,10 +1,10 @@ - + - + diff --git a/apps/common/main/resources/img/doc-formats/epub.svg b/apps/common/main/resources/img/doc-formats/epub.svg index ef7ed8564e..54657ca33c 100644 --- a/apps/common/main/resources/img/doc-formats/epub.svg +++ b/apps/common/main/resources/img/doc-formats/epub.svg @@ -1,10 +1,10 @@ - + - + diff --git a/apps/common/main/resources/img/doc-formats/fb2.svg b/apps/common/main/resources/img/doc-formats/fb2.svg index fc2472911b..6e22697a11 100644 --- a/apps/common/main/resources/img/doc-formats/fb2.svg +++ b/apps/common/main/resources/img/doc-formats/fb2.svg @@ -1,10 +1,10 @@ - + - + diff --git a/apps/common/main/resources/img/doc-formats/html.svg b/apps/common/main/resources/img/doc-formats/html.svg index 212e63e092..50feffdc92 100644 --- a/apps/common/main/resources/img/doc-formats/html.svg +++ b/apps/common/main/resources/img/doc-formats/html.svg @@ -1,10 +1,10 @@ - + - + diff --git a/apps/common/main/resources/img/doc-formats/jpg.svg b/apps/common/main/resources/img/doc-formats/jpg.svg index 68d4c826e4..bccd0c419e 100644 --- a/apps/common/main/resources/img/doc-formats/jpg.svg +++ b/apps/common/main/resources/img/doc-formats/jpg.svg @@ -1,5 +1,5 @@ - + @@ -10,5 +10,5 @@ - + diff --git a/apps/common/main/resources/img/doc-formats/odp.svg b/apps/common/main/resources/img/doc-formats/odp.svg index 3fc77de304..e80d538367 100644 --- a/apps/common/main/resources/img/doc-formats/odp.svg +++ b/apps/common/main/resources/img/doc-formats/odp.svg @@ -1,9 +1,9 @@ - + - + diff --git a/apps/common/main/resources/img/doc-formats/ods.svg b/apps/common/main/resources/img/doc-formats/ods.svg index 0356d32550..a0414214fc 100644 --- a/apps/common/main/resources/img/doc-formats/ods.svg +++ b/apps/common/main/resources/img/doc-formats/ods.svg @@ -1,10 +1,9 @@ - + - diff --git a/apps/common/main/resources/img/doc-formats/odt.svg b/apps/common/main/resources/img/doc-formats/odt.svg index c2122c0a4d..863112b879 100644 --- a/apps/common/main/resources/img/doc-formats/odt.svg +++ b/apps/common/main/resources/img/doc-formats/odt.svg @@ -1,9 +1,9 @@ - + - + diff --git a/apps/common/main/resources/img/doc-formats/oform.svg b/apps/common/main/resources/img/doc-formats/oform.svg index 80dba56e1c..e2ab98f2fb 100644 --- a/apps/common/main/resources/img/doc-formats/oform.svg +++ b/apps/common/main/resources/img/doc-formats/oform.svg @@ -1,5 +1,5 @@ - + @@ -14,5 +14,5 @@ - + diff --git a/apps/common/main/resources/img/doc-formats/otp.svg b/apps/common/main/resources/img/doc-formats/otp.svg index 70dcbc9740..32e67c8f76 100644 --- a/apps/common/main/resources/img/doc-formats/otp.svg +++ b/apps/common/main/resources/img/doc-formats/otp.svg @@ -1,5 +1,5 @@ - + @@ -7,5 +7,5 @@ - + diff --git a/apps/common/main/resources/img/doc-formats/ots.svg b/apps/common/main/resources/img/doc-formats/ots.svg index 96aef70469..d534da8612 100644 --- a/apps/common/main/resources/img/doc-formats/ots.svg +++ b/apps/common/main/resources/img/doc-formats/ots.svg @@ -1,5 +1,5 @@ - + @@ -8,5 +8,4 @@ - diff --git a/apps/common/main/resources/img/doc-formats/ott.svg b/apps/common/main/resources/img/doc-formats/ott.svg index b2a7e1a431..194bf7da24 100644 --- a/apps/common/main/resources/img/doc-formats/ott.svg +++ b/apps/common/main/resources/img/doc-formats/ott.svg @@ -1,5 +1,5 @@ - + @@ -7,5 +7,5 @@ - + diff --git a/apps/common/main/resources/img/doc-formats/pdf.svg b/apps/common/main/resources/img/doc-formats/pdf.svg index 8c9a6ed5a3..c532b23bc2 100644 --- a/apps/common/main/resources/img/doc-formats/pdf.svg +++ b/apps/common/main/resources/img/doc-formats/pdf.svg @@ -1,8 +1,8 @@ - + - + diff --git a/apps/common/main/resources/img/doc-formats/pdfa.svg b/apps/common/main/resources/img/doc-formats/pdfa.svg index ef9a17b4e5..19efd108e7 100644 --- a/apps/common/main/resources/img/doc-formats/pdfa.svg +++ b/apps/common/main/resources/img/doc-formats/pdfa.svg @@ -1,10 +1,10 @@ - + - + diff --git a/apps/common/main/resources/img/doc-formats/png.svg b/apps/common/main/resources/img/doc-formats/png.svg index 59d7edf61f..30f3ee2c05 100644 --- a/apps/common/main/resources/img/doc-formats/png.svg +++ b/apps/common/main/resources/img/doc-formats/png.svg @@ -1,5 +1,5 @@ - + @@ -10,5 +10,5 @@ - + diff --git a/apps/common/main/resources/img/doc-formats/potx.svg b/apps/common/main/resources/img/doc-formats/potx.svg index 150957769c..6dee1140dc 100644 --- a/apps/common/main/resources/img/doc-formats/potx.svg +++ b/apps/common/main/resources/img/doc-formats/potx.svg @@ -1,5 +1,5 @@ - + @@ -10,5 +10,5 @@ - + diff --git a/apps/common/main/resources/img/doc-formats/ppsx.svg b/apps/common/main/resources/img/doc-formats/ppsx.svg index 37ab966b24..3557f5bb2b 100644 --- a/apps/common/main/resources/img/doc-formats/ppsx.svg +++ b/apps/common/main/resources/img/doc-formats/ppsx.svg @@ -1,5 +1,5 @@ - + @@ -15,5 +15,5 @@ - + diff --git a/apps/common/main/resources/img/doc-formats/pptm.svg b/apps/common/main/resources/img/doc-formats/pptm.svg index 7c15a68075..ce2944715b 100644 --- a/apps/common/main/resources/img/doc-formats/pptm.svg +++ b/apps/common/main/resources/img/doc-formats/pptm.svg @@ -1,5 +1,5 @@ - + @@ -10,5 +10,5 @@ - + diff --git a/apps/common/main/resources/img/doc-formats/pptx.svg b/apps/common/main/resources/img/doc-formats/pptx.svg index 51a385103f..92a0662313 100644 --- a/apps/common/main/resources/img/doc-formats/pptx.svg +++ b/apps/common/main/resources/img/doc-formats/pptx.svg @@ -1,5 +1,5 @@ - + @@ -8,5 +8,5 @@ - + diff --git a/apps/common/main/resources/img/doc-formats/rtf.svg b/apps/common/main/resources/img/doc-formats/rtf.svg index 1b613a81d6..2197fb9036 100644 --- a/apps/common/main/resources/img/doc-formats/rtf.svg +++ b/apps/common/main/resources/img/doc-formats/rtf.svg @@ -1,5 +1,5 @@ - + @@ -14,5 +14,4 @@ - diff --git a/apps/common/main/resources/img/doc-formats/txt.svg b/apps/common/main/resources/img/doc-formats/txt.svg index bed12e3f8b..206714aab0 100644 --- a/apps/common/main/resources/img/doc-formats/txt.svg +++ b/apps/common/main/resources/img/doc-formats/txt.svg @@ -1,5 +1,5 @@ - + @@ -12,5 +12,5 @@ - + diff --git a/apps/common/main/resources/img/doc-formats/xlsm.svg b/apps/common/main/resources/img/doc-formats/xlsm.svg index 347be30e42..ae16f316f9 100644 --- a/apps/common/main/resources/img/doc-formats/xlsm.svg +++ b/apps/common/main/resources/img/doc-formats/xlsm.svg @@ -1,10 +1,10 @@ - + - + diff --git a/apps/common/main/resources/img/doc-formats/xlsx.svg b/apps/common/main/resources/img/doc-formats/xlsx.svg index 277d275363..84aeec80f6 100644 --- a/apps/common/main/resources/img/doc-formats/xlsx.svg +++ b/apps/common/main/resources/img/doc-formats/xlsx.svg @@ -1,8 +1,8 @@ - + - + diff --git a/apps/common/main/resources/img/doc-formats/xltx.svg b/apps/common/main/resources/img/doc-formats/xltx.svg index f676c37721..220c7489ad 100644 --- a/apps/common/main/resources/img/doc-formats/xltx.svg +++ b/apps/common/main/resources/img/doc-formats/xltx.svg @@ -1,10 +1,10 @@ - + - + diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index baf7de0e2f..1720a05f6d 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -79,9 +79,9 @@ define([ '', '<% _.each(row, function(item) { %>', '<% if (item.type!==Asc.c_oAscFileType.DOCM || fileType=="docm") { %>', - '
', - '', - '
', + '
', + '
', + '
', '<% } %>', '<% }) %>', '', @@ -175,9 +175,9 @@ define([ '', '<% _.each(row, function(item) { %>', '<% if (item.type!==Asc.c_oAscFileType.DOCM || fileType=="docm") { %>', - '
', - '', - '
', + '
', + '
', + '
', '<% } %>', '<% }) %>', '', diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less index 25d9a7e254..81cadddabd 100644 --- a/apps/documenteditor/main/resources/less/filemenu.less +++ b/apps/documenteditor/main/resources/less/filemenu.less @@ -100,8 +100,56 @@ height: 125px; cursor: pointer; - svg&:hover { - opacity:0.85; + .svg-format-docx { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/docx.svg) no-repeat center"; + } + .svg-format-pdf { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/pdf.svg) no-repeat center"; + } + .svg-format-odt { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/odt.svg) no-repeat center"; + } + .svg-format-txt { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/txt.svg) no-repeat center"; + } + .svg-format-dotx { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/dotx.svg) no-repeat center"; + } + .svg-format-pdfa { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/pdfa.svg) no-repeat center"; + } + .svg-format-ott { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/ott.svg) no-repeat center"; + } + .svg-format-rtf { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/rtf.svg) no-repeat center"; + } + .svg-format-docm { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/docm.svg) no-repeat center"; + } + .svg-format-docxf { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/docxf.svg) no-repeat center"; + } + .svg-format-oform { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/oform.svg) no-repeat center"; + } + .svg-format-html { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/html.svg) no-repeat center"; + } + .svg-format-fb2 { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/fb2.svg) no-repeat center"; + } + .svg-format-epub { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/epub.svg) no-repeat center"; + } + + div { + display: block; + height: 100%; + width: 100%; + &:hover { + opacity: 0.85; + } } } diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index a566631be2..2ca373097f 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -76,9 +76,9 @@ define([ '', '<% _.each(row, function(item) { %>', '<% if (item.type!==Asc.c_oAscFileType.PPTM || fileType=="pptm") { %>', - '
', - '', - '
', + '
', + '
', + '
', '<% } %>', '<% }) %>', '', @@ -147,9 +147,9 @@ define([ '', '<% _.each(row, function(item) { %>', '<% if (item.type!==Asc.c_oAscFileType.PPTM || fileType=="pptm") { %>', - '
', - '', - '
', + '
', + '
', + '
', '<% } %>', '<% }) %>', '', diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less index fb6dfbd600..8893de8620 100644 --- a/apps/presentationeditor/main/resources/less/leftmenu.less +++ b/apps/presentationeditor/main/resources/less/leftmenu.less @@ -39,8 +39,44 @@ height: 125px; cursor: pointer; - svg&:hover { - opacity:0.85; + .svg-format-pptx { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/pptx.svg) no-repeat center"; + } + .svg-format-pdf { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/pdf.svg) no-repeat center"; + } + .svg-format-odp { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/odp.svg) no-repeat center"; + } + .svg-format-potx { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/potx.svg) no-repeat center"; + } + .svg-format-pdfa { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/pdfa.svg) no-repeat center"; + } + .svg-format-otp { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/otp.svg) no-repeat center"; + } + .svg-format-ppsx { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/ppsx.svg) no-repeat center"; + } + .svg-format-png { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/png.svg) no-repeat center"; + } + .svg-format-jpg { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/jpg.svg) no-repeat center"; + } + .svg-format-pptm { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/pptm.svg) no-repeat center"; + } + + div { + display: block; + height: 100%; + width: 100%; + &:hover { + opacity: 0.85; + } } } diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index eb5b6b202e..1a5f7c6149 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -65,9 +65,9 @@ define([ '', '<% _.each(row, function(item) { %>', '<% if (item.type!==Asc.c_oAscFileType.XLSM || fileType=="xlsm") { %>', - '
', - '', - '
', + '
', + '
', + '
', '<% } %>', '<% }) %>', '', @@ -136,9 +136,9 @@ define([ '', '<% _.each(row, function(item) { %>', '<% if (item.type!==Asc.c_oAscFileType.XLSM || fileType=="xlsm") { %>', - '
', - '', - '
', + '
', + '
', + '
', '<% } %>', '<% }) %>', '', diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index 822e4ab0b2..7a99f9436f 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -39,8 +39,38 @@ height: 125px; cursor: pointer; - svg&:hover { - opacity:0.85; + .svg-format-xlsx { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/xlsx.svg) no-repeat center"; + } + .svg-format-pdf { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/pdf.svg) no-repeat center"; + } + .svg-format-ods { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/ods.svg) no-repeat center"; + } + .svg-format-csv { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/csv.svg) no-repeat center"; + } + .svg-format-xltx { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/xltx.svg) no-repeat center"; + } + .svg-format-pdfa { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/pdfa.svg) no-repeat center"; + } + .svg-format-ots { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/ots.svg) no-repeat center"; + } + .svg-format-xlsm { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/xlsm.svg) no-repeat center"; + } + + div { + display: block; + height: 100%; + width: 100%; + &:hover { + opacity: 0.85; + } } } From f29df7bd0cb613a5651718d4ea54b9e9ab0578ae Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 29 Mar 2022 00:41:43 +0300 Subject: [PATCH 2/5] [all] refactoring styles --- .../main/resources/less/filemenu.less | 84 ++++++++++--------- .../main/resources/less/leftmenu.less | 60 ++++++------- .../main/resources/less/leftmenu.less | 48 ++++++----- 3 files changed, 99 insertions(+), 93 deletions(-) diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less index 81cadddabd..001e8b625b 100644 --- a/apps/documenteditor/main/resources/less/filemenu.less +++ b/apps/documenteditor/main/resources/less/filemenu.less @@ -100,47 +100,49 @@ height: 125px; cursor: pointer; - .svg-format-docx { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/docx.svg) no-repeat center"; - } - .svg-format-pdf { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/pdf.svg) no-repeat center"; - } - .svg-format-odt { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/odt.svg) no-repeat center"; - } - .svg-format-txt { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/txt.svg) no-repeat center"; - } - .svg-format-dotx { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/dotx.svg) no-repeat center"; - } - .svg-format-pdfa { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/pdfa.svg) no-repeat center"; - } - .svg-format-ott { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/ott.svg) no-repeat center"; - } - .svg-format-rtf { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/rtf.svg) no-repeat center"; - } - .svg-format-docm { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/docm.svg) no-repeat center"; - } - .svg-format-docxf { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/docxf.svg) no-repeat center"; - } - .svg-format-oform { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/oform.svg) no-repeat center"; - } - .svg-format-html { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/html.svg) no-repeat center"; - } - .svg-format-fb2 { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/fb2.svg) no-repeat center"; - } - .svg-format-epub { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/epub.svg) no-repeat center"; + .svg-format- { + &docx { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/docx.svg) no-repeat center"; + } + &pdf { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/pdf.svg) no-repeat center"; + } + &odt { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/odt.svg) no-repeat center"; + } + &txt { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/txt.svg) no-repeat center"; + } + &dotx { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/dotx.svg) no-repeat center"; + } + &pdfa { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/pdfa.svg) no-repeat center"; + } + &ott { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/ott.svg) no-repeat center"; + } + &rtf { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/rtf.svg) no-repeat center"; + } + &docm { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/docm.svg) no-repeat center"; + } + &docxf { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/docxf.svg) no-repeat center"; + } + &oform { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/oform.svg) no-repeat center"; + } + &html { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/html.svg) no-repeat center"; + } + &fb2 { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/fb2.svg) no-repeat center"; + } + &epub { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/epub.svg) no-repeat center"; + } } div { diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less index 8893de8620..4b269723ef 100644 --- a/apps/presentationeditor/main/resources/less/leftmenu.less +++ b/apps/presentationeditor/main/resources/less/leftmenu.less @@ -39,35 +39,37 @@ height: 125px; cursor: pointer; - .svg-format-pptx { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/pptx.svg) no-repeat center"; - } - .svg-format-pdf { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/pdf.svg) no-repeat center"; - } - .svg-format-odp { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/odp.svg) no-repeat center"; - } - .svg-format-potx { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/potx.svg) no-repeat center"; - } - .svg-format-pdfa { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/pdfa.svg) no-repeat center"; - } - .svg-format-otp { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/otp.svg) no-repeat center"; - } - .svg-format-ppsx { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/ppsx.svg) no-repeat center"; - } - .svg-format-png { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/png.svg) no-repeat center"; - } - .svg-format-jpg { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/jpg.svg) no-repeat center"; - } - .svg-format-pptm { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/pptm.svg) no-repeat center"; + .svg-format- { + &pptx { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/pptx.svg) no-repeat center"; + } + &pdf { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/pdf.svg) no-repeat center"; + } + &odp { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/odp.svg) no-repeat center"; + } + &potx { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/potx.svg) no-repeat center"; + } + &pdfa { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/pdfa.svg) no-repeat center"; + } + &otp { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/otp.svg) no-repeat center"; + } + &ppsx { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/ppsx.svg) no-repeat center"; + } + &png { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/png.svg) no-repeat center"; + } + &jpg { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/jpg.svg) no-repeat center"; + } + &pptm { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/pptm.svg) no-repeat center"; + } } div { diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index 7a99f9436f..f79168bfa0 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -39,29 +39,31 @@ height: 125px; cursor: pointer; - .svg-format-xlsx { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/xlsx.svg) no-repeat center"; - } - .svg-format-pdf { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/pdf.svg) no-repeat center"; - } - .svg-format-ods { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/ods.svg) no-repeat center"; - } - .svg-format-csv { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/csv.svg) no-repeat center"; - } - .svg-format-xltx { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/xltx.svg) no-repeat center"; - } - .svg-format-pdfa { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/pdfa.svg) no-repeat center"; - } - .svg-format-ots { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/ots.svg) no-repeat center"; - } - .svg-format-xlsm { - background: ~"url(../../../apps/common/main/resources/img/doc-formats/xlsm.svg) no-repeat center"; + .svg-format- { + &xlsx { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/xlsx.svg) no-repeat center"; + } + &pdf { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/pdf.svg) no-repeat center"; + } + &ods { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/ods.svg) no-repeat center"; + } + &csv { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/csv.svg) no-repeat center"; + } + &xltx { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/xltx.svg) no-repeat center"; + } + &pdfa { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/pdfa.svg) no-repeat center"; + } + &ots { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/ots.svg) no-repeat center"; + } + &xlsm { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/xlsm.svg) no-repeat center"; + } } div { From 1ca8657745c548aac84b3f5fb25d8f38a77c20f9 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Thu, 31 Mar 2022 08:54:36 +0300 Subject: [PATCH 3/5] svg for menu create new --- .../main/resources/img/doc-formats/blank.svg | 4 ++-- .../main/app/view/FileMenuPanels.js | 4 ++-- apps/documenteditor/main/resources/img/blank.svg | 4 ++-- .../main/resources/img/file-template.svg | 4 ++-- .../main/resources/less/filemenu.less | 15 +++++++++++++++ .../main/app/view/FileMenuPanels.js | 4 ++-- .../main/resources/img/file-template.svg | 4 ++-- .../main/resources/less/leftmenu.less | 13 +++++++++++++ .../main/app/view/FileMenuPanels.js | 4 ++-- .../main/resources/img/file-template.svg | 4 ++-- .../main/resources/less/leftmenu.less | 13 +++++++++++++ 11 files changed, 57 insertions(+), 16 deletions(-) diff --git a/apps/common/main/resources/img/doc-formats/blank.svg b/apps/common/main/resources/img/doc-formats/blank.svg index 224c65fbf9..b8969571b1 100644 --- a/apps/common/main/resources/img/doc-formats/blank.svg +++ b/apps/common/main/resources/img/doc-formats/blank.svg @@ -1,5 +1,5 @@ - + - + \ No newline at end of file diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 1720a05f6d..2b751bb323 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -1029,7 +1029,7 @@ define([ '<% if (blank) { %> ', '
', '
', - '', + '
', '
', '
<%= scope.txtBlank %>
', '
', @@ -1040,7 +1040,7 @@ define([ '<% if (!_.isEmpty(item.image)) {%> ', ' style="background-image: url(<%= item.image %>);">', ' <%} else {' + - 'print(\">\")' + + 'print(\">
\")' + ' } %>', '', '
<%= Common.Utils.String.htmlEncode(item.title || item.name || "") %>
', diff --git a/apps/documenteditor/main/resources/img/blank.svg b/apps/documenteditor/main/resources/img/blank.svg index af4a89b896..46e6049d0e 100644 --- a/apps/documenteditor/main/resources/img/blank.svg +++ b/apps/documenteditor/main/resources/img/blank.svg @@ -1,5 +1,5 @@ - + - + diff --git a/apps/documenteditor/main/resources/img/file-template.svg b/apps/documenteditor/main/resources/img/file-template.svg index e54f5de97d..a0ea6ca5ff 100644 --- a/apps/documenteditor/main/resources/img/file-template.svg +++ b/apps/documenteditor/main/resources/img/file-template.svg @@ -1,5 +1,5 @@ - + @@ -11,5 +11,5 @@ - + \ No newline at end of file diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less index 001e8b625b..ab5fe627d8 100644 --- a/apps/documenteditor/main/resources/less/filemenu.less +++ b/apps/documenteditor/main/resources/less/filemenu.less @@ -160,6 +160,21 @@ width: 96px; height: 96px; cursor: pointer; + + .svg-format-blank { + background: ~"url(resources/img/blank.svg) no-repeat center" ; + } + .svg-file-template{ + background: ~"url(resources/img/file-template.svg) no-repeat center" ; + } + + div { + display: block; + height: 100%; + width: 100%; + } + + } #panel-settings, diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index 2ca373097f..eea3db6690 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -802,7 +802,7 @@ define([ '<% if (blank) { %> ', '
', '
', - '', + '
', '
', '
<%= scope.txtBlank %>
', '
', @@ -813,7 +813,7 @@ define([ '<% if (!_.isEmpty(item.image)) {%> ', ' style="background-image: url(<%= item.image %>);">', ' <%} else {' + - 'print(\">\")' + + 'print(\">
\")' + ' } %>', '', '
<%= Common.Utils.String.htmlEncode(item.title || item.name || "") %>
', diff --git a/apps/presentationeditor/main/resources/img/file-template.svg b/apps/presentationeditor/main/resources/img/file-template.svg index 340012eb0c..94c499c0f4 100644 --- a/apps/presentationeditor/main/resources/img/file-template.svg +++ b/apps/presentationeditor/main/resources/img/file-template.svg @@ -1,5 +1,5 @@ - + @@ -11,5 +11,5 @@ - + \ No newline at end of file diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less index 4b269723ef..5f698d9d60 100644 --- a/apps/presentationeditor/main/resources/less/leftmenu.less +++ b/apps/presentationeditor/main/resources/less/leftmenu.less @@ -87,6 +87,19 @@ width: 96px; height: 96px; cursor: pointer; + + .svg-format-blank { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/blank.svg) no-repeat center" ; + } + .svg-file-template{ + background: ~"url(resources/img/file-template.svg) no-repeat center" ; + } + + div { + display: block; + height: 100%; + width: 100%; + } } #file-menu-panel { diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 1a5f7c6149..93246361c4 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -1199,7 +1199,7 @@ define([ '<% if (blank) { %> ', '
', '
', - '', + '
', '
', '
<%= scope.txtBlank %>
', '
', @@ -1210,7 +1210,7 @@ define([ '<% if (!_.isEmpty(item.image)) {%> ', ' style="background-image: url(<%= item.image %>);">', ' <%} else {' + - 'print(\">\")' + + 'print(\">
\")' + ' } %>', '', '
<%= Common.Utils.String.htmlEncode(item.title || item.name || "") %>
', diff --git a/apps/spreadsheeteditor/main/resources/img/file-template.svg b/apps/spreadsheeteditor/main/resources/img/file-template.svg index 325f0a78f6..a955517322 100644 --- a/apps/spreadsheeteditor/main/resources/img/file-template.svg +++ b/apps/spreadsheeteditor/main/resources/img/file-template.svg @@ -1,5 +1,5 @@ - + @@ -23,5 +23,5 @@ - + \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index f79168bfa0..f15e893484 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -81,6 +81,19 @@ width: 96px; height: 96px; cursor: pointer; + + .svg-format-blank { + background: ~"url(../../../apps/common/main/resources/img/doc-formats/blank.svg) no-repeat center" ; + } + .svg-file-template{ + background: ~"url(resources/img/file-template.svg) no-repeat center" ; + } + + div { + display: block; + height: 100%; + width: 100%; + } } #file-menu-panel { From a2adc37a34cf2075512901957d90cebecf194a56 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Thu, 31 Mar 2022 17:27:57 +0300 Subject: [PATCH 4/5] file-recent by url --- apps/documenteditor/main/app/view/FileMenuPanels.js | 6 +++--- apps/documenteditor/main/resources/img/recent-file.svg | 4 ++-- apps/documenteditor/main/resources/less/filemenu.less | 6 +++++- apps/presentationeditor/main/app/view/FileMenuPanels.js | 6 +++--- apps/presentationeditor/main/resources/img/recent-file.svg | 4 ++-- apps/presentationeditor/main/resources/less/leftmenu.less | 5 ++++- apps/spreadsheeteditor/main/app/view/FileMenuPanels.js | 6 +++--- apps/spreadsheeteditor/main/resources/img/recent-file.svg | 4 ++-- apps/spreadsheeteditor/main/resources/less/leftmenu.less | 5 ++++- 9 files changed, 28 insertions(+), 18 deletions(-) diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 2b751bb323..68cc032854 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -978,9 +978,9 @@ define([ itemTemplate: _.template([ '
', '
', - '', - '', - '', + '
', + '
', + '
', '
', '
<% if (typeof title !== "undefined") {%><%= Common.Utils.String.htmlEncode(title || "") %><% } %>
', '
<% if (typeof folder !== "undefined") {%><%= Common.Utils.String.htmlEncode(folder || "") %><% } %>
', diff --git a/apps/documenteditor/main/resources/img/recent-file.svg b/apps/documenteditor/main/resources/img/recent-file.svg index d4743ea767..c5f03d5730 100644 --- a/apps/documenteditor/main/resources/img/recent-file.svg +++ b/apps/documenteditor/main/resources/img/recent-file.svg @@ -1,9 +1,9 @@ - + - + diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less index ab5fe627d8..260a36e477 100644 --- a/apps/documenteditor/main/resources/less/filemenu.less +++ b/apps/documenteditor/main/resources/less/filemenu.less @@ -334,12 +334,16 @@ .recent-icon { float: left; + display: inline-block; width: 25px; height: 25px; margin-top: 1px; - svg { + div { width: 100%; height: 100%; + .svg-file-recent { + background: ~"url(resources/img/recent-file.svg) no-repeat top"; + } } } diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index eea3db6690..3d16cf444a 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -751,9 +751,9 @@ define([ itemTemplate: _.template([ '
', '
', - '', - '', - '', + '
', + '
', + '
', '
', '
<% if (typeof title !== "undefined") {%><%= Common.Utils.String.htmlEncode(title || "") %><% } %>
', '
<% if (typeof folder !== "undefined") {%><%= Common.Utils.String.htmlEncode(folder || "") %><% } %>
', diff --git a/apps/presentationeditor/main/resources/img/recent-file.svg b/apps/presentationeditor/main/resources/img/recent-file.svg index 83be8a6b61..0bbc55cc77 100644 --- a/apps/presentationeditor/main/resources/img/recent-file.svg +++ b/apps/presentationeditor/main/resources/img/recent-file.svg @@ -1,7 +1,7 @@ - + - + diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less index 5f698d9d60..c17b701a18 100644 --- a/apps/presentationeditor/main/resources/less/leftmenu.less +++ b/apps/presentationeditor/main/resources/less/leftmenu.less @@ -357,9 +357,12 @@ width: 25px; height: 25px; margin-top: 1px; - svg { + div { width: 100%; height: 100%; + .svg-file-recent { + background: ~"url(resources/img/recent-file.svg) no-repeat top"; + } } } diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 93246361c4..bcd3dfa851 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -1148,9 +1148,9 @@ define([ itemTemplate: _.template([ '
', '
', - '', - '', - '', + '
', + '
', + '
', '
', '
<% if (typeof title !== "undefined") {%><%= Common.Utils.String.htmlEncode(title || "") %><% } %>
', '
<% if (typeof folder !== "undefined") {%><%= Common.Utils.String.htmlEncode(folder || "") %><% } %>
', diff --git a/apps/spreadsheeteditor/main/resources/img/recent-file.svg b/apps/spreadsheeteditor/main/resources/img/recent-file.svg index cdf3228e78..80e7954caa 100644 --- a/apps/spreadsheeteditor/main/resources/img/recent-file.svg +++ b/apps/spreadsheeteditor/main/resources/img/recent-file.svg @@ -1,7 +1,7 @@ - + - + diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index f15e893484..33c621b7e2 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -421,9 +421,12 @@ width: 25px; height: 25px; margin-top: 1px; - svg { + div { width: 100%; height: 100%; + .svg-file-recent { + background: ~"url(resources/img/recent-file.svg) no-repeat top"; + } } } From f85c11b4aaa3881eebcc3974e4c7c881eef5edb7 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 31 Mar 2022 23:54:28 +0300 Subject: [PATCH 5/5] [all] skip inlined svg --- apps/documenteditor/main/index.html | 21 ------------------- apps/documenteditor/main/index.html.deploy | 20 ------------------ apps/documenteditor/main/index_loader.html | 20 ------------------ .../main/index_loader.html.deploy | 20 ------------------ apps/presentationeditor/main/index.html | 13 ------------ .../presentationeditor/main/index.html.deploy | 13 ------------ .../presentationeditor/main/index_loader.html | 13 ------------ .../main/index_loader.html.deploy | 13 ------------ apps/spreadsheeteditor/main/index.html | 11 ---------- apps/spreadsheeteditor/main/index.html.deploy | 11 ---------- apps/spreadsheeteditor/main/index_loader.html | 11 ---------- .../main/index_loader.html.deploy | 11 ---------- 12 files changed, 177 deletions(-) diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index cadf758c87..42963309bf 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -317,29 +317,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/apps/documenteditor/main/index_loader.html b/apps/documenteditor/main/index_loader.html index 58261a6de5..289055c84a 100644 --- a/apps/documenteditor/main/index_loader.html +++ b/apps/documenteditor/main/index_loader.html @@ -271,26 +271,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html index d97ecfad9d..0ec95cdfed 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -331,21 +331,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/apps/presentationeditor/main/index_loader.html b/apps/presentationeditor/main/index_loader.html index 10f46bc1e2..2b93f6274a 100644 --- a/apps/presentationeditor/main/index_loader.html +++ b/apps/presentationeditor/main/index_loader.html @@ -259,21 +259,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html index 15e5334a70..c68bc5eae5 100644 --- a/apps/spreadsheeteditor/main/index.html +++ b/apps/spreadsheeteditor/main/index.html @@ -353,19 +353,8 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/apps/spreadsheeteditor/main/index_loader.html b/apps/spreadsheeteditor/main/index_loader.html index c38785e84d..3a67706497 100644 --- a/apps/spreadsheeteditor/main/index_loader.html +++ b/apps/spreadsheeteditor/main/index_loader.html @@ -260,19 +260,8 @@ - - - - - - - - - - - - - - - - - - - - - -