diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-09-25 14:28:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-25 14:28:58 +0200 |
| commit | 768047615faea8357c7718943d44027ff1502536 (patch) | |
| tree | 1c2993cb822a1c127a8c3a79083a292c3a99ba6c /core | |
| parent | c62f29b9fe27f2541cd567a4957e690b8bdedd24 (diff) | |
| parent | 7a8b260c27f941291b92a071642da493475da5ef (diff) | |
| download | nextcloud-server-768047615faea8357c7718943d44027ff1502536.tar.gz nextcloud-server-768047615faea8357c7718943d44027ff1502536.zip | |
Merge pull request #11368 from nextcloud/content-list-flex-fixes
Fix default flex shrink on list
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/apps.scss | 4 | ||||
| -rw-r--r-- | core/css/mobile.scss | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/css/apps.scss b/core/css/apps.scss index 913e445f5bf..f294f8aa512 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -1066,7 +1066,7 @@ $popovericon-size: 16px; /* CONTENT LIST ------------------------------------------------------------ */ .app-content-list { - width: 300px; + max-width: 300px; @include position('sticky'); top: $header-height; border-right: 1px solid var(--color-border); @@ -1077,7 +1077,7 @@ $popovericon-size: 16px; max-height: calc(100vh - #{$header-height}); overflow-y: auto; overflow-x: hidden; - flex: 0 0 300px; + flex: 0 1 300px; /* Default item */ .app-content-list-item { diff --git a/core/css/mobile.scss b/core/css/mobile.scss index 44660e44c33..e4a4f53367b 100644 --- a/core/css/mobile.scss +++ b/core/css/mobile.scss @@ -39,6 +39,8 @@ flex: 1 1 100%; // make full height scroll since app-content-details is hidden max-height: unset; + // ignore 300px default max width + max-width: 100%; + .app-content-details { display: none; } |