diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-07-24 13:36:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-24 13:36:39 +0200 |
| commit | f7c7ff5f85a5b79d7cf81a93aa991d52f781060e (patch) | |
| tree | eb8e7c1b71695398982daf754b14407c3da6ec90 /core | |
| parent | e8b0868b581f3c6c11adaaf52fd97061841b5f3c (diff) | |
| parent | f62d4d174db5f1a887cf50b9a13e57056a1d27a1 (diff) | |
| download | nextcloud-server-f7c7ff5f85a5b79d7cf81a93aa991d52f781060e.tar.gz nextcloud-server-f7c7ff5f85a5b79d7cf81a93aa991d52f781060e.zip | |
Merge pull request #10326 from nextcloud/svg-api-suf-fixes
Fix regex of iconsCacher
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/apps.scss | 1 | ||||
| -rw-r--r-- | core/css/styles.scss | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/core/css/apps.scss b/core/css/apps.scss index f0c168eee71..7f033026b70 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -606,7 +606,6 @@ kbd { position: relative; min-height: 100%; flex-basis: 100vw; - overflow: auto; /* margin if navigation element is here */ #app-navigation + & { margin-left: $navigation-width; diff --git a/core/css/styles.scss b/core/css/styles.scss index 3ca0d804443..ee524d336f5 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -175,7 +175,7 @@ body { -ms-user-select: none; user-select: none; display: flex; - top: 0; + top: $header-height; } /* position controls for apps with app-navigation */ |