separate glitch patches from vanilla

patches/glitch/cleanup-sidebar.patch

@@ -0,0 +1,49 @@
+diff --git a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.js b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.js
+index 3b46c6eec..4999c273c 100644
+--- a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.js
++++ b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.js
+@@ -2,6 +2,7 @@ import React from 'react';
+ import PropTypes from 'prop-types';
+ import { defineMessages, injectIntl } from 'react-intl';
+ import { Link } from 'react-router-dom';
++import Logo from 'flavours/glitch/components/logo';
+ import { timelinePreview, showTrends } from 'flavours/glitch/initial_state';
+ import ColumnLink from 'flavours/glitch/features/ui/components/column_link';
+ import DisabledAccountBanner from './disabled_account_banner';
+@@ -47,6 +48,11 @@ class NavigationPanel extends React.Component {
+ 
+     return (
+       <div className='navigation-panel'>
++        <div className='navigation-panel__logo'>
++          <Link to='/' className='column-link column-link--logo'><Logo /></Link>
++          <hr />
++        </div>
++
+         {signedIn && (
+           <React.Fragment>
+             <ColumnLink transparent to='/home' icon='home' text={intl.formatMessage(messages.home)} />
+@@ -55,14 +61,13 @@ class NavigationPanel extends React.Component {
+           </React.Fragment>
+         )}
+ 
+-        {showTrends ? (
++        {showTrends && (
+           <ColumnLink transparent to='/explore' icon='hashtag' text={intl.formatMessage(messages.explore)} />
+-        ) : (
+-          <ColumnLink transparent to='/search' icon='search' text={intl.formatMessage(messages.search)} />
+         )}
+ 
+         {(signedIn || timelinePreview) && (
+           <>
++            <ColumnLink transparent to='/search' icon='search' text={intl.formatMessage(messages.search)} />
+             <ColumnLink transparent to='/public/local' icon='users' text={intl.formatMessage(messages.local)} />
+             <ColumnLink transparent exact to='/public' icon='globe' text={intl.formatMessage(messages.federated)} />
+           </>
+@@ -70,7 +75,6 @@ class NavigationPanel extends React.Component {
+ 
+         {!signedIn && (
+           <div className='navigation-panel__sign-in-banner'>
+-            <hr />
+             { disabledAccountId ? <DisabledAccountBanner /> : <SignInBanner /> }
+           </div>
+         )}

patches/glitch/hide-contact-email.patch

@@ -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)}>

patches/glitch/hide-rules.patch

@@ -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') ? (
+               <>

patches/glitch/hide-signup.patch

@@ -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>
+   );
+ };

patches/glitch/system-font.patch

@@ -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%;