catstodon/app/views/layouts/admin.html.haml
Thibaut Girka 45709d6987 Merge branch 'master' into glitch-soc/master
Conflicts:
- `README.md`:
  We have different README files. Discarded upstream changes.
- `app/views/layouts/admin.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `app/views/layouts/embedded.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `yarn.lock`:
  No real conflict, glitch-specific dependency too close to
  an updated one. Adapted upstream change.
2020-01-20 15:00:22 +01:00

37 lines
876 B
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
= image_pack_tag 'logo.svg', class: 'logo', alt: 'Mastodon'
.sidebar__toggle
.sidebar__toggle__logo
= link_to root_path do
= svg_logo_full
= link_to '#', class: 'sidebar__toggle__icon' do
= fa_icon 'bars'
= render_navigation
.content-wrapper
.content
.content-heading
%h2= yield :page_title
- if :heading_actions
.content-heading-actions
= yield :heading_actions
= render 'application/flashes'
= yield
.sidebar-wrapper.sidebar-wrapper--empty
= render template: 'layouts/application'