mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-29 05:43:40 +01:00
eee36267d6
Conflicts: - `app/javascript/mastodon/locales/ja.json`: Upstream change too close to a glitch-soc-specific string. The glitch-soc-specific string should not have been in this file, so it has been moved to `app/javascript/flavours/glitch/locales/ja.js`. - `app/javascript/packs/public.js`: Upstream refactored a part, that as usual is split and duplicated in various pack files. Updated those pack files accordingly. - `app/views/layouts/application.html.haml`: Upstream fixed custom.css path in a different way than we did, went with upstream's change.
42 lines
1.1 KiB
Text
42 lines
1.1 KiB
Text
- content_for :header_tags do
|
|
= render_initial_state
|
|
|
|
- content_for :content do
|
|
.admin-wrapper
|
|
.sidebar-wrapper
|
|
.sidebar-wrapper__inner
|
|
.sidebar
|
|
= link_to root_path do
|
|
= render_logo
|
|
|
|
.sidebar__toggle
|
|
.sidebar__toggle__logo
|
|
= link_to root_path do
|
|
= logo_as_symbol(:wordmark)
|
|
|
|
= link_to '#', class: 'sidebar__toggle__icon', 'aria-label': t('navigation.toggle_menu'), 'aria-expanded': 'false' do
|
|
= fa_icon 'bars'
|
|
= fa_icon 'times'
|
|
|
|
= render_navigation
|
|
|
|
.content-wrapper
|
|
.content
|
|
.content__heading
|
|
- if content_for?(:heading)
|
|
= yield :heading
|
|
- else
|
|
.content__heading__row
|
|
%h2= yield :page_title
|
|
|
|
- if content_for?(:heading_actions)
|
|
.content__heading__actions
|
|
= yield :heading_actions
|
|
|
|
= render 'application/flashes'
|
|
|
|
= yield
|
|
|
|
.sidebar-wrapper.sidebar-wrapper--empty
|
|
|
|
= render template: 'layouts/application'
|