ab5ff638f2
Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc
35 lines
830 B
Plaintext
35 lines
830 B
Plaintext
- 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 :page_heading_actions
|
|
.content-heading-actions
|
|
= yield :page_heading_actions
|
|
|
|
= render 'application/flashes'
|
|
|
|
= yield
|
|
|
|
.sidebar-wrapper.sidebar-wrapper--empty
|
|
|
|
= render template: 'layouts/application'
|