From 1c80bea9fd86536564543376f87555daf6f0db5d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 18 Jun 2020 14:43:26 +0300 Subject: [PATCH] Change new file panel --- .../main/resources/img/doc-formats/blank.svg | 21 +++++------- .../main/app/view/FileMenuPanels.js | 6 ++-- apps/documenteditor/main/index.html | 3 +- apps/documenteditor/main/index.html.deploy | 4 +-- apps/documenteditor/main/index_loader.html | 3 +- .../main/index_loader.html.deploy | 3 +- .../main/resources/img/blank.svg | 5 +++ .../main/resources/img/file-template.svg | 15 +++++++++ .../main/resources/less/filemenu.less | 19 ++++++++--- .../main/app/view/FileMenuPanels.js | 6 ++-- apps/presentationeditor/main/index.html | 1 + .../presentationeditor/main/index.html.deploy | 1 + .../presentationeditor/main/index_loader.html | 1 + .../main/index_loader.html.deploy | 1 + .../main/resources/img/file-template.svg | 21 ++++++++++++ .../main/resources/less/leftmenu.less | 21 +++++++++--- .../main/app/view/FileMenuPanels.js | 6 ++-- apps/spreadsheeteditor/main/index.html | 1 + apps/spreadsheeteditor/main/index.html.deploy | 1 + apps/spreadsheeteditor/main/index_loader.html | 1 + .../main/index_loader.html.deploy | 1 + .../main/resources/img/file-template.svg | 33 +++++++++++++++++++ .../main/resources/less/leftmenu.less | 21 +++++++++--- 23 files changed, 154 insertions(+), 41 deletions(-) create mode 100644 apps/documenteditor/main/resources/img/blank.svg create mode 100644 apps/documenteditor/main/resources/img/file-template.svg create mode 100644 apps/presentationeditor/main/resources/img/file-template.svg create mode 100644 apps/spreadsheeteditor/main/resources/img/file-template.svg diff --git a/apps/common/main/resources/img/doc-formats/blank.svg b/apps/common/main/resources/img/doc-formats/blank.svg index 4a0312675..de6c3a673 100644 --- a/apps/common/main/resources/img/doc-formats/blank.svg +++ b/apps/common/main/resources/img/doc-formats/blank.svg @@ -1,15 +1,10 @@ - + - - - - - - - - - - - + + + + + + - + \ 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 56a8f3bd8..ced874565 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -718,8 +718,8 @@ define([ '

<%= scope.fromBlankText %>


', '
', '
', - '', - '', + '', + '', '', '
', '
', @@ -735,7 +735,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/index.html b/apps/documenteditor/main/index.html index 527d03ec4..9ab7d1507 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -269,8 +269,9 @@ - + + diff --git a/apps/documenteditor/main/index_loader.html b/apps/documenteditor/main/index_loader.html index 8f6506ec0..1f8891dff 100644 --- a/apps/documenteditor/main/index_loader.html +++ b/apps/documenteditor/main/index_loader.html @@ -270,8 +270,9 @@ - + + diff --git a/apps/documenteditor/main/resources/img/blank.svg b/apps/documenteditor/main/resources/img/blank.svg new file mode 100644 index 000000000..af4a89b89 --- /dev/null +++ b/apps/documenteditor/main/resources/img/blank.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/apps/documenteditor/main/resources/img/file-template.svg b/apps/documenteditor/main/resources/img/file-template.svg new file mode 100644 index 000000000..e54f5de97 --- /dev/null +++ b/apps/documenteditor/main/resources/img/file-template.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ 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 1601c15e3..373f34f47 100644 --- a/apps/documenteditor/main/resources/less/filemenu.less +++ b/apps/documenteditor/main/resources/less/filemenu.less @@ -109,6 +109,17 @@ } } +.btn-blank-format { + display: block; + width: 96px; + height: 96px; + cursor: pointer; + + svg&:hover { + opacity:0.85; + } +} + #panel-settings { #file-menu-panel & { padding: 0 30px; @@ -174,8 +185,8 @@ display: inline-block; margin: 25px 20px 65px; - width: 102px; - height: 128px; + width: 96px; + height: 96px; cursor: pointer; } @@ -194,8 +205,8 @@ cursor: pointer; .thumb { - width: 102px; - height: 128px; + width: 96px; + height: 96px; background-repeat: no-repeat; background-position: center; } diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index fb70e61b0..73dc6cf58 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -625,8 +625,8 @@ define([ '

<%= scope.fromBlankText %>


', '
', '
', - '', - '', + '', + '', '', '
', '
', @@ -642,7 +642,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/index.html b/apps/presentationeditor/main/index.html index ba53817f6..5f5666c39 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -296,6 +296,7 @@ + diff --git a/apps/presentationeditor/main/index_loader.html b/apps/presentationeditor/main/index_loader.html index ea20a977b..39b348ca6 100644 --- a/apps/presentationeditor/main/index_loader.html +++ b/apps/presentationeditor/main/index_loader.html @@ -260,6 +260,7 @@ + diff --git a/apps/spreadsheeteditor/main/index_loader.html b/apps/spreadsheeteditor/main/index_loader.html index 7c90b3f1b..8eb226bba 100644 --- a/apps/spreadsheeteditor/main/index_loader.html +++ b/apps/spreadsheeteditor/main/index_loader.html @@ -263,6 +263,7 @@ +