diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-05-18 07:53:04 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-05-18 08:47:10 -0500 |
| commit | e0eebba46192e5ef2050347069c4098d33e9ec54 (patch) | |
| tree | e58d15f7bd6d5c5f5ce53d880a7ad89bf3faaab2 /app/javascript/styles | |
| parent | 4c0770d6c8dac8177b8891a6fb97ccf440100fc2 (diff) | |
| parent | 57b503d4ef0754e4651eae26b628cba60e1ab4e9 (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml
Diffstat (limited to 'app/javascript/styles')
| -rw-r--r-- | app/javascript/styles/mastodon/accounts.scss | 13 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/footer.scss | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss index b063ca52d..93aa134cf 100644 --- a/app/javascript/styles/mastodon/accounts.scss +++ b/app/javascript/styles/mastodon/accounts.scss @@ -322,6 +322,15 @@ z-index: 2; position: relative; + &.empty img { + position: absolute; + opacity: 0.2; + height: 200px; + left: 0; + bottom: 0; + pointer-events: none; + } + @media screen and (max-width: 740px) { border-radius: 0; box-shadow: none; @@ -438,8 +447,8 @@ font-size: 14px; font-weight: 500; text-align: center; - padding: 60px 0; - padding-top: 55px; + padding: 130px 0; + padding-top: 125px; margin: 0 auto; cursor: default; } diff --git a/app/javascript/styles/mastodon/footer.scss b/app/javascript/styles/mastodon/footer.scss index ba2a06954..dd3c1b688 100644 --- a/app/javascript/styles/mastodon/footer.scss +++ b/app/javascript/styles/mastodon/footer.scss @@ -4,7 +4,7 @@ font-size: 12px; color: $darker-text-color; - .domain { + .footer__domain { font-weight: 500; a { |