diff --git a/apps/common/main/resources/img/doc-formats/blank.svg b/apps/common/main/resources/img/doc-formats/blank.svg new file mode 100644 index 000000000..dd8b5c54c --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/blank.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/common/main/resources/img/doc-formats/csv.svg b/apps/common/main/resources/img/doc-formats/csv.svg new file mode 100644 index 000000000..028d64748 --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/csv.svg @@ -0,0 +1 @@ +CSV \ No newline at end of file diff --git a/apps/common/main/resources/img/doc-formats/docx.svg b/apps/common/main/resources/img/doc-formats/docx.svg new file mode 100644 index 000000000..0dd73dd24 --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/docx.svg @@ -0,0 +1 @@ +DOCX \ No newline at end of file diff --git a/apps/common/main/resources/img/doc-formats/epub.svg b/apps/common/main/resources/img/doc-formats/epub.svg new file mode 100644 index 000000000..5a1e5fa2e --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/epub.svg @@ -0,0 +1 @@ +EPUB \ No newline at end of file diff --git a/apps/common/main/resources/img/doc-formats/html.svg b/apps/common/main/resources/img/doc-formats/html.svg new file mode 100644 index 000000000..baff21feb --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/html.svg @@ -0,0 +1 @@ +HTML \ No newline at end of file diff --git a/apps/common/main/resources/img/doc-formats/odp.svg b/apps/common/main/resources/img/doc-formats/odp.svg new file mode 100644 index 000000000..03c009089 --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/odp.svg @@ -0,0 +1 @@ +ODP \ No newline at end of file diff --git a/apps/common/main/resources/img/doc-formats/ods.svg b/apps/common/main/resources/img/doc-formats/ods.svg new file mode 100644 index 000000000..f22a21537 --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/ods.svg @@ -0,0 +1 @@ +ODS \ No newline at end of file diff --git a/apps/common/main/resources/img/doc-formats/odt.svg b/apps/common/main/resources/img/doc-formats/odt.svg new file mode 100644 index 000000000..4495dfebd --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/odt.svg @@ -0,0 +1 @@ +ODT \ No newline at end of file diff --git a/apps/common/main/resources/img/doc-formats/pdf.svg b/apps/common/main/resources/img/doc-formats/pdf.svg new file mode 100644 index 000000000..b2d3e9ae5 --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/pdf.svg @@ -0,0 +1 @@ +PDF \ No newline at end of file diff --git a/apps/common/main/resources/img/doc-formats/pptx.svg b/apps/common/main/resources/img/doc-formats/pptx.svg new file mode 100644 index 000000000..15f4f6f77 --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/pptx.svg @@ -0,0 +1 @@ +PPTX \ No newline at end of file diff --git a/apps/common/main/resources/img/doc-formats/rtf.svg b/apps/common/main/resources/img/doc-formats/rtf.svg new file mode 100644 index 000000000..cd8665cbe --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/rtf.svg @@ -0,0 +1 @@ +RTF \ No newline at end of file diff --git a/apps/common/main/resources/img/doc-formats/txt.svg b/apps/common/main/resources/img/doc-formats/txt.svg new file mode 100644 index 000000000..616c8a96d --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/txt.svg @@ -0,0 +1 @@ +TXT \ No newline at end of file diff --git a/apps/common/main/resources/img/doc-formats/xlsx.svg b/apps/common/main/resources/img/doc-formats/xlsx.svg new file mode 100644 index 000000000..45558c4eb --- /dev/null +++ b/apps/common/main/resources/img/doc-formats/xlsx.svg @@ -0,0 +1 @@ +XLSX \ 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 7da717107..d6f6df2b1 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -69,7 +69,9 @@ define([ '<% _.each(rows, function(row) { %>', '', '<% _.each(row, function(item) { %>', - '', + '
', + '', + '
', '<% }) %>', '', '<% }) %>', @@ -530,7 +532,11 @@ define([ template: _.template([ '

<%= scope.fromBlankText %>


', '
', - '
', + '
', + '', + '', + '', + '
', '
', '

<%= scope.newDocumentText %>

