You've already forked mastodon-utils
mirror of
https://github.com/jakejarvis/mastodon-utils.git
synced 2025-11-04 10:20:11 -05:00
separate glitch patches from vanilla
This commit is contained in:
14
README.md
14
README.md
@@ -11,7 +11,7 @@ git clone https://github.com/jakejarvis/mastodon-scripts.git /home/mastodon/scri
|
||||
git config --global --add safe.directory /home/mastodon/scripts
|
||||
|
||||
cd /home/mastodon/live
|
||||
git apply --allow-binary-replacement --whitespace=warn /home/mastodon/scripts/patches/*.patch || true
|
||||
git apply --allow-binary-replacement --whitespace=warn /home/mastodon/scripts/patches/*.patch /home/mastodon/scripts/glitch/*.patch || true
|
||||
RAILS_ENV=production bundle exec rails assets:precompile
|
||||
|
||||
chown -R mastodon:mastodon /home/mastodon/{scripts,live}
|
||||
@@ -21,13 +21,17 @@ systemctl restart mastodon-*
|
||||
|
||||
## Patches
|
||||
|
||||
- [`cleanup-sidebar.patch`](patches/cleanup-sidebar.patch): Removes redudant search button from sidebar (glitch-soc only)
|
||||
- [`favicons.patch`](patches/favicons.patch): Use custom icon images instead of Mastodon logo
|
||||
- [`hide-contact-email.patch`](patches/hide-contact-email.patch): Hides the `mailto:` link on the About page
|
||||
- [`hide-rules.patch`](patches/hide-rules.patch): Applies just to homepage, meant only for single-user instances
|
||||
- [`hide-signup.patch`](patches/hide-signup.patch): Hide the "create account" button (for aesthetics, **not security!**)
|
||||
- [`robots.patch`](patches/robots.patch): Disallow search engines for all of Mastodon
|
||||
- [`system-font.patch`](patches/system-font.patch): Use the system's default sans-serif font stack instead of Roboto
|
||||
- [Additional `glitch-soc` patch](patches/glitch/system-font.patch)
|
||||
- [`hide-contact-email.patch`](patches/hide-contact-email.patch): Hides the `mailto:` link on the About page
|
||||
- [Additional `glitch-soc` patch](patches/glitch/hide-contact-email.patch)
|
||||
- [`hide-rules.patch`](patches/hide-rules.patch): Applies just to homepage, meant only for single-user instances
|
||||
- [Additional `glitch-soc` patch](patches/glitch/hide-rules.patch)
|
||||
- [`hide-signup.patch`](patches/hide-signup.patch): Hide the "create account" button (for aesthetics, **not security!**)
|
||||
- [Additional `glitch-soc` patch](patches/glitch/hide-signup.patch)
|
||||
- [`glitch-soc` only] [`cleanup-sidebar.patch`](patches/glitch/cleanup-sidebar.patch): Removes redudant search button from sidebar
|
||||
|
||||
## License
|
||||
|
||||
|
||||
19
patches/glitch/hide-contact-email.patch
Normal file
19
patches/glitch/hide-contact-email.patch
Normal file
@@ -0,0 +1,19 @@
|
||||
diff --git a/app/javascript/flavours/glitch/features/about/index.js b/app/javascript/flavours/glitch/features/about/index.js
|
||||
index 57f295ea9..0992ba767 100644
|
||||
--- a/app/javascript/flavours/glitch/features/about/index.js
|
||||
+++ b/app/javascript/flavours/glitch/features/about/index.js
|
||||
@@ -127,14 +127,6 @@ class About extends React.PureComponent {
|
||||
|
||||
<Account id={server.getIn(['contact', 'account', 'id'])} size={36} />
|
||||
</div>
|
||||
-
|
||||
- <hr className='about__meta__divider' />
|
||||
-
|
||||
- <div className='about__meta__column'>
|
||||
- <h4><FormattedMessage id='about.contact' defaultMessage='Contact:' /></h4>
|
||||
-
|
||||
- {isLoading ? <Skeleton width='10ch' /> : <a className='about__mail' href={`mailto:${server.getIn(['contact', 'email'])}`}>{server.getIn(['contact', 'email'])}</a>}
|
||||
- </div>
|
||||
</div>
|
||||
|
||||
<Section open title={intl.formatMessage(messages.title)}>
|
||||
33
patches/glitch/hide-rules.patch
Normal file
33
patches/glitch/hide-rules.patch
Normal file
@@ -0,0 +1,33 @@
|
||||
diff --git a/app/javascript/flavours/glitch/features/about/index.js b/app/javascript/flavours/glitch/features/about/index.js
|
||||
index 57f295ea9..e27a30292 100644
|
||||
--- a/app/javascript/flavours/glitch/features/about/index.js
|
||||
+++ b/app/javascript/flavours/glitch/features/about/index.js
|
||||
@@ -15,7 +15,6 @@ import Image from 'flavours/glitch/components/image';
|
||||
|
||||
const messages = defineMessages({
|
||||
title: { id: 'column.about', defaultMessage: 'About' },
|
||||
- rules: { id: 'about.rules', defaultMessage: 'Server rules' },
|
||||
blocks: { id: 'about.blocks', defaultMessage: 'Moderated servers' },
|
||||
silenced: { id: 'about.domain_blocks.silenced.title', defaultMessage: 'Limited' },
|
||||
silencedExplanation: { id: 'about.domain_blocks.silenced.explanation', defaultMessage: 'You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.' },
|
||||
@@ -158,20 +157,6 @@ class About extends React.PureComponent {
|
||||
))}
|
||||
</Section>
|
||||
|
||||
- <Section title={intl.formatMessage(messages.rules)}>
|
||||
- {!isLoading && (server.get('rules').isEmpty() ? (
|
||||
- <p><FormattedMessage id='about.not_available' defaultMessage='This information has not been made available on this server.' /></p>
|
||||
- ) : (
|
||||
- <ol className='rules-list'>
|
||||
- {server.get('rules').map(rule => (
|
||||
- <li key={rule.get('id')}>
|
||||
- <span className='rules-list__text'>{rule.get('text')}</span>
|
||||
- </li>
|
||||
- ))}
|
||||
- </ol>
|
||||
- ))}
|
||||
- </Section>
|
||||
-
|
||||
<Section title={intl.formatMessage(messages.blocks)} onOpen={this.handleDomainBlocksOpen}>
|
||||
{domainBlocks.get('isLoading') ? (
|
||||
<>
|
||||
36
patches/glitch/hide-signup.patch
Normal file
36
patches/glitch/hide-signup.patch
Normal file
@@ -0,0 +1,36 @@
|
||||
diff --git a/app/javascript/flavours/glitch/features/interaction_modal/index.js b/app/javascript/flavours/glitch/features/interaction_modal/index.js
|
||||
index b71c041c9..b9bb32341 100644
|
||||
--- a/app/javascript/flavours/glitch/features/interaction_modal/index.js
|
||||
+++ b/app/javascript/flavours/glitch/features/interaction_modal/index.js
|
||||
@@ -145,7 +145,6 @@ class InteractionModal extends React.PureComponent {
|
||||
<div className='interaction-modal__choices__choice'>
|
||||
<h3><FormattedMessage id='interaction_modal.on_this_server' defaultMessage='On this server' /></h3>
|
||||
<a href='/auth/sign_in' className='button button--block'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Sign in' /></a>
|
||||
- {signupButton}
|
||||
</div>
|
||||
|
||||
<div className='interaction-modal__choices__choice'>
|
||||
diff --git a/app/javascript/flavours/glitch/features/ui/components/header.js b/app/javascript/flavours/glitch/features/ui/components/header.js
|
||||
index d9ad94961..9a1f31531 100644
|
||||
--- a/app/javascript/flavours/glitch/features/ui/components/header.js
|
||||
+++ b/app/javascript/flavours/glitch/features/ui/components/header.js
|
||||
@@ -69,7 +69,6 @@ class Header extends React.PureComponent {
|
||||
content = (
|
||||
<>
|
||||
<a href='/auth/sign_in' className='button'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Sign in' /></a>
|
||||
- {signupButton}
|
||||
</>
|
||||
);
|
||||
}
|
||||
diff --git a/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.js b/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.js
|
||||
index e8023803f..d8c332f08 100644
|
||||
--- a/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.js
|
||||
+++ b/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.js
|
||||
@@ -32,7 +32,6 @@ const SignInBanner = () => {
|
||||
<div className='sign-in-banner'>
|
||||
<p><FormattedMessage id='sign_in_banner.text' defaultMessage='Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.' /></p>
|
||||
<a href='/auth/sign_in' className='button button--block'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Sign in' /></a>
|
||||
- {signupButton}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
55
patches/glitch/system-font.patch
Normal file
55
patches/glitch/system-font.patch
Normal file
@@ -0,0 +1,55 @@
|
||||
diff --git a/app/javascript/flavours/glitch/styles/basics.scss b/app/javascript/flavours/glitch/styles/basics.scss
|
||||
index a00b2936f..340294d73 100644
|
||||
--- a/app/javascript/flavours/glitch/styles/basics.scss
|
||||
+++ b/app/javascript/flavours/glitch/styles/basics.scss
|
||||
@@ -18,21 +18,6 @@ body {
|
||||
-webkit-tap-highlight-color: rgba(0,0,0,0);
|
||||
-webkit-tap-highlight-color: transparent;
|
||||
|
||||
- &.system-font {
|
||||
- // system-ui => standard property (Chrome/Android WebView 56+, Opera 43+, Safari 11+)
|
||||
- // -apple-system => Safari <11 specific
|
||||
- // BlinkMacSystemFont => Chrome <56 on macOS specific
|
||||
- // Segoe UI => Windows 7/8/10
|
||||
- // Oxygen => KDE
|
||||
- // Ubuntu => Unity/Ubuntu
|
||||
- // Cantarell => GNOME
|
||||
- // Fira Sans => Firefox OS
|
||||
- // Droid Sans => Older Androids (<4.0)
|
||||
- // Helvetica Neue => Older macOS <10.11
|
||||
- // $font-sans-serif => web-font (Roboto) fallback and newer Androids (>=4.0)
|
||||
- font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", $font-sans-serif, sans-serif;
|
||||
- }
|
||||
-
|
||||
&.app-body {
|
||||
padding: 0;
|
||||
|
||||
diff --git a/app/javascript/flavours/glitch/styles/index.scss b/app/javascript/flavours/glitch/styles/index.scss
|
||||
index fbb02c788..3946684ed 100644
|
||||
--- a/app/javascript/flavours/glitch/styles/index.scss
|
||||
+++ b/app/javascript/flavours/glitch/styles/index.scss
|
||||
@@ -1,7 +1,5 @@
|
||||
@import 'mixins';
|
||||
@import 'variables';
|
||||
-@import 'styles/fonts/roboto';
|
||||
-@import 'styles/fonts/roboto-mono';
|
||||
|
||||
@import 'reset';
|
||||
@import 'basics';
|
||||
diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss
|
||||
index b865b5a2d..dc1130708 100644
|
||||
--- a/app/javascript/flavours/glitch/styles/variables.scss
|
||||
+++ b/app/javascript/flavours/glitch/styles/variables.scss
|
||||
@@ -53,9 +53,9 @@ $media-modal-media-max-height: 80%;
|
||||
|
||||
$no-gap-breakpoint: 1175px;
|
||||
|
||||
-$font-sans-serif: 'mastodon-font-sans-serif' !default;
|
||||
-$font-display: 'mastodon-font-display' !default;
|
||||
-$font-monospace: 'mastodon-font-monospace' !default;
|
||||
+$font-sans-serif: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue" !default;
|
||||
+$font-display: $font-sans-serif !default;
|
||||
+$font-monospace: ui-monospace, Menlo, Monaco, "Cascadia Mono", "Segoe UI Mono", "Roboto Mono", "Oxygen Mono", "Ubuntu Monospace", "Source Code Pro", "Fira Mono", "Droid Sans Mono", "Courier New" !default;
|
||||
|
||||
// Avatar border size (8% default, 100% for rounded avatars)
|
||||
$ui-avatar-border-size: 8%;
|
||||
@@ -1,28 +1,9 @@
|
||||
diff --git a/app/javascript/flavours/glitch/features/about/index.js b/app/javascript/flavours/glitch/features/about/index.js
|
||||
index 57f295ea9..0992ba767 100644
|
||||
--- a/app/javascript/flavours/glitch/features/about/index.js
|
||||
+++ b/app/javascript/flavours/glitch/features/about/index.js
|
||||
@@ -127,14 +127,6 @@ class About extends React.PureComponent {
|
||||
|
||||
<Account id={server.getIn(['contact', 'account', 'id'])} size={36} />
|
||||
</div>
|
||||
-
|
||||
- <hr className='about__meta__divider' />
|
||||
-
|
||||
- <div className='about__meta__column'>
|
||||
- <h4><FormattedMessage id='about.contact' defaultMessage='Contact:' /></h4>
|
||||
-
|
||||
- {isLoading ? <Skeleton width='10ch' /> : <a className='about__mail' href={`mailto:${server.getIn(['contact', 'email'])}`}>{server.getIn(['contact', 'email'])}</a>}
|
||||
- </div>
|
||||
</div>
|
||||
|
||||
<Section open title={intl.formatMessage(messages.title)}>
|
||||
diff --git a/app/javascript/mastodon/features/about/index.js b/app/javascript/mastodon/features/about/index.js
|
||||
index e59f73738..0cb11216e 100644
|
||||
--- a/app/javascript/mastodon/features/about/index.js
|
||||
+++ b/app/javascript/mastodon/features/about/index.js
|
||||
@@ -127,14 +127,6 @@ class About extends React.PureComponent {
|
||||
|
||||
|
||||
<Account id={server.getIn(['contact', 'account', 'id'])} size={36} />
|
||||
</div>
|
||||
-
|
||||
@@ -34,5 +15,5 @@ index e59f73738..0cb11216e 100644
|
||||
- {isLoading ? <Skeleton width='10ch' /> : <a className='about__mail' href={`mailto:${server.getIn(['contact', 'email'])}`}>{server.getIn(['contact', 'email'])}</a>}
|
||||
- </div>
|
||||
</div>
|
||||
|
||||
|
||||
<Section open title={intl.formatMessage(messages.title)}>
|
||||
|
||||
@@ -1,42 +1,9 @@
|
||||
diff --git a/app/javascript/flavours/glitch/features/about/index.js b/app/javascript/flavours/glitch/features/about/index.js
|
||||
index 57f295ea9..e27a30292 100644
|
||||
--- a/app/javascript/flavours/glitch/features/about/index.js
|
||||
+++ b/app/javascript/flavours/glitch/features/about/index.js
|
||||
@@ -15,7 +15,6 @@ import Image from 'flavours/glitch/components/image';
|
||||
|
||||
const messages = defineMessages({
|
||||
title: { id: 'column.about', defaultMessage: 'About' },
|
||||
- rules: { id: 'about.rules', defaultMessage: 'Server rules' },
|
||||
blocks: { id: 'about.blocks', defaultMessage: 'Moderated servers' },
|
||||
silenced: { id: 'about.domain_blocks.silenced.title', defaultMessage: 'Limited' },
|
||||
silencedExplanation: { id: 'about.domain_blocks.silenced.explanation', defaultMessage: 'You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.' },
|
||||
@@ -158,20 +157,6 @@ class About extends React.PureComponent {
|
||||
))}
|
||||
</Section>
|
||||
|
||||
- <Section title={intl.formatMessage(messages.rules)}>
|
||||
- {!isLoading && (server.get('rules').isEmpty() ? (
|
||||
- <p><FormattedMessage id='about.not_available' defaultMessage='This information has not been made available on this server.' /></p>
|
||||
- ) : (
|
||||
- <ol className='rules-list'>
|
||||
- {server.get('rules').map(rule => (
|
||||
- <li key={rule.get('id')}>
|
||||
- <span className='rules-list__text'>{rule.get('text')}</span>
|
||||
- </li>
|
||||
- ))}
|
||||
- </ol>
|
||||
- ))}
|
||||
- </Section>
|
||||
-
|
||||
<Section title={intl.formatMessage(messages.blocks)} onOpen={this.handleDomainBlocksOpen}>
|
||||
{domainBlocks.get('isLoading') ? (
|
||||
<>
|
||||
diff --git a/app/javascript/mastodon/features/about/index.js b/app/javascript/mastodon/features/about/index.js
|
||||
index e59f73738..3468ad19e 100644
|
||||
--- a/app/javascript/mastodon/features/about/index.js
|
||||
+++ b/app/javascript/mastodon/features/about/index.js
|
||||
@@ -15,7 +15,6 @@ import Image from 'mastodon/components/image';
|
||||
|
||||
|
||||
const messages = defineMessages({
|
||||
title: { id: 'column.about', defaultMessage: 'About' },
|
||||
- rules: { id: 'about.rules', defaultMessage: 'Server rules' },
|
||||
@@ -46,7 +13,7 @@ index e59f73738..3468ad19e 100644
|
||||
@@ -158,20 +157,6 @@ class About extends React.PureComponent {
|
||||
))}
|
||||
</Section>
|
||||
|
||||
|
||||
- <Section title={intl.formatMessage(messages.rules)}>
|
||||
- {!isLoading && (server.get('rules').isEmpty() ? (
|
||||
- <p><FormattedMessage id='about.not_available' defaultMessage='This information has not been made available on this server.' /></p>
|
||||
|
||||
@@ -1,39 +1,3 @@
|
||||
diff --git a/app/javascript/flavours/glitch/features/interaction_modal/index.js b/app/javascript/flavours/glitch/features/interaction_modal/index.js
|
||||
index b71c041c9..b9bb32341 100644
|
||||
--- a/app/javascript/flavours/glitch/features/interaction_modal/index.js
|
||||
+++ b/app/javascript/flavours/glitch/features/interaction_modal/index.js
|
||||
@@ -145,7 +145,6 @@ class InteractionModal extends React.PureComponent {
|
||||
<div className='interaction-modal__choices__choice'>
|
||||
<h3><FormattedMessage id='interaction_modal.on_this_server' defaultMessage='On this server' /></h3>
|
||||
<a href='/auth/sign_in' className='button button--block'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Sign in' /></a>
|
||||
- {signupButton}
|
||||
</div>
|
||||
|
||||
<div className='interaction-modal__choices__choice'>
|
||||
diff --git a/app/javascript/flavours/glitch/features/ui/components/header.js b/app/javascript/flavours/glitch/features/ui/components/header.js
|
||||
index d9ad94961..9a1f31531 100644
|
||||
--- a/app/javascript/flavours/glitch/features/ui/components/header.js
|
||||
+++ b/app/javascript/flavours/glitch/features/ui/components/header.js
|
||||
@@ -69,7 +69,6 @@ class Header extends React.PureComponent {
|
||||
content = (
|
||||
<>
|
||||
<a href='/auth/sign_in' className='button'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Sign in' /></a>
|
||||
- {signupButton}
|
||||
</>
|
||||
);
|
||||
}
|
||||
diff --git a/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.js b/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.js
|
||||
index e8023803f..d8c332f08 100644
|
||||
--- a/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.js
|
||||
+++ b/app/javascript/flavours/glitch/features/ui/components/sign_in_banner.js
|
||||
@@ -32,7 +32,6 @@ const SignInBanner = () => {
|
||||
<div className='sign-in-banner'>
|
||||
<p><FormattedMessage id='sign_in_banner.text' defaultMessage='Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.' /></p>
|
||||
<a href='/auth/sign_in' className='button button--block'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Sign in' /></a>
|
||||
- {signupButton}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
diff --git a/app/javascript/mastodon/features/interaction_modal/index.js b/app/javascript/mastodon/features/interaction_modal/index.js
|
||||
index d4535378f..153c50991 100644
|
||||
--- a/app/javascript/mastodon/features/interaction_modal/index.js
|
||||
@@ -44,7 +8,7 @@ index d4535378f..153c50991 100644
|
||||
<a href='/auth/sign_in' className='button button--block'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Sign in' /></a>
|
||||
- {signupButton}
|
||||
</div>
|
||||
|
||||
|
||||
<div className='interaction-modal__choices__choice'>
|
||||
diff --git a/app/javascript/mastodon/features/ui/components/header.js b/app/javascript/mastodon/features/ui/components/header.js
|
||||
index 1384bebda..89becd19b 100644
|
||||
@@ -77,13 +41,13 @@ index f078e2f7e..6e106cd92 100644
|
||||
@@ -5,14 +5,8 @@
|
||||
- if controller_name != 'sessions'
|
||||
%li= link_to_login t('auth.login')
|
||||
|
||||
|
||||
- - if controller_name != 'registrations'
|
||||
- %li= link_to t('auth.register'), available_sign_up_path
|
||||
-
|
||||
- if controller_name != 'passwords' && controller_name != 'registrations'
|
||||
%li= link_to t('auth.forgot_password'), new_user_password_path
|
||||
|
||||
|
||||
- - if controller_name != 'confirmations' && (!user_signed_in? || !current_user.confirmed? || current_user.unconfirmed_email.present?)
|
||||
- %li= link_to t('auth.didnt_get_confirmation'), new_user_confirmation_path
|
||||
-
|
||||
|
||||
@@ -1,58 +1,3 @@
|
||||
diff --git a/app/javascript/flavours/glitch/styles/basics.scss b/app/javascript/flavours/glitch/styles/basics.scss
|
||||
index a00b2936f..340294d73 100644
|
||||
--- a/app/javascript/flavours/glitch/styles/basics.scss
|
||||
+++ b/app/javascript/flavours/glitch/styles/basics.scss
|
||||
@@ -18,21 +18,6 @@ body {
|
||||
-webkit-tap-highlight-color: rgba(0,0,0,0);
|
||||
-webkit-tap-highlight-color: transparent;
|
||||
|
||||
- &.system-font {
|
||||
- // system-ui => standard property (Chrome/Android WebView 56+, Opera 43+, Safari 11+)
|
||||
- // -apple-system => Safari <11 specific
|
||||
- // BlinkMacSystemFont => Chrome <56 on macOS specific
|
||||
- // Segoe UI => Windows 7/8/10
|
||||
- // Oxygen => KDE
|
||||
- // Ubuntu => Unity/Ubuntu
|
||||
- // Cantarell => GNOME
|
||||
- // Fira Sans => Firefox OS
|
||||
- // Droid Sans => Older Androids (<4.0)
|
||||
- // Helvetica Neue => Older macOS <10.11
|
||||
- // $font-sans-serif => web-font (Roboto) fallback and newer Androids (>=4.0)
|
||||
- font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", $font-sans-serif, sans-serif;
|
||||
- }
|
||||
-
|
||||
&.app-body {
|
||||
padding: 0;
|
||||
|
||||
diff --git a/app/javascript/flavours/glitch/styles/index.scss b/app/javascript/flavours/glitch/styles/index.scss
|
||||
index fbb02c788..3946684ed 100644
|
||||
--- a/app/javascript/flavours/glitch/styles/index.scss
|
||||
+++ b/app/javascript/flavours/glitch/styles/index.scss
|
||||
@@ -1,7 +1,5 @@
|
||||
@import 'mixins';
|
||||
@import 'variables';
|
||||
-@import 'styles/fonts/roboto';
|
||||
-@import 'styles/fonts/roboto-mono';
|
||||
|
||||
@import 'reset';
|
||||
@import 'basics';
|
||||
diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss
|
||||
index b865b5a2d..dc1130708 100644
|
||||
--- a/app/javascript/flavours/glitch/styles/variables.scss
|
||||
+++ b/app/javascript/flavours/glitch/styles/variables.scss
|
||||
@@ -53,9 +53,9 @@ $media-modal-media-max-height: 80%;
|
||||
|
||||
$no-gap-breakpoint: 1175px;
|
||||
|
||||
-$font-sans-serif: 'mastodon-font-sans-serif' !default;
|
||||
-$font-display: 'mastodon-font-display' !default;
|
||||
-$font-monospace: 'mastodon-font-monospace' !default;
|
||||
+$font-sans-serif: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue" !default;
|
||||
+$font-display: $font-sans-serif !default;
|
||||
+$font-monospace: ui-monospace, Menlo, Monaco, "Cascadia Mono", "Segoe UI Mono", "Roboto Mono", "Oxygen Mono", "Ubuntu Monospace", "Source Code Pro", "Fira Mono", "Droid Sans Mono", "Courier New" !default;
|
||||
|
||||
// Avatar border size (8% default, 100% for rounded avatars)
|
||||
$ui-avatar-border-size: 8%;
|
||||
diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss
|
||||
index 81a040108..01c840180 100644
|
||||
--- a/app/javascript/styles/application.scss
|
||||
@@ -62,7 +7,7 @@ index 81a040108..01c840180 100644
|
||||
@import 'mastodon/variables';
|
||||
-@import 'fonts/roboto';
|
||||
-@import 'fonts/roboto-mono';
|
||||
|
||||
|
||||
@import 'mastodon/reset';
|
||||
@import 'mastodon/basics';
|
||||
diff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss
|
||||
@@ -72,7 +17,7 @@ index 18fe522eb..16ffb8b2f 100644
|
||||
@@ -1,5 +1,4 @@
|
||||
@import 'mastodon/variables';
|
||||
-@import 'fonts/roboto';
|
||||
|
||||
|
||||
table,
|
||||
td,
|
||||
diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss
|
||||
@@ -82,7 +27,7 @@ index 413a1cdd6..fccbf2763 100644
|
||||
@@ -19,21 +19,6 @@ body {
|
||||
-webkit-tap-highlight-color: rgba(0, 0, 0, 0%);
|
||||
-webkit-tap-highlight-color: transparent;
|
||||
|
||||
|
||||
- &.system-font {
|
||||
- // system-ui => standard property (Chrome/Android WebView 56+, Opera 43+, Safari 11+)
|
||||
- // -apple-system => Safari <11 specific
|
||||
@@ -100,15 +45,25 @@ index 413a1cdd6..fccbf2763 100644
|
||||
-
|
||||
&.app-body {
|
||||
padding: 0;
|
||||
<<<<<<< Updated upstream
|
||||
|
||||
=======
|
||||
|
||||
>>>>>>> Stashed changes
|
||||
diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss
|
||||
index 2f6c41d5f..b968ea42d 100644
|
||||
--- a/app/javascript/styles/mastodon/variables.scss
|
||||
+++ b/app/javascript/styles/mastodon/variables.scss
|
||||
@@ -55,6 +55,6 @@ $media-modal-media-max-height: 80%;
|
||||
<<<<<<< Updated upstream
|
||||
|
||||
$no-gap-breakpoint: 1175px;
|
||||
|
||||
=======
|
||||
|
||||
$no-gap-breakpoint: 1175px;
|
||||
|
||||
>>>>>>> Stashed changes
|
||||
-$font-sans-serif: 'mastodon-font-sans-serif' !default;
|
||||
-$font-display: 'mastodon-font-display' !default;
|
||||
-$font-monospace: 'mastodon-font-monospace' !default;
|
||||
|
||||
Reference in New Issue
Block a user