mirror of
https://github.com/funamitech/mastodon
synced 2024-12-11 21:29:17 +09:00
980c004f06
Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one
35 lines
820 B
Plaintext
35 lines
820 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 :heading_actions
|
|
.content-heading-actions
|
|
= yield :heading_actions
|
|
|
|
= render 'application/flashes'
|
|
|
|
= yield
|
|
|
|
.sidebar-wrapper.sidebar-wrapper--empty
|
|
|
|
= render template: 'layouts/application'
|