mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-24 03:28:06 +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.
46 lines
1.8 KiB
Text
46 lines
1.8 KiB
Text
- content_for :page_title do
|
|
= site_hostname
|
|
|
|
- content_for :header_tags do
|
|
= render partial: 'shared/og'
|
|
|
|
.grid-3
|
|
.column-0
|
|
.public-account-header.public-account-header--no-bar
|
|
.public-account-header__image
|
|
= image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('media/images/preview.jpg'), alt: @instance_presenter.site_title, class: 'parallax'
|
|
|
|
.column-1
|
|
.landing-page__call-to-action{ dir: 'ltr' }
|
|
.row
|
|
.row__information-board
|
|
.information-board__section
|
|
%span= t 'about.user_count_before'
|
|
%strong= number_with_delimiter @instance_presenter.user_count
|
|
%span= t 'about.user_count_after', count: @instance_presenter.user_count
|
|
.information-board__section
|
|
%span= t 'about.status_count_before'
|
|
%strong= number_with_delimiter @instance_presenter.status_count
|
|
%span= t 'about.status_count_after', count: @instance_presenter.status_count
|
|
.row__mascot
|
|
.landing-page__mascot
|
|
= image_tag @instance_presenter.mascot&.file&.url || asset_pack_path('media/images/elephant_ui_plane.svg'), alt: ''
|
|
|
|
.column-2
|
|
.landing-page__information.contact-widget
|
|
%p
|
|
%strong= t 'about.administered_by'
|
|
|
|
= account_link_to(@instance_presenter.contact_account)
|
|
|
|
- if @instance_presenter.site_contact_email.present?
|
|
%p.contact-widget__mail
|
|
%strong
|
|
= succeed ':' do
|
|
= t 'about.contact'
|
|
%br/
|
|
= mail_to @instance_presenter.site_contact_email, nil, title: @instance_presenter.site_contact_email
|
|
|
|
.column-3
|
|
.box-widget
|
|
.rich-formatting= @instance_presenter.site_extended_description.html_safe.presence || t('about.extended_description_html')
|