diff options
author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-07-24 10:29:46 +0200 |
---|---|---|
committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-07-24 11:01:11 +0200 |
commit | 440b5c944f1d5bb759da1f90ad7fb17ba0e2b302 (patch) | |
tree | 26ddf0e828c1b7b4ac0ba359a7dbdbfb16f3a846 /core | |
parent | 0274507cb10b53cfd38bd0ae3810c26cdb172ad1 (diff) | |
download | nextcloud-server-440b5c944f1d5bb759da1f90ad7fb17ba0e2b302.tar.gz nextcloud-server-440b5c944f1d5bb759da1f90ad7fb17ba0e2b302.zip |
Fixed scrolling container
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core')
-rw-r--r-- | core/css/apps.scss | 8 | ||||
-rw-r--r-- | core/css/mobile.scss | 2 | ||||
-rw-r--r-- | core/css/public.scss | 15 |
3 files changed, 23 insertions, 2 deletions
diff --git a/core/css/apps.scss b/core/css/apps.scss index bab47f4b004..f0c168eee71 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -587,13 +587,15 @@ kbd { // everything not related to content but needs to be on the window // goes here (popups, tooltips...) position: relative; + min-height: 100%; + display: unset; } #content { box-sizing: border-box; position: relative; display: flex; - margin-left: $navigation-width; margin-top: $header-height; + min-height: 100%; } /* APP-CONTENT AND WRAPPER ------------------------------------------ */ @@ -605,6 +607,10 @@ kbd { min-height: 100%; flex-basis: 100vw; overflow: auto; + /* margin if navigation element is here */ + #app-navigation + & { + margin-left: $navigation-width; + } /* no top border for first settings item */ > .section:first-child { border-top: none; diff --git a/core/css/mobile.scss b/core/css/mobile.scss index 8a7b323a844..93e2909a510 100644 --- a/core/css/mobile.scss +++ b/core/css/mobile.scss @@ -28,7 +28,7 @@ } } - #content { + #app-navigation + #app-content { margin-left: 0; } diff --git a/core/css/public.scss b/core/css/public.scss index 2ddca32c884..19b90064229 100644 --- a/core/css/public.scss +++ b/core/css/public.scss @@ -44,4 +44,19 @@ .ie #content { display: inline-block; } + + + p.info { + margin: 20px auto; + text-shadow: 0 0 2px rgba(0, 0, 0, .4); + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + } + p.info, form fieldset legend, + #datadirContent label, + form fieldset .warning-info, + form input[type='checkbox']+label { + text-align: center; + } } |