summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-10-02 23:06:17 +0200
committerGitHub <noreply@github.com>2018-10-02 23:06:17 +0200
commit029aa8e9c0a81b463a19aedd078aa7522ba2ae36 (patch)
treebcdd9886409a71c391e86e2bdf88497f73d9e429
parent591669a2b4c5ae7f298d6a89bb6386bf5b3637f8 (diff)
parent745e27e0cc09dc8ff6c647d39fb41100b51dfe59 (diff)
downloadnextcloud-server-029aa8e9c0a81b463a19aedd078aa7522ba2ae36.tar.gz
nextcloud-server-029aa8e9c0a81b463a19aedd078aa7522ba2ae36.zip
Merge pull request #11558 from nextcloud/stable14-header-overflow
[stable14] Fix header overflow, fix more apps menu, fix #11552
-rw-r--r--apps/files_sharing/css/public.scss6
-rw-r--r--core/css/header.scss1
2 files changed, 6 insertions, 1 deletions
diff --git a/apps/files_sharing/css/public.scss b/apps/files_sharing/css/public.scss
index 50dfa3e9c57..0a66225d7e3 100644
--- a/apps/files_sharing/css/public.scss
+++ b/apps/files_sharing/css/public.scss
@@ -159,6 +159,12 @@ thead {
text-align: left;
}
+/* Needed to ellipsize long header text on share page */
+#body-login #header-left,
+#body-login .header-left {
+ overflow: hidden;
+}
+
#header .header-shared-by {
color: var(--color-primary-text);
position: relative;
diff --git a/core/css/header.scss b/core/css/header.scss
index 400e44e9a29..5b735df1bf5 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -153,7 +153,6 @@
flex: 0 0;
flex-grow: 1;
white-space: nowrap;
- overflow: hidden;
}
#header-right, .header-right {