diff --git a/apps/common/main/lib/controller/Desktop.js b/apps/common/main/lib/controller/Desktop.js index 90342f3f20..d16dc98955 100644 --- a/apps/common/main/lib/controller/Desktop.js +++ b/apps/common/main/lib/controller/Desktop.js @@ -754,8 +754,9 @@ define([ FILE_SPREADSHEET_XLSM: FILE_SPREADSHEET + 0x0005, FILE_SPREADSHEET_XLTX: FILE_SPREADSHEET + 0x0006, FILE_SPREADSHEET_XLTM: FILE_SPREADSHEET + 0x0007, - FILE_SPREADSHEET_ODS_FLAT: FILE_SPREADSHEET + 0x0008, - FILE_SPREADSHEET_OTS: FILE_SPREADSHEET + 0x0009, + FILE_SPREADSHEET_XLSB: FILE_SPREADSHEET + 0x0008, + FILE_SPREADSHEET_ODS_FLAT: FILE_SPREADSHEET + 0x0009, + FILE_SPREADSHEET_OTS: FILE_SPREADSHEET + 0x000a, FILE_CROSSPLATFORM: FILE_CROSSPLATFORM, FILE_CROSSPLATFORM_PDF: FILE_CROSSPLATFORM + 0x0001, @@ -784,6 +785,7 @@ define([ case utils.defines.FileFormat.FILE_SPREADSHEET_XLS: return 'xls'; case utils.defines.FileFormat.FILE_SPREADSHEET_XLTX: return 'xltx'; case utils.defines.FileFormat.FILE_SPREADSHEET_XLSX: return 'xlsx'; + case utils.defines.FileFormat.FILE_SPREADSHEET_XLSB: return 'xlsb'; case utils.defines.FileFormat.FILE_SPREADSHEET_ODS: return 'ods'; case utils.defines.FileFormat.FILE_SPREADSHEET_CSV: return 'csv'; case utils.defines.FileFormat.FILE_SPREADSHEET_OTS: return 'ots'; diff --git a/apps/common/main/resources/img/doc-formats/formats.png b/apps/common/main/resources/img/doc-formats/formats.png index c6e450c10f..2bd88312fe 100644 Binary files a/apps/common/main/resources/img/doc-formats/formats.png and b/apps/common/main/resources/img/doc-formats/formats.png differ diff --git a/apps/common/main/resources/img/doc-formats/formats@1.25x.png b/apps/common/main/resources/img/doc-formats/formats@1.25x.png index 60a29013ae..be137768bd 100644 Binary files a/apps/common/main/resources/img/doc-formats/formats@1.25x.png and b/apps/common/main/resources/img/doc-formats/formats@1.25x.png differ diff --git a/apps/common/main/resources/img/doc-formats/formats@1.5x.png b/apps/common/main/resources/img/doc-formats/formats@1.5x.png index 352cb5eb03..27e2f68fec 100644 Binary files a/apps/common/main/resources/img/doc-formats/formats@1.5x.png and b/apps/common/main/resources/img/doc-formats/formats@1.5x.png differ diff --git a/apps/common/main/resources/img/doc-formats/formats@1.75x.png b/apps/common/main/resources/img/doc-formats/formats@1.75x.png index 9bb4bfabe3..167cea3748 100644 Binary files a/apps/common/main/resources/img/doc-formats/formats@1.75x.png and b/apps/common/main/resources/img/doc-formats/formats@1.75x.png differ diff --git a/apps/common/main/resources/img/doc-formats/formats@2x.png b/apps/common/main/resources/img/doc-formats/formats@2x.png index 91182920f2..26bd78d162 100644 Binary files a/apps/common/main/resources/img/doc-formats/formats@2x.png and b/apps/common/main/resources/img/doc-formats/formats@2x.png differ diff --git a/apps/common/main/resources/img/doc-formats/xlsb.svg b/apps/common/main/resources/img/doc-formats/xlsb.svg new file mode 100644 index 0000000000..b5df279228 --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/xlsb.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less index 2d1575dcc3..4b3b3e3416 100644 --- a/apps/documenteditor/main/resources/less/filemenu.less +++ b/apps/documenteditor/main/resources/less/filemenu.less @@ -432,7 +432,7 @@ height: 100%; div{ background: ~"url(@{common-image-const-path}/doc-formats/formats.png)"; - background-size: 744px 30px; + background-size: 768px 30px; &:not(.svg-file-recent) { .pixel-ratio__1_25 & { background-image: ~"url(@{common-image-const-path}/doc-formats/formats@1.25x.png)"; @@ -451,57 +451,60 @@ } } } + .format-from-index(@index) { + background-position: -24px*@index 0; + } .img-format- { &docx { - background-position: 0px 0px; + .format-from-index(0); } &pdf { - background-position: 408px 0px; + .format-from-index(14); } &odt { - background-position: 696px 0px; + .format-from-index(2); } &txt { - background-position: 648px 0px; + .format-from-index(4); } &dotx { - background-position: 240px 0px; + .format-from-index(21); } &pdfa { - background-position: 408px 0px; + .format-from-index(14); } &ott { - background-position: 168px 0px; + .format-from-index(24); } &rtf { - background-position: 672px 0px; + .format-from-index(3); } &doc { - background-position: 720px 0px; + .format-from-index(1); } &docxf { - background-position: 48px 0px; + .format-from-index(29); } &oform { - background-position: 24px 0px; + .format-from-index(30); } &html, &htm { - background-position: 624px 0px; + .format-from-index(5); } &fb2 { - background-position: 264px 0px; + .format-from-index(20); } &epub { - background-position: 288px 0px; + .format-from-index(19); } &xps { - background-position: 360px 0px; + .format-from-index(16); } &djvu { - background-position: 384px 0px; + .format-from-index(15); } &mht { - background-position: 312px 0px; + .format-from-index(18); } } .svg-file-recent { diff --git a/apps/pdfeditor/main/resources/less/filemenu.less b/apps/pdfeditor/main/resources/less/filemenu.less index 400926eb29..ab8910cd8d 100644 --- a/apps/pdfeditor/main/resources/less/filemenu.less +++ b/apps/pdfeditor/main/resources/less/filemenu.less @@ -449,7 +449,7 @@ height: 100%; div{ background: ~"url(@{common-image-const-path}/doc-formats/formats.png)"; - background-size: 744px 30px; + background-size: 768px 30px; &:not(.svg-file-recent) { .pixel-ratio__1_25 & { background-image: ~"url(@{common-image-const-path}/doc-formats/formats@1.25x.png)"; @@ -468,15 +468,18 @@ } } } + .format-from-index(@index) { + background-position: -24px*@index 0; + } .img-format- { &pdf, &pdfa { - background-position: 408px 0px; + .format-from-index(14); } &xps { - background-position: 360px 0px; + .format-from-index(16); } &djvu { - background-position: 384px 0px; + .format-from-index(15); } } .svg-file-recent { diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less index e81e73bdfa..26be460929 100644 --- a/apps/presentationeditor/main/resources/less/leftmenu.less +++ b/apps/presentationeditor/main/resources/less/leftmenu.less @@ -422,7 +422,7 @@ height: 100%; div{ background: ~"url(@{common-image-const-path}/doc-formats/formats.png)"; - background-size: 744px 30px; + background-size: 768px 30px; &:not(.svg-file-recent) { .pixel-ratio__1_25 & { background-image: ~"url(@{common-image-const-path}/doc-formats/formats@1.25x.png)"; @@ -441,33 +441,36 @@ } } } + .format-from-index(@index) { + background-position: -24px*@index 0; + } .img-format- { &pptx { - background-position: 504px 0px; + .format-from-index(10); } &pdf, &pdfa { - background-position: 408px 0px; + .format-from-index(14); } &odp { - background-position: 456px 0px; + .format-from-index(12); } &potx { - background-position: 192px 0px; + .format-from-index(23); } &otp { - background-position: 120px 0px; + .format-from-index(26); } &ppsx { - background-position: 72px 0px; + .format-from-index(28); } &ppt { - background-position: 480px 0px; + .format-from-index(11); } } .svg-file-recent { diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index f080e4ac87..84b28ac27a 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -514,7 +514,7 @@ height: 100%; div{ background: ~"url(@{common-image-const-path}/doc-formats/formats.png)"; - background-size: 744px 30px; + background-size: 768px 30px; &:not(.svg-file-recent) { .pixel-ratio__1_25 & { background-image: ~"url(@{common-image-const-path}/doc-formats/formats@1.25x.png)"; @@ -533,30 +533,36 @@ } } } + .format-from-index(@index) { + background-position: -24px*@index 0; + } .img-format- { &xlsx { - background-position: 600px 0px; + .format-from-index(6); } &pdf, &pdfa { - background-position: 408px 0px; + .format-from-index(14); } &ods { - background-position: 552px 0px; + .format-from-index(8); } &csv { - background-position: 528px 0px; + .format-from-index(9); } &xltx { - background-position: 216px 0px; + .format-from-index(22); } &ots { - background-position: 144px 0px; + .format-from-index(25); } &xls { - background-position: 576px 0px; + .format-from-index(7); } &xps { - background-position: 360px 0px; + .format-from-index(16); + } + &xlsb { + .format-from-index(31); } } .svg-file-recent {