Merge pull request #2743 from nextcloud/add-talk-sidebar-to-public-share-auth-page

Video verification

3 files changed, 28 insertions, 0 deletions

diff --git a/css/icons.scss b/css/icons.scss
index 2cc861d94..4cfd6e77b 100644
--- a/css/icons.scss
+++ b/css/icons.scss
@@ -10,6 +10,7 @@
 
 .app-Talk,
 .talk-modal,
+#talk-sidebar,
 #call-container {
 	// We always want to use the white icons, this is why we don't use var(--color-white) here.
 	.icon-public {
diff --git a/css/merged-share-auth.scss b/css/merged-share-auth.scss
index 04a24cced..5b7b1151e 100644
--- a/css/merged-share-auth.scss
+++ b/css/merged-share-auth.scss
@@ -1 +1,2 @@
 @import 'icons.scss';
+@import 'publicshareauth.scss'
diff --git a/css/publicshareauth.scss b/css/publicshareauth.scss
new file mode 100644
index 000000000..f685c9824
--- /dev/null
+++ b/css/publicshareauth.scss
@@ -0,0 +1,26 @@
+/* Special layout to include the Talk sidebar */
+/* The original style of the body is kept until the layout has been adjusted to
+ * include the Talk sidebar. If only "#body-login" was used, immediately after
+ * load and before the sidebar was injected the original elements would be using
+ * the style for the adjusted layout, which is not the proper one for them, and
+ * this would cause the elements to "jump" to their final position once the
+ * layout was adjusted. */
+#body-login.talk-sidebar-enabled {
+	flex-direction: row;
+	align-items: stretch;
+}
+
+/* #body-login should be used to override the #content rules set in server. */
+#body-login #content {
+	flex-grow: 1;
+
+	flex-direction: column;
+	align-items: center;
+
+	height: auto;
+
+	overflow-x: hidden;
+
+	/* Override "padding-top: 50px" set in server. */
+	padding-top: 0;
+}