diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-09-18 17:25:56 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-09-18 17:25:56 +0200 |
| commit | 5cadb4723832b91068ee51955b9d4b1336502369 (patch) | |
| tree | 2e915e53ee0d25ea63ee3910ae8ced44f3295e21 /app/javascript/styles | |
| parent | ab646fac5f582fe9bef22d8b9a4995fbb4b42d7d (diff) | |
| parent | d0c2c5278391b82ba7fa2f230bf237805ff61a0c (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code
Diffstat (limited to 'app/javascript/styles')
| -rw-r--r-- | app/javascript/styles/mastodon/accounts.scss | 1 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/polls.scss | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss index f95313a25..5dc067f0e 100644 --- a/app/javascript/styles/mastodon/accounts.scss +++ b/app/javascript/styles/mastodon/accounts.scss @@ -224,6 +224,7 @@ } .account__header__fields { + max-width: 100vw; padding: 0; margin: 15px -15px -15px; border: 0 none; diff --git a/app/javascript/styles/mastodon/polls.scss b/app/javascript/styles/mastodon/polls.scss index 8b131dffd..e80220f27 100644 --- a/app/javascript/styles/mastodon/polls.scss +++ b/app/javascript/styles/mastodon/polls.scss @@ -79,6 +79,9 @@ top: -1px; border-radius: 50%; vertical-align: middle; + margin-top: auto; + margin-bottom: auto; + flex: 0 0 18px; &.checkbox { border-radius: 4px; |