]> source.dussan.org Git - nextcloud-server.git/commitdiff
Move scroll container to inner element 18615/head
authorJulius Härtl <jus@bitgrid.net>
Tue, 31 Dec 2019 09:25:38 +0000 (10:25 +0100)
committerJulius Härtl <jus@bitgrid.net>
Tue, 31 Dec 2019 09:35:11 +0000 (10:35 +0100)
Signed-off-by: Julius Härtl <jus@bitgrid.net>
core/css/header.scss

index 62ed3e381783f073885fc68fed785f5beabc80f1..b352f12e1b674b8b2d513bfb95a3ad16091cb1ce 100644 (file)
        }
 }
 
+@mixin header-menu-height() {
+       min-height: calc(44px * 1.5); // show at least 1.5 entries
+       max-height: calc(100vh - #{$header-height} * 2);
+}
+
 #header {
        /* Header menu */
        $header-menu-entry-height: 44px;
                z-index: 2000;
                position: absolute;
                max-width: 350px;
-               min-height: calc(44px * 1.5); // show at least 1.5 entries
-               max-height: calc(100vh - #{$header-height} * 2);
+               @include header-menu-height();
                right: 5px; // relative to parent
                top: $header-height;
                margin: 0;
-               overflow-y: scroll;
-               -webkit-overflow-scrolling: touch;
 
                &:not(.popovermenu) {
                        display: none;
                        right: 10px;
                }
 
+               #apps > ul,
+               & > div,
+               & > ul {
+                       overflow-y: auto;
+                       -webkit-overflow-scrolling: touch;
+                       @include header-menu-height();
+               }
+
                /* Use by the apps menu and the settings right menu */
                #apps > ul,
-               &.settings-menu {
+               &.settings-menu > ul {
                        li {
                                a {
                                        display: inline-flex;