', '<%= scope.newDescriptionText %>', @@ -540,7 +546,13 @@ define([ '
', '<% _.each(docs, function(item) { %>', '
', - '
style="background-image: url(<%= item.icon %>);" <% } %> />', + '
\")' + + ' } else { ' + + 'print(\">\")' + + ' } %>', + '
', '
<%= item.name %>
', '
', '<% }) %>', diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index 81bbd980d..ffaf58340 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -262,6 +262,13 @@ + + + + + + + + + + + + + +
diff --git a/apps/documenteditor/main/resources/img/docformat.png b/apps/documenteditor/main/resources/img/docformat.png deleted file mode 100644 index e8a3f98bd..000000000 Binary files a/apps/documenteditor/main/resources/img/docformat.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/img/docformat@2x.png b/apps/documenteditor/main/resources/img/docformat@2x.png deleted file mode 100644 index 6b638d576..000000000 Binary files a/apps/documenteditor/main/resources/img/docformat@2x.png and /dev/null differ diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less index a37fdee1a..d160d1bfb 100644 --- a/apps/documenteditor/main/resources/less/filemenu.less +++ b/apps/documenteditor/main/resources/less/filemenu.less @@ -98,32 +98,15 @@ } } -.img-doc-format { - .background-ximage('@{app-image-path}/docformat.png', '@{app-image-path}/docformat@2x.png', 1020px); -} - .btn-doc-format { display: block; width: 98px; height: 125px; cursor: pointer; - .icon-document-format(@shift-x, @shift-y: 0) { - background-position: @shift-x @shift-y; - - &:hover { - background-position: @shift-x+102 @shift-y; - } + svg&:hover { + opacity:0.85; } - - &.docx {.icon-document-format(-306px);} - &.doc {.icon-document-format(-102px);} - &.odt {.icon-document-format(-102px,-128px);} - &.rtf {.icon-document-format(-510px,-128px);} - &.txt {.icon-document-format(-714px,-128px);} - &.html {.icon-document-format(-714px);} - &.epub {.icon-document-format(-510px);} - &.pdf {.icon-document-format(-306px,-128px);} } #panel-settings { @@ -190,15 +173,10 @@ .blank-document-btn { display: inline-block; margin: 25px 20px 65px; - background-position: -816px 0; width: 102px; height: 128px; cursor: pointer; - - &:hover { - background-position: -918px 0; - } } hr { @@ -218,9 +196,6 @@ .thumb { width: 102px; height: 128px; - // .background-ximage('@{app-image-path}/docformat.png', '@{app-image-path}/docformat@2x.png', 1020px); - // background-repeat: no-repeat; - // background-position: -816px -129px; } .title { diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index a9472caf9..b10be3f6b 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -64,7 +64,9 @@ define([ '<% _.each(rows, function(row) { %>', '', '<% _.each(row, function(item) { %>', - '', + '
', + '', + '
', '<% }) %>', '', '<% }) %>', @@ -436,7 +438,11 @@ define([ template: _.template([ '

<%= scope.fromBlankText %>


', '
', - '
', + '
', + '', + '', + '', + '
', '
', '

<%= scope.newDocumentText %>

', '<%= scope.newDescriptionText %>', @@ -446,7 +452,13 @@ define([ '
', '<% _.each(docs, function(item) { %>', '
', - '
style="background-image: url(<%= item.icon %>);" <% } %> />', + '
\")' + + ' } else { ' + + 'print(\">\")' + + ' } %>', + '
', '
<%= item.name %>
', '
', '<% }) %>', diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html index ec74ec7ae..a75f2173c 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -261,6 +261,10 @@ + + + + + + + +
diff --git a/apps/presentationeditor/main/resources/img/docformat.png b/apps/presentationeditor/main/resources/img/docformat.png deleted file mode 100644 index 77528805a..000000000 Binary files a/apps/presentationeditor/main/resources/img/docformat.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/img/docformat@2x.png b/apps/presentationeditor/main/resources/img/docformat@2x.png deleted file mode 100644 index 5cab80522..000000000 Binary files a/apps/presentationeditor/main/resources/img/docformat@2x.png and /dev/null differ diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less index a269387b9..f85a5a7fd 100644 --- a/apps/presentationeditor/main/resources/less/leftmenu.less +++ b/apps/presentationeditor/main/resources/less/leftmenu.less @@ -80,6 +80,17 @@ overflow: hidden; } +.btn-doc-format { + display: block; + width: 98px; + height: 125px; + cursor: pointer; + + svg&:hover { + opacity:0.85; + } +} + #file-menu-panel { > div { height: 100%; @@ -181,27 +192,7 @@ margin-bottom: 65px; .btn-doc-format { - display: block; - width: 98px; - height: 125px; - cursor: pointer; margin: 65px 25px 0px; - - background-repeat: no-repeat; - background-position: 0 0; - .background-ximage('@{app-image-path}/docformat.png', '@{app-image-path}/docformat@2x.png', 918px); - - .icon-document-format(@shift-x, @shift-y: 0) { - background-position: @shift-x @shift-y; - - &:hover { - background-position: @shift-x+102 @shift-y; - } - } - - &.pptx {.icon-document-format(-102px);} - &.pdf {.icon-document-format(-306px);} - &.odp {.icon-document-format(-816px);} } } } @@ -267,17 +258,10 @@ .blank-document-btn { display: inline-block; margin: 25px 20px 65px; - .background-ximage('@{app-image-path}/docformat.png', '@{app-image-path}/docformat@2x.png', 714px); - background-repeat: no-repeat; - background-position: -408px 0; width: 102px; height: 128px; cursor: pointer; - - &:hover { - background-position: -510px 0; - } } hr { @@ -297,9 +281,6 @@ .thumb { width: 102px; height: 128px; - .background-ximage('@{app-image-path}/docformat.png', '@{app-image-path}/docformat@2x.png', 714px); - background-repeat: no-repeat; - background-position: -612px 0; } .title { diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index c90858193..c82e90430 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -58,7 +58,9 @@ define([ '<% _.each(rows, function(row) { %>', '', '<% _.each(row, function(item) { %>', - '', + '
', + '', + '
', '<% }) %>', '', '<% }) %>', @@ -896,7 +898,11 @@ define([ template: _.template([ '

