diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2018-09-26 11:53:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-26 11:53:15 +0200 |
| commit | 4e83bbd6513148c46475c2a9a5e4eb2c5e10d577 (patch) | |
| tree | b38952af31061a657878592fb4ea5772c3a94cbf | |
| parent | 1723c524f55674098d8b48c5fa5a6cf4dee26d84 (diff) | |
| parent | 87d95c9753e0a1ae60def0b430a336ac291b3a6e (diff) | |
Merge pull request #334 from nextcloud/wide-compact-on-ff-fix
Fix firefox wide screen and mobile view
| -rw-r--r-- | css/content.css | 3 | ||||
| -rw-r--r-- | css/mobile.css | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/css/content.css b/css/content.css index 57b4b22df..4dfb069d4 100644 --- a/css/content.css +++ b/css/content.css @@ -9,7 +9,8 @@ */ #app-content { - width: 100% + width: 100%; + flex-basis: auto; } #app-navigation:not(.hidden) + #app-content { width: calc(100% - 300px); diff --git a/css/mobile.css b/css/mobile.css index 212f57897..cf34507fc 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -1,4 +1,4 @@ -@media (max-width: 770px) { +@media only screen and (max-width: 768px) { #app-content .utils .date { display: none; } @@ -7,9 +7,13 @@ padding-left: 44px; } + #app-navigation:not(.hidden) + #app-content { + width: 100%; + } + } -@media (max-width: 600px) { +@media only screen and (max-width: 600px) { #app-content .article-actions ul { max-width: 164px; } @@ -32,7 +36,7 @@ } } -@media (max-width: 340px) { +@media only screen and (max-width: 340px) { #app-content .article-actions { max-width: 82px; } |