diff --git a/app/javascript/styles/closed-social/global.scss b/app/javascript/styles/closed-social/global.scss index a9785928c..86aec0a23 100644 --- a/app/javascript/styles/closed-social/global.scss +++ b/app/javascript/styles/closed-social/global.scss @@ -48,6 +48,7 @@ div { } .status__quote__wrapper { + margin-top:16px; border-left: 5px solid #dbdbdb80; background: #dbdbdb40; diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml index bc2e0ffba..4ef9f9478 100644 --- a/app/views/accounts/_header.html.haml +++ b/app/views/accounts/_header.html.haml @@ -1,19 +1,13 @@ .public-account-header{:class => ("inactive" if account.moved?)} .public-account-header__image - - if user_signed_in? - = image_tag (current_account&.user&.setting_auto_play_gif ? account.header_original_url : account.header_static_url), class: 'parallax' - - else - = image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('media/images/preview.jpg'), alt: @instance_presenter.site_title + = image_tag (current_account&.user&.setting_auto_play_gif ? account.header_original_url : account.header_static_url), class: 'parallax' .public-account-header__bar = link_to short_account_url(account), class: 'avatar' do - - if user_signed_in? - = image_tag (current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url), id: 'profile_page_avatar', data: {original: full_asset_url(account.avatar_original_url), static: full_asset_url(account.avatar_static_url), autoplay: current_account&.user&.setting_auto_play_gif} - - else - = image_tag @instance_presenter.mascot&.file&.url || asset_pack_path('media/images/elephant_ui_plane.svg'), alt: '' + = image_tag (current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url), id: 'profile_page_avatar', data: {original: full_asset_url(account.avatar_original_url), static: full_asset_url(account.avatar_static_url), autoplay: current_account&.user&.setting_auto_play_gif} .public-account-header__tabs .public-account-header__tabs__name %h1 - = user_signed_in? ? display_name(account, custom_emojify: true) : t('accounts.unsigned') + = display_name(account, custom_emojify: true) %small = acct(account) = fa_icon('lock') if account.locked? @@ -37,14 +31,13 @@ .public-account-header__tabs__tabs__buttons = account_action_button(account) - -if user_signed_in? - .public-account-header__extra - = render 'accounts/bio', account: account + .public-account-header__extra + = render 'accounts/bio', account: account - .public-account-header__extra__links - = link_to account_following_index_url(account) do - %strong= number_to_human account.following_count, strip_insignificant_zeros: true - = t('accounts.following', count: account.following_count) - = link_to account_followers_url(account) do - %strong= number_to_human account.followers_count, strip_insignificant_zeros: true - = t('accounts.followers', count: account.followers_count) + .public-account-header__extra__links + = link_to account_following_index_url(account) do + %strong= number_to_human account.following_count, strip_insignificant_zeros: true + = t('accounts.following', count: account.following_count) + = link_to account_followers_url(account) do + %strong= number_to_human account.followers_count, strip_insignificant_zeros: true + = t('accounts.followers', count: account.followers_count) diff --git a/config/locales/devise.zh-CN.yml b/config/locales/devise.zh-CN.yml index 37b47ab03..46eac3677 100644 --- a/config/locales/devise.zh-CN.yml +++ b/config/locales/devise.zh-CN.yml @@ -66,7 +66,7 @@ zh-CN: passwords: no_token: 你必须通过密码重置邮件才能访问这个页面。如果你确实如此,请确保你输入的 URL 是完整的。 send_instructions: 几分钟后,你将收到重置密码的电子邮件。如果没有,请检查你的垃圾邮箱。 - send_paranoid_instructions: 如果你的邮箱存在于我们的数据库中,你将收到一封找回密码的邮件。如果没有,请检查你的垃圾邮箱。 + send_paranoid_instructions: 如果你的邮箱存在于我们的数据库中,你将收到一封找回密码的邮件。如果没有,请检查你的垃圾邮件。 updated: 你的密码已修改成功,你现在已登录。 updated_not_active: 你的密码已修改成功。 registrations: diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 89fe0e3a5..8b2f7f397 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -79,7 +79,6 @@ zh-CN: moderator: 监察员 unavailable: 个人资料不可用 unfollow: 取消关注 - unsigned: 【登陆后可见】 admin: account_actions: action: 执行操作