<%= scope.fromBlankText %>


', '
', - '
', + '
', + '', + '', + '', + '
', '
', '

<%= scope.newDocumentText %>

', '<%= scope.newDescriptionText %>', @@ -906,7 +912,13 @@ define([ '
', '<% _.each(docs, function(item) { %>', '
', - '
style="background-image: url(<%= item.icon %>);" <% } %> />', + '
\")' + + ' } else { ' + + 'print(\">\")' + + ' } %>', + '
', '
<%= item.name %>
', '
', '<% }) %>', diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html index 868ad9ff1..98c20e95a 100644 --- a/apps/spreadsheeteditor/main/index.html +++ b/apps/spreadsheeteditor/main/index.html @@ -263,6 +263,11 @@ + + + + + + + + + +
diff --git a/apps/spreadsheeteditor/main/resources/img/docformat.png b/apps/spreadsheeteditor/main/resources/img/docformat.png deleted file mode 100644 index 1c176639b..000000000 Binary files a/apps/spreadsheeteditor/main/resources/img/docformat.png and /dev/null differ diff --git a/apps/spreadsheeteditor/main/resources/img/docformat@2x.png b/apps/spreadsheeteditor/main/resources/img/docformat@2x.png deleted file mode 100644 index 6afdf2836..000000000 Binary files a/apps/spreadsheeteditor/main/resources/img/docformat@2x.png and /dev/null differ diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index 59e7c6ba8..924c1e413 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -79,6 +79,17 @@ overflow: hidden; } +.btn-doc-format { + display: block; + width: 98px; + height: 125px; + cursor: pointer; + + svg&:hover { + opacity:0.85; + } +} + #file-menu-panel { > div { height: 100%; @@ -170,29 +181,7 @@ margin-bottom: 65px; .btn-doc-format { - display: block; - width: 98px; - height: 125px; - cursor: pointer; margin: 65px 25px 0px; - - background-repeat: no-repeat; - background-position: 0 0; - .background-ximage('@{app-image-path}/docformat.png', '@{app-image-path}/docformat@2x.png', 822px); - - .icon-document-format(@shift-x, @shift-y: 0) { - background-position: @shift-x @shift-y; - - &:hover { - background-position: @shift-x+102 @shift-y; - } - } - - &.xlsx {.icon-document-format(-102px);} - &.ods {.icon-document-format(-102px, -128px);} - &.csv {.icon-document-format(-306px, -128px);} - &.html {.icon-document-format(-306px);} - &.pdf {.icon-document-format(-714px);} } } } @@ -337,16 +326,9 @@ .blank-document-btn { display: inline-block; margin: 25px 20px 65px; - .background-ximage('@{app-image-path}/docformat.png', '@{app-image-path}/docformat@2x.png', 612px); - background-repeat: no-repeat; - background-position: -408px 0; width: 102px; height: 128px; cursor: pointer; - - &:hover { - background-position: -510px 0; - } } hr { @@ -366,9 +348,6 @@ .thumb { width: 102px; height: 128px; - .background-ximage('@{app-image-path}/docformat.png', '@{app-image-path}/docformat@2x.png', 612px); - background-repeat: no-repeat; - background-position: -408px -128px; } .title {