eed61a37ec
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.
52 lines
2.1 KiB
Text
52 lines
2.1 KiB
Text
!!!
|
|
%html{ lang: I18n.locale }
|
|
%head
|
|
%meta{ 'http-equiv' => 'Content-Type', 'content' => 'text/html; charset=utf-8' }/
|
|
%meta{ name: 'viewport', content: 'width=device-width, initial-scale=1.0, shrink-to-fit=no' }
|
|
|
|
%title/
|
|
|
|
= stylesheet_pack_tag 'core/mailer'
|
|
%body{ dir: locale_direction }
|
|
%table.email-table{ cellspacing: 0, cellpadding: 0 }
|
|
%tbody
|
|
%tr
|
|
%td.email-body.email-start
|
|
.email-container
|
|
%table.content-section{ cellspacing: 0, cellpadding: 0 }
|
|
%tbody
|
|
%tr
|
|
%td.content-cell.header
|
|
.email-row
|
|
.col-6
|
|
%table.column{ cellspacing: 0, cellpadding: 0 }
|
|
%tbody
|
|
%tr
|
|
%td.column-cell
|
|
= link_to root_url do
|
|
= image_tag full_pack_url('media/images/mailer/logo_full.png'), alt: 'Mastodon', height: 34, class: 'logo'
|
|
|
|
= yield
|
|
|
|
%table.email-table{ cellspacing: 0, cellpadding: 0 }
|
|
%tbody
|
|
%tr
|
|
%td.email-body.email-end
|
|
.email-container
|
|
%table.content-section{ cellspacing: 0, cellpadding: 0 }
|
|
%tbody
|
|
%tr
|
|
%td.content-cell.content-end
|
|
!= " "
|
|
%tr
|
|
%td.blank-cell.footer
|
|
.email-row
|
|
.col-6
|
|
%table.column{ cellspacing: 0, cellpadding: 0 }
|
|
%tbody
|
|
%td.column-cell
|
|
%p= t 'about.hosted_on', domain: site_hostname
|
|
%p= link_to t('application_mailer.notification_preferences'), settings_notifications_url
|
|
%td.column-cell.text-right
|
|
= link_to root_url do
|
|
= image_tag full_pack_url('media/images/mailer/logo_transparent.png'), alt: 'Mastodon', height: 24
|