6c20dad201
Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`
17 lines
638 B
Text
17 lines
638 B
Text
- content_for :content do
|
|
- if user_signed_in? && !@hide_header
|
|
.account-header
|
|
.avatar= image_tag current_account.avatar.url(:original)
|
|
.name
|
|
= t 'users.signed_in_as'
|
|
%span.username @#{current_account.local_username_and_domain}
|
|
= link_to destroy_user_session_path(continue: true), method: :delete, class: 'logout-link icon-button', title: t('applications.logout'), 'aria-label': t('applications.logout') do
|
|
= fa_icon 'sign-out'
|
|
|
|
.container-alt= yield
|
|
|
|
.modal-layout__mastodon
|
|
%div
|
|
%img{alt: '', draggable: 'false', src: mascot_url }
|
|
|
|
= render template: 'layouts/application'
|