From 3c2de994dead9fd458aa7c949d7980b26ca66a19 Mon Sep 17 00:00:00 2001 From: Alexey Koshelev Date: Wed, 25 Sep 2024 14:05:11 +0300 Subject: [PATCH 1/4] [PDFE DE] Fix bug 68642 --- apps/documenteditor/embed/index.html | 45 +++++++++++++------ apps/documenteditor/embed/index.html.deploy | 45 +++++++++++++------ apps/documenteditor/forms/index.html | 4 +- apps/documenteditor/forms/index.html.deploy | 4 +- .../main/app/controller/Main.js | 2 +- apps/documenteditor/main/index.html | 7 +-- apps/documenteditor/main/index.html.deploy | 7 +-- .../main/resources/less/app.less | 4 +- apps/pdfeditor/main/app/controller/Main.js | 2 +- apps/pdfeditor/main/index.html | 7 +-- apps/pdfeditor/main/resources/less/app.less | 4 +- 11 files changed, 86 insertions(+), 45 deletions(-) diff --git a/apps/documenteditor/embed/index.html b/apps/documenteditor/embed/index.html index ce1e731614..d6d9740fa8 100644 --- a/apps/documenteditor/embed/index.html +++ b/apps/documenteditor/embed/index.html @@ -69,18 +69,24 @@ .loadmask > .placeholder { background: #fbfbfb; - width: 100%; - height: 100%; - padding-top: 56px; + left: 25px; + top: 50px; + position: absolute; + width: calc(100% - 25px * 2 - 14px); /* 25px - horizontal margin, 14px width scrollbar */ + aspect-ratio: 21 / 29.7; + padding: 10% 10% 7.5% 10%; /* bottom 7.5% because the last transparent line takes 2.5%. */ } - .loadmask > .placeholder > .line { - height: 15px; - margin: 30px; - background: #e2e2e2; - overflow: hidden; - position: relative; - + .loadmask > .placeholder > .lines { + width: 100%; + height: 100%; + background: repeating-linear-gradient( + to bottom, + #e2e2e2, + #e2e2e2 1.5%, + transparent 1.5%, + transparent 4% + ); -webkit-animation: startFlickerAnimation 2s infinite ease-in-out; -moz-animation: startFlickerAnimation 2s infinite ease-in-out; -o-animation: startFlickerAnimation 2s infinite ease-in-out; @@ -108,11 +114,11 @@ 100% { opacity:0.1; } } - .loadmask.none-animation > .placeholder > .line { + .loadmask.none-animation > .placeholder > .lines { animation: none; } - .loadmask.end-animation > .placeholder > .line { + .loadmask.end-animation > .placeholder > .lines { -webkit-animation: endFlickerAnimation 2s infinite ease-in-out; -moz-animation: endFlickerAnimation 2s infinite ease-in-out; -o-animation: endFlickerAnimation 2s infinite ease-in-out; @@ -155,7 +161,20 @@ -
+
+
+
+ +
+
+
+
+
+
+
+
diff --git a/apps/documenteditor/embed/index.html.deploy b/apps/documenteditor/embed/index.html.deploy index ee7f0ed3e7..3422e8ea33 100644 --- a/apps/documenteditor/embed/index.html.deploy +++ b/apps/documenteditor/embed/index.html.deploy @@ -65,18 +65,24 @@ .loadmask > .placeholder { background: #fbfbfb; - width: 100%; - height: 100%; - padding-top: 56px; + left: 25px; + top: 50px; + position: absolute; + width: calc(100% - 25px * 2 - 14px); /* 25px - horizontal margin, 14px width scrollbar */ + aspect-ratio: 21 / 29.7; + padding: 10% 10% 7.5% 10%; /* bottom 7.5% because the last transparent line takes 2.5%. */ } - .loadmask > .placeholder > .line { - height: 15px; - margin: 30px; - background: #e2e2e2; - overflow: hidden; - position: relative; - + .loadmask > .placeholder > .lines { + width: 100%; + height: 100%; + background: repeating-linear-gradient( + to bottom, + #e2e2e2, + #e2e2e2 1.5%, + transparent 1.5%, + transparent 4% + ); -webkit-animation: startFlickerAnimation 2s infinite ease-in-out; -moz-animation: startFlickerAnimation 2s infinite ease-in-out; -o-animation: startFlickerAnimation 2s infinite ease-in-out; @@ -104,11 +110,11 @@ 100% { opacity:0.1; } } - .loadmask.none-animation > .placeholder > .line { + .loadmask.none-animation > .placeholder > .lines { animation: none; } - .loadmask.end-animation > .placeholder > .line { + .loadmask.end-animation > .placeholder > .lines { -webkit-animation: endFlickerAnimation 2s infinite ease-in-out; -moz-animation: endFlickerAnimation 2s infinite ease-in-out; -o-animation: endFlickerAnimation 2s infinite ease-in-out; @@ -144,7 +150,20 @@ -
+
+
+
+ +
+
+
+
+
+
+
+
- \ No newline at end of file + diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy index 622f19995c..5c8e863864 100644 --- a/apps/documenteditor/main/index.html.deploy +++ b/apps/documenteditor/main/index.html.deploy @@ -151,11 +151,12 @@ } .loadmask > .placeholder { + box-sizing: border-box; background: #fff; background: var(--skeleton-canvas-content-background, var(--canvas-content-background, #fff)); width: 794px; margin: 46px auto; - height: 100%; + height: 1123px; border: 1px solid #bbbec2; border: var(--scaled-one-px-value, 1px) solid var(--skeleton-canvas-page-border, var(--canvas-page-border, #bbbec2)); padding-top: 50px; @@ -280,7 +281,7 @@
-
+
- \ No newline at end of file + diff --git a/apps/pdfeditor/main/resources/less/app.less b/apps/pdfeditor/main/resources/less/app.less index 4e0dc11ae3..48feabc43b 100644 --- a/apps/pdfeditor/main/resources/less/app.less +++ b/apps/pdfeditor/main/resources/less/app.less @@ -210,7 +210,7 @@ background: @canvas-content-background; width: 794px; margin: 19px auto 46px; - height: 100%; + height: 1123px; border: 1px solid @canvas-page-border; padding-top: 50px; position: absolute; @@ -238,4 +238,4 @@ background-color: fade(#fff, 5%); } } -} \ No newline at end of file +} From f5fc3296bdc8ff64f92681a968c510a76c34c7c7 Mon Sep 17 00:00:00 2001 From: Alexey Koshelev Date: Thu, 26 Sep 2024 13:03:56 +0300 Subject: [PATCH 2/4] [DE] Revert changes to the document page skeleton in embed mode --- apps/documenteditor/embed/index.html | 44 ++++++--------------- apps/documenteditor/embed/index.html.deploy | 44 ++++++--------------- 2 files changed, 24 insertions(+), 64 deletions(-) diff --git a/apps/documenteditor/embed/index.html b/apps/documenteditor/embed/index.html index d6d9740fa8..de0861cd36 100644 --- a/apps/documenteditor/embed/index.html +++ b/apps/documenteditor/embed/index.html @@ -69,24 +69,17 @@ .loadmask > .placeholder { background: #fbfbfb; - left: 25px; - top: 50px; - position: absolute; - width: calc(100% - 25px * 2 - 14px); /* 25px - horizontal margin, 14px width scrollbar */ - aspect-ratio: 21 / 29.7; - padding: 10% 10% 7.5% 10%; /* bottom 7.5% because the last transparent line takes 2.5%. */ - } - - .loadmask > .placeholder > .lines { width: 100%; height: 100%; - background: repeating-linear-gradient( - to bottom, - #e2e2e2, - #e2e2e2 1.5%, - transparent 1.5%, - transparent 4% - ); + padding-top: 56px; + } + + .loadmask > .placeholder > .line { + height: 15px; + margin: 30px; + background: #e2e2e2; + overflow: hidden; + position: relative; -webkit-animation: startFlickerAnimation 2s infinite ease-in-out; -moz-animation: startFlickerAnimation 2s infinite ease-in-out; -o-animation: startFlickerAnimation 2s infinite ease-in-out; @@ -114,11 +107,11 @@ 100% { opacity:0.1; } } - .loadmask.none-animation > .placeholder > .lines { + .loadmask.none-animation > .placeholder > .line { animation: none; } - .loadmask.end-animation > .placeholder > .lines { + .loadmask.end-animation > .placeholder > .line { -webkit-animation: endFlickerAnimation 2s infinite ease-in-out; -moz-animation: endFlickerAnimation 2s infinite ease-in-out; -o-animation: endFlickerAnimation 2s infinite ease-in-out; @@ -161,20 +154,7 @@ -
-
-
- -
-
-
-
-
-
-
-
+
diff --git a/apps/documenteditor/embed/index.html.deploy b/apps/documenteditor/embed/index.html.deploy index 3422e8ea33..84bbdb6a93 100644 --- a/apps/documenteditor/embed/index.html.deploy +++ b/apps/documenteditor/embed/index.html.deploy @@ -65,24 +65,17 @@ .loadmask > .placeholder { background: #fbfbfb; - left: 25px; - top: 50px; - position: absolute; - width: calc(100% - 25px * 2 - 14px); /* 25px - horizontal margin, 14px width scrollbar */ - aspect-ratio: 21 / 29.7; - padding: 10% 10% 7.5% 10%; /* bottom 7.5% because the last transparent line takes 2.5%. */ - } - - .loadmask > .placeholder > .lines { width: 100%; height: 100%; - background: repeating-linear-gradient( - to bottom, - #e2e2e2, - #e2e2e2 1.5%, - transparent 1.5%, - transparent 4% - ); + padding-top: 56px; + } + + .loadmask > .placeholder > .line { + height: 15px; + margin: 30px; + background: #e2e2e2; + overflow: hidden; + position: relative; -webkit-animation: startFlickerAnimation 2s infinite ease-in-out; -moz-animation: startFlickerAnimation 2s infinite ease-in-out; -o-animation: startFlickerAnimation 2s infinite ease-in-out; @@ -110,11 +103,11 @@ 100% { opacity:0.1; } } - .loadmask.none-animation > .placeholder > .lines { + .loadmask.none-animation > .placeholder > .line { animation: none; } - .loadmask.end-animation > .placeholder > .lines { + .loadmask.end-animation > .placeholder > .line { -webkit-animation: endFlickerAnimation 2s infinite ease-in-out; -moz-animation: endFlickerAnimation 2s infinite ease-in-out; -o-animation: endFlickerAnimation 2s infinite ease-in-out; @@ -150,20 +143,7 @@ -
-
-
- -
-
-
-
-
-
-
-
+
-
+
- \ No newline at end of file + From 66d8c00d6e51dd6b34f9c01604be0b9fa579b1b5 Mon Sep 17 00:00:00 2001 From: Alexey Koshelev Date: Thu, 26 Sep 2024 13:15:13 +0300 Subject: [PATCH 4/4] [DE] Delete closing tag --- apps/documenteditor/main/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index 37ba978f56..6ac2ed0db2 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -458,4 +458,4 @@ - +