diff --git a/apps/common/mobile/resources/less/icons.less b/apps/common/mobile/resources/less/icons.less index ac7a718c2..076f36865 100644 --- a/apps/common/mobile/resources/less/icons.less +++ b/apps/common/mobile/resources/less/icons.less @@ -30,4 +30,17 @@ i.icon { height: 24px; .encoded-svg-background(''); } + + // Formats + + &.icon-format-pdf { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } + &.icon-format-pdfa { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } } diff --git a/apps/documenteditor/mobile/src/less/app.less b/apps/documenteditor/mobile/src/less/app.less index a4c192194..82a687446 100644 --- a/apps/documenteditor/mobile/src/less/app.less +++ b/apps/documenteditor/mobile/src/less/app.less @@ -37,6 +37,7 @@ @import './app-ios.less'; @import './icons-ios.less'; @import './icons-material.less'; +@import './icons-common.less'; :root { --f7-popover-width: 360px; diff --git a/apps/documenteditor/mobile/src/less/icons-common.less b/apps/documenteditor/mobile/src/less/icons-common.less new file mode 100644 index 000000000..6d834af08 --- /dev/null +++ b/apps/documenteditor/mobile/src/less/icons-common.less @@ -0,0 +1,57 @@ +// Formats + +i.icon { + &.icon-format-docx { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } + + &.icon-format-docxf { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } + + &.icon-format-oform { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } + + &.icon-format-txt { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } + + &.icon-format-rtf { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } + + &.icon-format-odt { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } + + &.icon-format-html { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } + + &.icon-format-dotx { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } + + &.icon-format-ott { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } +} \ No newline at end of file diff --git a/apps/documenteditor/mobile/src/less/icons-ios.less b/apps/documenteditor/mobile/src/less/icons-ios.less index 99205059b..006bd1d93 100644 --- a/apps/documenteditor/mobile/src/less/icons-ios.less +++ b/apps/documenteditor/mobile/src/less/icons-ios.less @@ -82,64 +82,8 @@ .encoded-svg-mask(''); } - // Download - - &.icon-format-docx { - width: 30px; - height: 30px; - .encoded-svg-mask('') - } - - &.icon-format-pdf { - width: 30px; - height: 30px; - .encoded-svg-mask('') - } - - &.icon-format-pdfa { - width: 30px; - height: 30px; - .encoded-svg-mask('') - } - - &.icon-format-txt { - width: 24px; - height: 24px; - .encoded-svg-mask('') - } - - &.icon-format-rtf { - width: 24px; - height: 24px; - .encoded-svg-mask('') - } - - &.icon-format-odt { - width: 30px; - height: 30px; - .encoded-svg-mask('') - } - - &.icon-format-html { - width: 30px; - height: 30px; - .encoded-svg-mask('') - } - - &.icon-format-dotx { - width: 30px; - height: 30px; - .encoded-svg-mask('') - } - - &.icon-format-ott { - width: 30px; - height: 30px; - .encoded-svg-mask('') - } - - - //Edit + // Edit + &.icon-text-additional { width: 22px; height: 22px; diff --git a/apps/documenteditor/mobile/src/less/icons-material.less b/apps/documenteditor/mobile/src/less/icons-material.less index bc3b9c640..2eb429078 100644 --- a/apps/documenteditor/mobile/src/less/icons-material.less +++ b/apps/documenteditor/mobile/src/less/icons-material.less @@ -137,64 +137,7 @@ .encoded-svg-mask(''); } - // Download - - &.icon-format-docx { - width: 30px; - height: 30px; - .encoded-svg-mask('') - } - - &.icon-format-pdf { - width: 30px; - height: 30px; - .encoded-svg-mask('') - } - - &.icon-format-pdfa { - width: 30px; - height: 30px; - .encoded-svg-mask('') - } - - &.icon-format-txt { - width: 24px; - height: 24px; - .encoded-svg-mask('') - } - - &.icon-format-rtf { - width: 24px; - height: 24px; - .encoded-svg-mask('') - } - - &.icon-format-odt { - width: 30px; - height: 30px; - .encoded-svg-mask('') - } - - &.icon-format-html { - width: 30px; - height: 30px; - .encoded-svg-mask('') - } - - &.icon-format-dotx { - width: 30px; - height: 30px; - .encoded-svg-mask('') - } - - &.icon-format-ott { - width: 30px; - height: 30px; - .encoded-svg-mask('') - } - - - //Edit + // Edit &.icon-text-align-left { width: 22px; diff --git a/apps/documenteditor/mobile/src/view/settings/Download.jsx b/apps/documenteditor/mobile/src/view/settings/Download.jsx index 82d2ded93..4e822fd2e 100644 --- a/apps/documenteditor/mobile/src/view/settings/Download.jsx +++ b/apps/documenteditor/mobile/src/view/settings/Download.jsx @@ -17,6 +17,15 @@ const Download = props => { props.onSaveFormat(Asc.c_oAscFileType.DOCX)}> + {dataDoc.fileType === 'docxf' || dataDoc.fileType === 'docx' ? [ + props.onSaveFormat(Asc.c_oAscFileType.DOCXF)}> + + , + props.onSaveFormat(Asc.c_oAscFileType.OFORM)}> + + + ] + : null} props.onSaveFormat(Asc.c_oAscFileType.PDF)}> diff --git a/apps/presentationeditor/mobile/src/less/app.less b/apps/presentationeditor/mobile/src/less/app.less index 37ace4a3c..960129624 100644 --- a/apps/presentationeditor/mobile/src/less/app.less +++ b/apps/presentationeditor/mobile/src/less/app.less @@ -36,6 +36,7 @@ @import './app-ios.less'; @import './icons-ios.less'; @import './icons-material.less'; +@import './icons-common.less'; :root { --f7-popover-width: 360px; diff --git a/apps/presentationeditor/mobile/src/less/icons-common.less b/apps/presentationeditor/mobile/src/less/icons-common.less new file mode 100644 index 000000000..65985f829 --- /dev/null +++ b/apps/presentationeditor/mobile/src/less/icons-common.less @@ -0,0 +1,25 @@ +i.icon { + &.icon-format-pptx { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } + + &.icon-format-potx { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } + + &.icon-format-odp { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } + + &.icon-format-otp { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } +} \ No newline at end of file diff --git a/apps/presentationeditor/mobile/src/less/icons-ios.less b/apps/presentationeditor/mobile/src/less/icons-ios.less index 3c7a619c5..b367b1e41 100644 --- a/apps/presentationeditor/mobile/src/less/icons-ios.less +++ b/apps/presentationeditor/mobile/src/less/icons-ios.less @@ -407,45 +407,8 @@ .encoded-svg-mask(''); } - // Formats + // Collaboration - &.icon-format-pdf { - width: 30px; - height: 30px; - .encoded-svg-mask(''); - } - - &.icon-format-pdfa { - width: 30px; - height: 30px; - .encoded-svg-mask(''); - } - - &.icon-format-pptx { - width: 30px; - height: 30px; - .encoded-svg-mask(''); - } - - &.icon-format-potx { - width: 30px; - height: 30px; - .encoded-svg-mask(''); - } - - &.icon-format-odp { - width: 30px; - height: 30px; - .encoded-svg-mask(''); - } - - &.icon-format-otp { - width: 30px; - height: 30px; - .encoded-svg-mask('') - } - - // Collaboration &.icon-users { width: 24px; height: 24px; diff --git a/apps/presentationeditor/mobile/src/less/icons-material.less b/apps/presentationeditor/mobile/src/less/icons-material.less index 23488b3a3..f99c73331 100644 --- a/apps/presentationeditor/mobile/src/less/icons-material.less +++ b/apps/presentationeditor/mobile/src/less/icons-material.less @@ -377,46 +377,8 @@ .encoded-svg-mask(''); } - // Formats - - &.icon-format-pdf { - width: 30px; - height: 30px; - .encoded-svg-mask(''); - } - - &.icon-format-pdfa { - width: 30px; - height: 30px; - .encoded-svg-mask(''); - } - - &.icon-format-pptx { - width: 30px; - height: 30px; - // xml:space="preserve" - .encoded-svg-mask(''); - } - - &.icon-format-potx { - width: 30px; - height: 30px; - .encoded-svg-mask(''); - } - - &.icon-format-odp { - width: 30px; - height: 30px; - .encoded-svg-mask(''); - } - - &.icon-format-otp { - width: 30px; - height: 30px; - .encoded-svg-mask('') - } - // Collaboration + &.icon-users { width: 24px; height: 24px; diff --git a/apps/spreadsheeteditor/mobile/src/less/icons-common.less b/apps/spreadsheeteditor/mobile/src/less/icons-common.less index a1992c022..392f464ef 100644 --- a/apps/spreadsheeteditor/mobile/src/less/icons-common.less +++ b/apps/spreadsheeteditor/mobile/src/less/icons-common.less @@ -77,3 +77,33 @@ background-image: url('@{app-image-path}/charts/chart-20.png'); } } + +// Formats + +i.icon { + &.icon-format-xlsx { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } + &.icon-format-xltx { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } + &.icon-format-ods { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } + &.icon-format-ots { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } + &.icon-format-csv { + width: 22px; + height: 22px; + .encoded-svg-background(''); + } +} diff --git a/apps/spreadsheeteditor/mobile/src/less/icons-ios.less b/apps/spreadsheeteditor/mobile/src/less/icons-ios.less index 142989494..47acba9e6 100644 --- a/apps/spreadsheeteditor/mobile/src/less/icons-ios.less +++ b/apps/spreadsheeteditor/mobile/src/less/icons-ios.less @@ -302,44 +302,8 @@ .encoded-svg-mask(''); } - // Formats - - &.icon-format-pdf { - width: 30px; - height: 30px; - .encoded-svg-mask(''); - } - &.icon-format-pdfa { - width: 30px; - height: 30px; - .encoded-svg-mask(''); - } - &.icon-format-xlsx { - width: 30px; - height: 30px; - .encoded-svg-mask(''); - } - &.icon-format-xltx { - width: 30px; - height: 30px; - .encoded-svg-mask(''); - } - &.icon-format-ods { - width: 30px; - height: 30px; - .encoded-svg-mask(''); - } - &.icon-format-ots { - width: 30px; - height: 30px; - .encoded-svg-mask(''); - } - &.icon-format-csv { - width: 24px; - height: 24px; - .encoded-svg-mask(''); - } // Collaboration + &.icon-users { width: 24px; height: 24px; diff --git a/apps/spreadsheeteditor/mobile/src/less/icons-material.less b/apps/spreadsheeteditor/mobile/src/less/icons-material.less index 70a6e5c9d..4e393b6e2 100644 --- a/apps/spreadsheeteditor/mobile/src/less/icons-material.less +++ b/apps/spreadsheeteditor/mobile/src/less/icons-material.less @@ -286,44 +286,8 @@ .encoded-svg-mask(''); } - // Formats - - &.icon-format-pdf { - width: 30px; - height: 30px; - .encoded-svg-mask(''); - } - &.icon-format-pdfa { - width: 30px; - height: 30px; - .encoded-svg-mask(''); - } - &.icon-format-xlsx { - width: 30px; - height: 30px; - .encoded-svg-mask(''); - } - &.icon-format-xltx { - width: 30px; - height: 30px; - .encoded-svg-mask(''); - } - &.icon-format-ods { - width: 30px; - height: 30px; - .encoded-svg-mask(''); - } - &.icon-format-ots { - width: 30px; - height: 30px; - .encoded-svg-mask(''); - } - &.icon-format-csv { - width: 24px; - height: 24px; - .encoded-svg-mask(''); - } // Collaboration + &.icon-users { width: 24px; height: 24px;