Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/ONLYOFFICE/onlyoffice-nextcloud.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntipkin-A <Artem.Antipkin@onlyoffice.com>2022-09-30 17:22:41 +0300
committerAntipkin-A <Artem.Antipkin@onlyoffice.com>2022-10-03 18:10:46 +0300
commit920e0c73a7ec8e6a20314b70abac728380dbd0ab (patch)
tree099a5220a7e1f31b5b95f338006994da1c645d40
parent78c6b93df431b33c2c75fa2f579301e1083e7db7 (diff)
fixed position frame for nc25
-rw-r--r--css/editor.css18
-rw-r--r--css/main.css13
-rw-r--r--templates/editor.php5
3 files changed, 23 insertions, 13 deletions
diff --git a/css/editor.css b/css/editor.css
index 08c95a4..8e4c1f3 100644
--- a/css/editor.css
+++ b/css/editor.css
@@ -21,17 +21,25 @@
min-height: calc(100% - 50px);
}
-#body-public #content.app-public {
- height: 100%;
-}
-
#body-public footer {
display: none;
}
+#content.app-onlyoffice #app > iframe {
+ height: calc(100vh - 50px) !important;
+ margin-top: 0px !important;
+}
+
#app > iframe {
- position: absolute;
+ position: fixed;
vertical-align: top;
+ left: 0px;
+ height: calc(100vh - 58px);
+ margin-top: -50px;
+}
+
+.onlyoffice-inviewer > iframe {
+ height: 100vh !important;
}
.AscDesktopEditor #body-user #header {
diff --git a/css/main.css b/css/main.css
index 935794e..093a19b 100644
--- a/css/main.css
+++ b/css/main.css
@@ -37,14 +37,10 @@
}
/* onlyoffice-inline */
-body.onlyoffice-inline {
- overscroll-behavior-y: none;
- overflow: hidden;
-}
body.onlyoffice-inline #app-navigation,
body.onlyoffice-inline .searchbox,
-body.onlyoffice-inline #app-content #controls,
-body.onlyoffice-inline #filestable {
+body.onlyoffice-inline #app-content .files-controls,
+body.onlyoffice-inline .files-filestable {
display: none;
}
body.onlyoffice-inline #app-navigation-toggle {
@@ -52,11 +48,14 @@ body.onlyoffice-inline #app-navigation-toggle {
}
body.onlyoffice-inline #content #app-content {
margin-left: 0;
+ position: relative;
+ overflow: hidden;
+ overscroll-behavior-y: none;
}
#onlyofficeFrame {
background-color: #fff;
width: 100%;
- height: calc(100vh - 50px);
+ height: 100vh;
display: block;
position: absolute;
top: 0;
diff --git a/templates/editor.php b/templates/editor.php
index c40975a..c51be6e 100644
--- a/templates/editor.php
+++ b/templates/editor.php
@@ -25,7 +25,10 @@
}
?>
-<div id="app">
+<div id="app"
+ <?php if (!empty($_["inviewer"])) { ?>
+ class="onlyoffice-inviewer"
+ <?php } ?>>
<div id="iframeEditor"
data-id="<?php p($_["fileId"]) ?>"