mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-28 04:51:35 +01:00
4df3b7cb06
Conflicts: - app/controllers/settings/follower_domains_controller.rb Removed upstream. Did the same here. Maybe we should not have? - config/locales/en.yml Upstream removed the “Authorized followers” page and associated translations. This is too close in the file to our glitch-soc-specific “flavour” string. No actual conflict. - config/locales/ja.yml Same as above. - config/locales/pl.yml Same as above. - config/navigation.rb No real conflict. New route added too close to the glitch-soc-specific “flavours” one. - config/webpack/configuration.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpack/loaders/babel.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. The contents of this file have been moved to package.json. - config/webpack/shared.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpacker.yml Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - jest.config.js The contents of this file have been moved to package.json. - package.json Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - yarn.lock Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up.
13 lines
267 B
Text
13 lines
267 B
Text
- content_for :content do
|
|
.container-alt
|
|
.logo-container
|
|
%h1
|
|
= link_to root_path do
|
|
= image_pack_tag 'logo_full.svg', alt: 'Mastodon'
|
|
|
|
.form-container
|
|
= render 'flashes'
|
|
|
|
= yield
|
|
|
|
= render template: 'layouts/application'
|