mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-29 09:03:43 +01:00
5bb8563f6c
Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.
17 lines
387 B
Text
17 lines
387 B
Text
- content_for :content do
|
|
.admin-wrapper
|
|
.sidebar-wrapper
|
|
.sidebar
|
|
= link_to root_path do
|
|
= image_tag asset_pack_path('logo.svg'), class: 'logo', alt: 'Mastodon'
|
|
|
|
= render_navigation
|
|
.content-wrapper
|
|
.content
|
|
%h2= yield :page_title
|
|
|
|
= render 'application/flashes'
|
|
|
|
= yield
|
|
|
|
= render template: 'layouts/application'
|