diff options
| author | lambda <pleromagit@rogerbraun.net> | 2017-11-24 07:29:08 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2017-11-24 07:29:08 +0000 |
| commit | 1dfb8d14b21cac8a1349146df03d35c1d2ec6005 (patch) | |
| tree | f41337aa64e407921e14c28613c2a07f1235c9c2 | |
| parent | 222b0aa982e978dbb692af57d87b0cbc6c9bdeab (diff) | |
| parent | 1ade28429309cdd713d8ea1b393920121a0c9d36 (diff) | |
Merge branch 'fix/dont-stretch-panel-switcher' into 'develop'
Fix content sizing to not allow empty scrolling, make panel-switcher not grow on mobile
See merge request pleroma/pleroma-fe!175
| -rw-r--r-- | src/App.scss | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/App.scss b/src/App.scss index 9aa3ee98..4146e68b 100644 --- a/src/App.scss +++ b/src/App.scss @@ -16,7 +16,12 @@ h4 { } #content { - padding-top: 60px; + box-sizing: border-box; + padding-top: 60px; + margin: auto; + min-height: 100vh; + max-width: 980px; + background-color: rgba(0,0,0,0.15); } .text-center { @@ -157,15 +162,6 @@ main-router { margin: 0; } - -#content { - margin: auto; - min-height: 100vh; - max-width: 980px; - padding-bottom: 1em; - background-color: rgba(0,0,0,0.1); -} - .container > * { min-width: 0px; } @@ -210,10 +206,11 @@ nav { .panel-switcher { display: none; width: 100%; - + height: 46px; button { display: block; flex: 1; + max-height: 32px; margin: 0.5em; padding: 0.5em; } |
