diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-07-19 09:25:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-19 09:25:22 +0200 |
commit | aa22b38fdbc1842549b6cbc0e0d948f85a71b92a (patch) | |
tree | ab38f411a1c5726820dfade57fef2d6d2cb670c2 /app/javascript/styles/mastodon/basics.scss | |
parent | 4fa6472523d47e56f2458950af8d7ad9b5817a82 (diff) |
Change single-column mode to scroll the whole page (#11359)
Fix #10840
Diffstat (limited to 'app/javascript/styles/mastodon/basics.scss')
-rw-r--r-- | app/javascript/styles/mastodon/basics.scss | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss index b5a77ce94..7df76bdff 100644 --- a/app/javascript/styles/mastodon/basics.scss +++ b/app/javascript/styles/mastodon/basics.scss @@ -8,7 +8,7 @@ body { font-family: $font-sans-serif, sans-serif; - background: darken($ui-base-color, 8%); + background: darken($ui-base-color, 7%); font-size: 13px; line-height: 18px; font-weight: 400; @@ -35,11 +35,19 @@ body { } &.app-body { - position: absolute; - width: 100%; - height: 100%; padding: 0; - background: $ui-base-color; + + &.layout-single-column { + height: auto; + min-height: 100%; + overflow-y: scroll; + } + + &.layout-multiple-columns { + position: absolute; + width: 100%; + height: 100%; + } &.with-modals--active { overflow-y: hidden; @@ -56,7 +64,6 @@ body { &--active { overflow-y: hidden; - margin-right: 13px; } } @@ -134,9 +141,22 @@ button { & > div { display: flex; width: 100%; - height: 100%; align-items: center; justify-content: center; outline: 0 !important; } } + +.layout-single-column .app-holder { + &, + & > div { + min-height: 100%; + } +} + +.layout-multiple-columns .app-holder { + &, + & > div { + height: 100%; + } +} |