From 5303389420eea3149fc371012fe01e8e488818cd Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 11 Jun 2020 19:36:37 +0300 Subject: [PATCH] Change recent files --- .../main/app/view/FileMenuPanels.js | 10 ++++----- apps/documenteditor/main/index.html | 1 + apps/documenteditor/main/index.html.deploy | 1 + apps/documenteditor/main/index_loader.html | 1 + .../main/index_loader.html.deploy | 1 + .../main/resources/img/file-recent.png | Bin 895 -> 0 bytes .../main/resources/img/file-recent@2x.png | Bin 1762 -> 0 bytes .../main/resources/img/recent-file.svg | 10 +++++++++ .../main/resources/less/filemenu.less | 19 ++++++++---------- .../main/app/view/FileMenuPanels.js | 10 ++++----- 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-recent.png | Bin 374 -> 0 bytes .../main/resources/img/file-recent@2x.png | Bin 1040 -> 0 bytes .../main/resources/img/recent-file.svg | 7 +++++++ .../main/resources/less/leftmenu.less | 16 +++++++-------- .../main/app/view/FileMenuPanels.js | 10 ++++----- 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-recent.png | Bin 377 -> 0 bytes .../main/resources/img/file-recent@2x.png | Bin 521 -> 0 bytes .../main/resources/img/recent-file.svg | 11 ++++++++++ .../main/resources/less/leftmenu.less | 16 +++++++-------- build/documenteditor.json | 6 ++++++ build/presentationeditor.json | 6 ++++++ build/spreadsheeteditor.json | 6 ++++++ 30 files changed, 97 insertions(+), 42 deletions(-) delete mode 100644 apps/documenteditor/main/resources/img/file-recent.png delete mode 100644 apps/documenteditor/main/resources/img/file-recent@2x.png create mode 100644 apps/documenteditor/main/resources/img/recent-file.svg delete mode 100644 apps/presentationeditor/main/resources/img/file-recent.png delete mode 100644 apps/presentationeditor/main/resources/img/file-recent@2x.png create mode 100644 apps/presentationeditor/main/resources/img/recent-file.svg delete mode 100644 apps/spreadsheeteditor/main/resources/img/file-recent.png delete mode 100644 apps/spreadsheeteditor/main/resources/img/file-recent@2x.png create mode 100644 apps/spreadsheeteditor/main/resources/img/recent-file.svg diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 6c952ac80f..56a8f3bd80 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -668,11 +668,11 @@ define([ store: new Common.UI.DataViewStore(this.recent), itemTemplate: _.template([ '
', - '
', - ' style="background-image: url(<%= image %>);background-position: center;"', - '<% } %>', - '>
', + '
', + '', + '', + '', + '
', '
<% if (typeof title !== "undefined") {%><%= Common.Utils.String.htmlEncode(title || "") %><% } %>
', '
<% if (typeof folder !== "undefined") {%><%= Common.Utils.String.htmlEncode(folder || "") %><% } %>
', '
' diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index 3430971bec..527d03ec45 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -270,6 +270,7 @@ + diff --git a/apps/documenteditor/main/index_loader.html b/apps/documenteditor/main/index_loader.html index 85341cc767..8f6506ec02 100644 --- a/apps/documenteditor/main/index_loader.html +++ b/apps/documenteditor/main/index_loader.html @@ -271,6 +271,7 @@ + diff --git a/apps/documenteditor/main/resources/img/file-recent.png b/apps/documenteditor/main/resources/img/file-recent.png deleted file mode 100644 index eba0c2bd358b973a8d30b915baf9b2633d194f6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 895 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 + + + + + + + + + \ 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 8cf1d774f5..f3ffcc992a 100644 --- a/apps/documenteditor/main/resources/less/filemenu.less +++ b/apps/documenteditor/main/resources/less/filemenu.less @@ -215,8 +215,7 @@ } .recent-wrap { - height: 65px; - padding: 10px; + padding: 5px 10px; cursor: pointer; font-size: 12px; @@ -227,11 +226,13 @@ .recent-icon { float: left; - width: 35px; - height: 45px; - margin-right: 10px; - .background-ximage-v2('file-recent.png', 72px, @commonimage: false); - background-position: 0 0; + width: 25px; + height: 25px; + margin-top: 2px; + svg { + width: 100%; + height: 100%; + } } > div:not(:first-child) { @@ -241,10 +242,6 @@ text-overflow: ellipsis; } - .file-name { - margin: 5px 0; - } - .file-info { color: #999; } diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index e3fbbb4e6a..fb70e61b02 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -575,11 +575,11 @@ define([ store: new Common.UI.DataViewStore(this.recent), itemTemplate: _.template([ '
', - '
', - ' style="background-image: url(<%= image %>);background-position: center;"', - '<% } %>', - '>
', + '
', + '', + '', + '', + '
', '
<% if (typeof title !== "undefined") {%><%= Common.Utils.String.htmlEncode(title || "") %><% } %>
', '
<% if (typeof folder !== "undefined") {%><%= Common.Utils.String.htmlEncode(folder || "") %><% } %>
', '
' diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html index 6b431247ef..ba53817f6e 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -295,6 +295,7 @@ + diff --git a/apps/presentationeditor/main/index_loader.html b/apps/presentationeditor/main/index_loader.html index d789d56807..ea20a977b2 100644 --- a/apps/presentationeditor/main/index_loader.html +++ b/apps/presentationeditor/main/index_loader.html @@ -259,6 +259,7 @@ + diff --git a/apps/spreadsheeteditor/main/index_loader.html b/apps/spreadsheeteditor/main/index_loader.html index 98d4369eb8..7c90b3f1b6 100644 --- a/apps/spreadsheeteditor/main/index_loader.html +++ b/apps/spreadsheeteditor/main/index_loader.html @@ -262,6 +262,7 @@ +